Updated include guards

33 files changed, 87 insertions, 87 deletions

diff --git a/os/hal/include/hal_crc.h b/os/hal/include/hal_crc.h
index 8c4c895..d7ef10f 100644
--- a/os/hal/include/hal_crc.h
+++ b/os/hal/include/hal_crc.h
@@ -14,8 +14,8 @@
     limitations under the License.
 */
 
-#ifndef _CRC_H_
-#define _CRC_H_
+#ifndef HAL_CRC_H_
+#define HAL_CRC_H_
 
 #if (HAL_USE_CRC == TRUE) || defined(__DOXYGEN__)
 
@@ -153,6 +153,6 @@ extern "C" {
 
 #endif /* HAL_USE_CRC */
 
-#endif /* _CRC_H_ */
+#endif /* HAL_CRC_H_ */
 
 /** @} */
diff --git a/os/hal/include/hal_ee24xx.h b/os/hal/include/hal_ee24xx.h
index ab12fd1..00cdc95 100644
--- a/os/hal/include/hal_ee24xx.h
+++ b/os/hal/include/hal_ee24xx.h
@@ -4,8 +4,8 @@
   The work is provided "as is" without warranty of any kind, neither express nor implied.
 */
 
-#ifndef EE24XX_H
-#define EE24XX_H
+#ifndef HAL_EE24XX_H
+#define HAL_EE24XX_H
 
 #include "hal.h"
 
@@ -61,4 +61,4 @@ typedef struct {
 
 #endif /* #if defined(EEPROM_USE_EE24XX) && EEPROM_USE_EE24XX */
 
-#endif // EE24XX_H
+#endif // HAL_EE24XX_H
diff --git a/os/hal/include/hal_ee25xx.h b/os/hal/include/hal_ee25xx.h
index fc2ad6f..e520bd6 100644
--- a/os/hal/include/hal_ee25xx.h
+++ b/os/hal/include/hal_ee25xx.h
@@ -4,8 +4,8 @@
   The work is provided "as is" without warranty of any kind, neither express nor implied.
 */
 
-#ifndef EE25XX_H
-#define EE25XX_H
+#ifndef HAL_EE25XX_H
+#define HAL_EE25XX_H
 
 #include "hal.h"
 
@@ -60,4 +60,4 @@ EepromFileStream *SPIEepromFileOpen(SPIEepromFileStream *efs,
 
 #endif /* #if defined(EEPROM_USE_EE25XX) && EEPROM_USE_EE25XX */
 
-#endif // EE25XX_H
+#endif // HAL_EE25XX_H
diff --git a/os/hal/include/hal_eeprom.h b/os/hal/include/hal_eeprom.h
index cd05e14..6f53fb9 100644
--- a/os/hal/include/hal_eeprom.h
+++ b/os/hal/include/hal_eeprom.h
@@ -26,8 +26,8 @@
   The work is provided "as is" without warranty of any kind, neither express nor implied.
 */
 
-#ifndef __EEPROM_H__
-#define __EEPROM_H__
+#ifndef HAL_EEPROM_H_
+#define HAL_EEPROM_H_
 
 #include "ch.h"
 #include "hal.h"
@@ -140,4 +140,4 @@ msg_t eepfs_get(void *ip);
 #include "hal_ee25xx.h"
 
 #endif /* #if defined(HAL_USE_EEPROM) && HAL_USE_EEPROM */
-#endif /* __EEPROM_H__ */
+#endif /* HAL_EEPROM_H_ */
diff --git a/os/hal/include/hal_eicu.h b/os/hal/include/hal_eicu.h
index d4b0ed2..8b4b07d 100644
--- a/os/hal/include/hal_eicu.h
+++ b/os/hal/include/hal_eicu.h
@@ -22,8 +22,8 @@
    32-bit timers and timers with single capture/compare channels.
 */
 
-#ifndef _EICU_H_
-#define _EICU_H_
+#ifndef HAL_EICU_H_
+#define HAL_EICU_H_
 
 #if (HAL_USE_EICU == TRUE) || defined(__DOXYGEN__)
 
@@ -186,6 +186,6 @@ extern "C" {
 
 #endif /* HAL_USE_EICU */
 
-#endif /* _EICU_H_ */
+#endif /* HAL_EICU_H_ */
 
 /** @} */
diff --git a/os/hal/include/hal_nand.h b/os/hal/include/hal_nand.h
index d5a1c04..ace3e5d 100644
--- a/os/hal/include/hal_nand.h
+++ b/os/hal/include/hal_nand.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    nand.h
+ * @file    hal_nand.h
  * @brief   NAND Driver macros and structures.
  *
  * @addtogroup NAND
  * @{
  */
 
-#ifndef _NAND_H_
-#define _NAND_H_
+#ifndef HAL_NAND_H_
+#define HAL_NAND_H_
 
 #if (HAL_USE_NAND == TRUE) || defined(__DOXYGEN__)
 
diff --git a/os/hal/include/hal_onewire.h b/os/hal/include/hal_onewire.h
index 0454212..12e7b75 100644
--- a/os/hal/include/hal_onewire.h
+++ b/os/hal/include/hal_onewire.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    onewire.h
+ * @file    hal_onewire.h
  * @brief   1-wire Driver macros and structures.
  *
  * @addtogroup onewire
  * @{
  */
 
-#ifndef _ONEWIRE_H_
-#define _ONEWIRE_H_
+#ifndef HAL_ONEWIRE_H_
+#define HAL_ONEWIRE_H_
 
 #if (HAL_USE_ONEWIRE == TRUE) || defined(__DOXYGEN__)
 
@@ -351,7 +351,7 @@ extern "C" {
 
 #endif /* HAL_USE_ONEWIRE */
 
-#endif /* _ONEWIRE_H_ */
+#endif /* HAL_ONEWIRE_H_ */
 
 /** @} */
 
diff --git a/os/hal/include/hal_rng.h b/os/hal/include/hal_rng.h
index 0e3c484..dc146c7 100644
--- a/os/hal/include/hal_rng.h
+++ b/os/hal/include/hal_rng.h
@@ -14,8 +14,8 @@
     limitations under the License.
 */
 
-#ifndef _RNG_H_
-#define _RNG_H_
+#ifndef HAL_RNG_H_
+#define HAL_RNG_H_
 
 #if (HAL_USE_RNG == TRUE) || defined(__DOXYGEN__)
 
@@ -131,6 +131,6 @@ extern "C" {
 
 #endif /* HAL_USE_RNG */
 
-#endif /* _RNG_H_ */
+#endif /* HAL_RNG_H_ */
 
 /** @} */
diff --git a/os/hal/include/hal_timcap.h b/os/hal/include/hal_timcap.h
index bd43dd1..61c7fc5 100644
--- a/os/hal/include/hal_timcap.h
+++ b/os/hal/include/hal_timcap.h
@@ -19,15 +19,15 @@
 */
 
 /**
- * @file    timcap.h
+ * @file    hal_timcap.h
  * @brief   TIMCAP Driver macros and structures.
  *
  * @addtogroup TIMCAP
  * @{
  */
 
-#ifndef _TIMCAP_H_
-#define _TIMCAP_H_
+#ifndef HAL_TIMCAP_H_
+#define HAL_TIMCAP_H_
 
 #include "ch.h"
 #include "hal.h"
@@ -201,6 +201,6 @@ extern "C" {
 
 #endif /* HAL_USE_TIMCAP */
 
-#endif /* _TIMCAP_H_ */
+#endif /* HAL_TIMCAP_H_ */
 
 /** @} */
diff --git a/os/hal/include/hal_usbh.h b/os/hal/include/hal_usbh.h
index 5fd0047..63be93e 100644
--- a/os/hal/include/hal_usbh.h
+++ b/os/hal/include/hal_usbh.h
@@ -15,8 +15,8 @@
     limitations under the License.
 */
 
-#ifndef USBH_H_
-#define USBH_H_
+#ifndef HAL_USBH_H_
+#define HAL_USBH_H_
 
 #include "hal.h"
 
@@ -433,4 +433,4 @@ struct usbh_baseclassdriver {
 
 #endif
 
-#endif /* USBH_H_ */
+#endif /* HAL_USBH_H_ */
diff --git a/os/hal/ports/STM32/LLD/CRCv1/hal_crc_lld.c b/os/hal/ports/STM32/LLD/CRCv1/hal_crc_lld.c
index 601deca..f8178f1 100644
--- a/os/hal/ports/STM32/LLD/CRCv1/hal_crc_lld.c
+++ b/os/hal/ports/STM32/LLD/CRCv1/hal_crc_lld.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    STM32/CRCv1/crc_lld.c
+ * @file    STM32/CRCv1/hal_crc_lld.c
  * @brief   STM32 CRC subsystem low level driver source.
  *
  * @addtogroup CRC
diff --git a/os/hal/ports/STM32/LLD/CRCv1/hal_crc_lld.h b/os/hal/ports/STM32/LLD/CRCv1/hal_crc_lld.h
index ecdaf81..213d346 100644
--- a/os/hal/ports/STM32/LLD/CRCv1/hal_crc_lld.h
+++ b/os/hal/ports/STM32/LLD/CRCv1/hal_crc_lld.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    STM32/CRCv1/crc_lld.h
+ * @file    STM32/CRCv1/hal_crc_lld.h
  * @brief   STM32 CRC subsystem low level driver header.
  *
  * @addtogroup CRC
  * @{
  */
 
-#ifndef _CRC_LLD_H_
-#define _CRC_LLD_H_
+#ifndef HAL_CRC_LLD_H_
+#define HAL_CRC_LLD_H_
 
 #if (HAL_USE_CRC == TRUE) || defined(__DOXYGEN__)
 
@@ -244,6 +244,6 @@ extern "C" {
 
 #endif /* HAL_USE_CRC */
 
-#endif /* _CRC_LLD_H_ */
+#endif /* HAL_CRC_LLD_H_ */
 
 /** @} */
diff --git a/os/hal/ports/STM32/LLD/DMA2Dv1/hal_stm32_dma2d.c b/os/hal/ports/STM32/LLD/DMA2Dv1/hal_stm32_dma2d.c
index aba029f..6751202 100644
--- a/os/hal/ports/STM32/LLD/DMA2Dv1/hal_stm32_dma2d.c
+++ b/os/hal/ports/STM32/LLD/DMA2Dv1/hal_stm32_dma2d.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    stm32_dma2d.c
+ * @file    hal_stm32_dma2d.c
  * @brief   DMA2D/Chrom-ART driver.
  */
 
diff --git a/os/hal/ports/STM32/LLD/DMA2Dv1/hal_stm32_dma2d.h b/os/hal/ports/STM32/LLD/DMA2Dv1/hal_stm32_dma2d.h
index 01f0941..c06ab62 100644
--- a/os/hal/ports/STM32/LLD/DMA2Dv1/hal_stm32_dma2d.h
+++ b/os/hal/ports/STM32/LLD/DMA2Dv1/hal_stm32_dma2d.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    stm32_dma2d.h
+ * @file    hal_stm32_dma2d.h
  * @brief   DMA2D/Chrom-ART driver.
  *
  * @addtogroup dma2d
  * @{
  */
 
-#ifndef _STM32_DMA2D_H_
-#define _STM32_DMA2D_H_
+#ifndef HAL_STM32_DMA2D_H_
+#define HAL_STM32_DMA2D_H_
 
 /**
  * @brief   Using the DMA2D driver.
@@ -659,6 +659,6 @@ extern "C" {
 
 #endif  /* STM32_DMA2D_USE_DMA2D */
 
-#endif  /* _STM32_DMA2D_H_ */
+#endif  /* HAL_STM32_DMA2D_H_ */
 
 /** @} */
diff --git a/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc.c b/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc.c
index 557fa7b..b4c2938 100644
--- a/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc.c
+++ b/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    fsmc.c
+ * @file    hal_fsmc.c
  * @brief   FSMC Driver subsystem low level driver source template.
  *
  * @addtogroup FSMC
diff --git a/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc.h b/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc.h
index ba3dafe..f0d4c65 100644
--- a/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc.h
+++ b/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    fsmc.h
+ * @file    hal_fsmc.h
  * @brief   FSMC Driver subsystem low level driver header.
  *
  * @addtogroup FSMC
  * @{
  */
 
-#ifndef _FSMC_H_
-#define _FSMC_H_
+#ifndef HAL_FSMC_H_
+#define HAL_FSMC_H_
 
 #if (HAL_USE_FSMC == TRUE) || defined(__DOXYGEN__)
 
@@ -335,6 +335,6 @@ extern "C" {
 
 #endif /* HAL_USE_FSMC */
 
-#endif /* _FSMC_H_ */
+#endif /* HAL_FSMC_H_ */
 
 /** @} */
diff --git a/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc_sdram.c b/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc_sdram.c
index 95f47d5..ac83477 100644
--- a/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc_sdram.c
+++ b/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc_sdram.c
@@ -18,7 +18,7 @@
  */
 
 /**
- * @file    fsmc_sdram.c
+ * @file    hal_fsmc_sdram.c
  * @brief   SDRAM Driver subsystem low level driver source.
  *
  * @addtogroup SDRAM
diff --git a/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc_sdram.h b/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc_sdram.h
index cef6772..b419168 100644
--- a/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc_sdram.h
+++ b/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc_sdram.h
@@ -18,15 +18,15 @@
  */
 
 /**
- * @file    fsmc_sdram.h
+ * @file    hal_fsmc_sdram.h
  * @brief   SDRAM Driver subsystem low level driver header.
  *
  * @addtogroup SDRAM
  * @{
  */
 
-#ifndef _FMC_SDRAM_H_
-#define _FMC_SDRAM_H_
+#ifndef HAL_FMC_SDRAM_H_
+#define HAL_FMC_SDRAM_H_
 
 #if (defined(STM32F427xx) || defined(STM32F437xx) || \
      defined(STM32F429xx) || defined(STM32F439xx))
@@ -166,6 +166,6 @@ extern "C" {
 
 #endif /* STM32F427xx / STM32F429xx / STM32F437xx / STM32F439xx */
 
-#endif /* _FMC_SDRAM_H_ */
+#endif /* HAL_FMC_SDRAM_H_ */
 
 /** @} */
diff --git a/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc_sram.c b/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc_sram.c
index 6f710d4..333362f 100644
--- a/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc_sram.c
+++ b/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc_sram.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    fsmc_sram.c
+ * @file    hal_fsmc_sram.c
  * @brief   SRAM Driver subsystem low level driver source.
  *
  * @addtogroup SRAM
diff --git a/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc_sram.h b/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc_sram.h
index 529bdc7..5e749a8 100644
--- a/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc_sram.h
+++ b/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc_sram.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    fsmc_sram.h
+ * @file    hal_fsmc_sram.h
  * @brief   SRAM Driver subsystem low level driver header.
  *
  * @addtogroup SRAM
  * @{
  */
 
-#ifndef _FSMC_SRAM_H_
-#define _FSMC_SRAM_H_
+#ifndef HAL_FSMC_SRAM_H_
+#define HAL_FSMC_SRAM_H_
 
 #include "hal_fsmc.h"
 
@@ -167,6 +167,6 @@ extern "C" {
 
 #endif /* STM32_USE_FSMC_SRAM */
 
-#endif /* _FSMC_SRAM_H_ */
+#endif /* HAL_FSMC_SRAM_H_ */
 
 /** @} */
diff --git a/os/hal/ports/STM32/LLD/FSMCv1/hal_nand_lld.c b/os/hal/ports/STM32/LLD/FSMCv1/hal_nand_lld.c
index 771723e..f39ff35 100644
--- a/os/hal/ports/STM32/LLD/FSMCv1/hal_nand_lld.c
+++ b/os/hal/ports/STM32/LLD/FSMCv1/hal_nand_lld.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    nand_lld.c
+ * @file    hal_nand_lld.c
  * @brief   NAND Driver subsystem low level driver source.
  *
  * @addtogroup NAND
diff --git a/os/hal/ports/STM32/LLD/FSMCv1/hal_nand_lld.h b/os/hal/ports/STM32/LLD/FSMCv1/hal_nand_lld.h
index b0fa72f..de7a0c4 100644
--- a/os/hal/ports/STM32/LLD/FSMCv1/hal_nand_lld.h
+++ b/os/hal/ports/STM32/LLD/FSMCv1/hal_nand_lld.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    nand_lld.h
+ * @file    hal_nand_lld.h
  * @brief   NAND Driver subsystem low level driver header.
  *
  * @addtogroup NAND
  * @{
  */
 
-#ifndef _NAND_LLD_H_
-#define _NAND_LLD_H_
+#ifndef HAL_NAND_LLD_H_
+#define HAL_NAND_LLD_H_
 
 #include "hal_fsmc.h"
 #include "bitmap.h"
@@ -289,6 +289,6 @@ extern "C" {
 
 #endif /* HAL_USE_NAND */
 
-#endif /* _NAND_LLD_H_ */
+#endif /* HAL_NAND_LLD_H_ */
 
 /** @} */
diff --git a/os/hal/ports/STM32/LLD/LTDCv1/hal_stm32_ltdc.c b/os/hal/ports/STM32/LLD/LTDCv1/hal_stm32_ltdc.c
index e5f9a09..f0fd289 100644
--- a/os/hal/ports/STM32/LLD/LTDCv1/hal_stm32_ltdc.c
+++ b/os/hal/ports/STM32/LLD/LTDCv1/hal_stm32_ltdc.c
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    stm32_ltdc.c
+ * @file    hal_stm32_ltdc.c
  * @brief   LCD-TFT Controller Driver.
  */
 
diff --git a/os/hal/ports/STM32/LLD/LTDCv1/hal_stm32_ltdc.h b/os/hal/ports/STM32/LLD/LTDCv1/hal_stm32_ltdc.h
index 16b38ca..5db89e2 100644
--- a/os/hal/ports/STM32/LLD/LTDCv1/hal_stm32_ltdc.h
+++ b/os/hal/ports/STM32/LLD/LTDCv1/hal_stm32_ltdc.h
@@ -15,15 +15,15 @@
 */
 
 /**
- * @file    stm32_ltdc.h
+ * @file    hal_stm32_ltdc.h
  * @brief   LCD-TFT Controller Driver.
  *
  * @addtogroup ltdc
  * @{
  */
 
-#ifndef _STM32_LTDC_H_
-#define _STM32_LTDC_H_
+#ifndef HAL_STM32_LTDC_H_
+#define HAL_STM32_LTDC_H_
 
 /**
  * @brief   Using the LTDC driver.
@@ -731,6 +731,6 @@ extern "C" {
 
 #endif  /* STM32_LTDC_USE_LTDC */
 
-#endif  /* _STM32_LTDC_H_ */
+#endif  /* HAL_STM32_LTDC_H_ */
 
 /** @} */
diff --git a/os/hal/ports/STM32/LLD/TIMv1/hal_eicu_lld.h b/os/hal/ports/STM32/LLD/TIMv1/hal_eicu_lld.h
index 927eb6f..e72098e 100644
--- a/os/hal/ports/STM32/LLD/TIMv1/hal_eicu_lld.h
+++ b/os/hal/ports/STM32/LLD/TIMv1/hal_eicu_lld.h
@@ -22,8 +22,8 @@
    32-bit timers and timers with single capture/compare channels.
 */
 
-#ifndef __EICU_LLD_H
-#define __EICU_LLD_H
+#ifndef HAL_EICU_LLD_H
+#define HAL_EICU_LLD_H
 
 #include "stm32_tim.h"
 
@@ -551,4 +551,4 @@ extern "C" {
 
 #endif /* HAL_USE_EICU */
 
-#endif /* __EICU_LLD_H */
+#endif /* HAL_EICU_LLD_H */
diff --git a/os/hal/ports/STM32/LLD/TIMv1/hal_timcap_lld.c b/os/hal/ports/STM32/LLD/TIMv1/hal_timcap_lld.c
index 8ab6176..c55fae2 100644
--- a/os/hal/ports/STM32/LLD/TIMv1/hal_timcap_lld.c
+++ b/os/hal/ports/STM32/LLD/TIMv1/hal_timcap_lld.c
@@ -24,7 +24,7 @@
 
 
 /**
- * @file    STM32/timcap_lld.c
+ * @file    STM32/hal_timcap_lld.c
  * @brief   STM32 TIMCAP subsystem low level driver header.
  *
  * @addtogroup TIMCAP
diff --git a/os/hal/ports/STM32/LLD/TIMv1/hal_timcap_lld.h b/os/hal/ports/STM32/LLD/TIMv1/hal_timcap_lld.h
index d39c438..643798a 100644
--- a/os/hal/ports/STM32/LLD/TIMv1/hal_timcap_lld.h
+++ b/os/hal/ports/STM32/LLD/TIMv1/hal_timcap_lld.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _TIMCAP_LLD_H_
-#define _TIMCAP_LLD_H_
+#ifndef HAL_TIMCAP_LLD_H_
+#define HAL_TIMCAP_LLD_H_
 
 #include "ch.h"
 #include "hal.h"
diff --git a/os/hal/ports/STM32/LLD/USBHv1/hal_stm32_otg.h b/os/hal/ports/STM32/LLD/USBHv1/hal_stm32_otg.h
index ca2dc49..b88e620 100644
--- a/os/hal/ports/STM32/LLD/USBHv1/hal_stm32_otg.h
+++ b/os/hal/ports/STM32/LLD/USBHv1/hal_stm32_otg.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    stm32_otg.h
+ * @file    hal_stm32_otg.h
  * @brief   STM32 OTG registers layout header.
  *
  * @addtogroup USB
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _STM32_OTG_H_
-#define _STM32_OTG_H_
+#ifndef HAL_STM32_OTG_H_
+#define HAL_STM32_OTG_H_
 
 /**
  * @brief   Number of the implemented endpoints in OTG_FS.
diff --git a/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.h b/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.h
index e8df749..5c0ac40 100644
--- a/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.h
+++ b/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.h
@@ -15,8 +15,8 @@
     limitations under the License.
 */
 
-#ifndef USBH_LLD_H_
-#define USBH_LLD_H_
+#ifndef HAL_USBH_LLD_H_
+#define HAL_USBH_LLD_H_
 
 #include "hal.h"
 
@@ -150,4 +150,4 @@ uint8_t usbh_lld_roothub_get_statuschange_bitmap(USBHDriver *usbh);
 
 #endif
 
-#endif /* USBH_LLD_H_ */
+#endif /* HAL_USBH_LLD_H_ */
diff --git a/os/hal/src/hal_onewire.c b/os/hal/src/hal_onewire.c
index a93eec0..49063a6 100644
--- a/os/hal/src/hal_onewire.c
+++ b/os/hal/src/hal_onewire.c
@@ -46,7 +46,7 @@ on every timer overflow event.
  */
 
 /**
- * @file    onewire.c
+ * @file    hal_onewire.c
  * @brief   1-wire Driver code.
  *
  * @addtogroup onewire
diff --git a/os/hal/src/hal_timcap.c b/os/hal/src/hal_timcap.c
index a352490..309c147 100644
--- a/os/hal/src/hal_timcap.c
+++ b/os/hal/src/hal_timcap.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file    timcap.c
+ * @file    hal_timcap.c
  * @brief   TIMCAP Driver code.
  *
  * @addtogroup TIMCAP
diff --git a/os/various/bitmap.h b/os/various/bitmap.h
index d7831aa..115b54c 100644
--- a/os/various/bitmap.h
+++ b/os/various/bitmap.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _BITMAP_H_
-#define _BITMAP_H_
+#ifndef BITMAP_H_
+#define BITMAP_H_
 
 /*===========================================================================*/
 /* Module constants.                                                         */
@@ -72,6 +72,6 @@ extern "C" {
 }
 #endif
 
-#endif /* _BITMAP_H_ */
+#endif /* BITMAP_H_ */
 
 /** @} */
diff --git a/os/various/tribuf.h b/os/various/tribuf.h
index 4ba3f25..8d8f9f4 100644
--- a/os/various/tribuf.h
+++ b/os/various/tribuf.h
@@ -22,8 +22,8 @@
  * @{

  */

 

-#ifndef _TRIBUF_H_

-#define _TRIBUF_H_

+#ifndef TRIBUF_H_

+#define TRIBUF_H_

 

 /*===========================================================================*/

 /* Driver constants.                                                         */

@@ -221,5 +221,5 @@ extern "C" {
 }

 #endif

 

-#endif  /* _TRIBUF_H_ */

+#endif  /* TRIBUF_H_ */

 /** @} */