From 6689d5ed2158142eaee010b6e0f4ee12d2b0d2df Mon Sep 17 00:00:00 2001 From: Sam Elliott Date: Wed, 8 Apr 2020 16:42:55 +0100 Subject: [PATCH] [sw] Fix Software Include Guards Recently a bug was found in CI where the code formatting hooks were not firing correctly. This bug was fixed in lowrisc/opentitan#ffa126f00f5cae43bd8ccd1e212550ab2d997491. This change ensures that the include guards on existing code are correct, so that going forwards we know the software tree is and remains correct. Signed-off-by: Sam Elliott --- sw/device/lib/base/log.h | 6 +++--- sw/device/lib/dif/dif_gpio.h | 6 +++--- sw/device/lib/dif/dif_uart.h | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sw/device/lib/base/log.h b/sw/device/lib/base/log.h index 349b9543969ef..8b2f1f09802ec 100644 --- a/sw/device/lib/base/log.h +++ b/sw/device/lib/base/log.h @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0, see LICENSE for details. // SPDX-License-Identifier: Apache-2.0 -#ifndef OPENTITAN_SW_DEVICE_LIB_LOG_H_ -#define OPENTITAN_SW_DEVICE_LIB_LOG_H_ +#ifndef OPENTITAN_SW_DEVICE_LIB_BASE_LOG_H_ +#define OPENTITAN_SW_DEVICE_LIB_BASE_LOG_H_ #include #include @@ -130,4 +130,4 @@ void base_log_internal_dv(log_severity_t severity, const char *format, ...); */ #define LOG_ERROR(...) LOG(kLogSeverityError, __VA_ARGS__) -#endif // OPENTITAN_SW_DEVICE_LIB_LOG_H_ +#endif // OPENTITAN_SW_DEVICE_LIB_BASE_LOG_H_ diff --git a/sw/device/lib/dif/dif_gpio.h b/sw/device/lib/dif/dif_gpio.h index 2103140231256..8d09ee7f6f0b6 100644 --- a/sw/device/lib/dif/dif_gpio.h +++ b/sw/device/lib/dif/dif_gpio.h @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0, see LICENSE for details. // SPDX-License-Identifier: Apache-2.0 -#ifndef SW_DEVICE_LIB_DIF_GPIO_H -#define SW_DEVICE_LIB_DIF_GPIO_H +#ifndef OPENTITAN_SW_DEVICE_LIB_DIF_DIF_GPIO_H_ +#define OPENTITAN_SW_DEVICE_LIB_DIF_DIF_GPIO_H_ #include #include @@ -330,4 +330,4 @@ dif_gpio_result_t dif_gpio_irq_trigger_masked_config(const dif_gpio_t *gpio, uint32_t mask, dif_gpio_irq_t config); -#endif // SW_DEVICE_LIB_DIF_GPIO_H +#endif // OPENTITAN_SW_DEVICE_LIB_DIF_DIF_GPIO_H_ diff --git a/sw/device/lib/dif/dif_uart.h b/sw/device/lib/dif/dif_uart.h index c55d1a72efc76..2817ef9bd7591 100644 --- a/sw/device/lib/dif/dif_uart.h +++ b/sw/device/lib/dif/dif_uart.h @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0, see LICENSE for details. // SPDX-License-Identifier: Apache-2.0 -#ifndef _SW_DEVICE_LIB_DIF_UART_H_ -#define _SW_DEVICE_LIB_DIF_UART_H_ +#ifndef OPENTITAN_SW_DEVICE_LIB_DIF_DIF_UART_H_ +#define OPENTITAN_SW_DEVICE_LIB_DIF_DIF_UART_H_ #include #include @@ -300,4 +300,4 @@ bool dif_uart_rx_bytes_available(const dif_uart_t *uart, size_t *num_bytes); */ bool dif_uart_tx_bytes_available(const dif_uart_t *uart, size_t *num_bytes); -#endif +#endif // OPENTITAN_SW_DEVICE_LIB_DIF_DIF_UART_H_