Merge branch 'master' into fix-nrf51-port

50 files changed, 112 insertions, 112 deletions

diff --git a/os/hal/ports/KINETIS/K20x/hal_lld.h b/os/hal/ports/KINETIS/K20x/hal_lld.h
index 31364cf..b7f6b46 100644
--- a/os/hal/ports/KINETIS/K20x/hal_lld.h
+++ b/os/hal/ports/KINETIS/K20x/hal_lld.h
@@ -22,8 +22,8 @@
  * @{

  */

 

-#ifndef _HAL_LLD_H_

-#define _HAL_LLD_H_

+#ifndef HAL_LLD_H_

+#define HAL_LLD_H_

 

 #include "kinetis_registry.h"

 

@@ -297,6 +297,6 @@ extern "C" {
 }

 #endif

 

-#endif /* _HAL_LLD_H_ */

+#endif /* HAL_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/K20x/pwm_lld.c b/os/hal/ports/KINETIS/K20x/hal_pwm_lld.c
index f5a8d96..f5a8d96 100644
--- a/os/hal/ports/KINETIS/K20x/pwm_lld.c
+++ b/os/hal/ports/KINETIS/K20x/hal_pwm_lld.c
diff --git a/os/hal/ports/KINETIS/K20x/pwm_lld.h b/os/hal/ports/KINETIS/K20x/hal_pwm_lld.h
index 176e8a8..ccc100f 100644
--- a/os/hal/ports/KINETIS/K20x/pwm_lld.h
+++ b/os/hal/ports/KINETIS/K20x/hal_pwm_lld.h
@@ -22,8 +22,8 @@
  * @{

  */

 

-#ifndef _PWM_LLD_H_

-#define _PWM_LLD_H_

+#ifndef HAL_PWM_LLD_H_

+#define HAL_PWM_LLD_H_

 

 #if HAL_USE_PWM || defined(__DOXYGEN__)

 

@@ -265,6 +265,6 @@ extern "C" {
 

 #endif /* HAL_USE_PWM */

 

-#endif /* _PWM_LLD_H_ */

+#endif /* HAL_PWM_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/K20x/spi_lld.c b/os/hal/ports/KINETIS/K20x/hal_spi_lld.c
index 29ab4e8..29ab4e8 100644
--- a/os/hal/ports/KINETIS/K20x/spi_lld.c
+++ b/os/hal/ports/KINETIS/K20x/hal_spi_lld.c
diff --git a/os/hal/ports/KINETIS/K20x/spi_lld.h b/os/hal/ports/KINETIS/K20x/hal_spi_lld.h
index a1f2a99..0cf108e 100644
--- a/os/hal/ports/KINETIS/K20x/spi_lld.h
+++ b/os/hal/ports/KINETIS/K20x/hal_spi_lld.h
@@ -22,8 +22,8 @@
  * @{

  */

 

-#ifndef _SPI_LLD_H_

-#define _SPI_LLD_H_

+#ifndef HAL_SPI_LLD_H_

+#define HAL_SPI_LLD_H_

 

 #if HAL_USE_SPI || defined(__DOXYGEN__)

 

@@ -256,6 +256,6 @@ extern "C" {
 

 #endif /* HAL_USE_SPI */

 

-#endif /* _SPI_LLD_H_ */

+#endif /* HAL_SPI_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/K20x/kinetis_registry.h b/os/hal/ports/KINETIS/K20x/kinetis_registry.h
index 4c70e84..d2eea6f 100644
--- a/os/hal/ports/KINETIS/K20x/kinetis_registry.h
+++ b/os/hal/ports/KINETIS/K20x/kinetis_registry.h
@@ -23,8 +23,8 @@
  * @{

  */

 

-#ifndef _KINETIS_REGISTRY_H_

-#define _KINETIS_REGISTRY_H_

+#ifndef KINETIS_REGISTRY_H_

+#define KINETIS_REGISTRY_H_

 

 #if !defined(K20x) || defined(__DOXYGEN__)

 #define K20x

@@ -253,6 +253,6 @@
 

 /** @} */

 

-#endif /* _KINETIS_REGISTRY_H_ */

+#endif /* KINETIS_REGISTRY_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/K20x/platform.mk b/os/hal/ports/KINETIS/K20x/platform.mk
index baa90a2..beee336 100644
--- a/os/hal/ports/KINETIS/K20x/platform.mk
+++ b/os/hal/ports/KINETIS/K20x/platform.mk
@@ -1,16 +1,16 @@
 # List of all platform files.

 PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \

               ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/K20x/hal_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/pal_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/serial_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/K20x/spi_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/i2c_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/ext_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/adc_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/gpt_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/K20x/pwm_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/st_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/usb_lld.c

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_pal_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_serial_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/K20x/hal_spi_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_i2c_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_ext_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_adc_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_gpt_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/K20x/hal_pwm_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_st_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_usb_lld.c

 

 # Required include directories

 PLATFORMINC = ${CHIBIOS}/os/hal/ports/common/ARMCMx \

diff --git a/os/hal/ports/KINETIS/KL2x/hal_lld.h b/os/hal/ports/KINETIS/KL2x/hal_lld.h
index a10c21c..d16e13f 100644
--- a/os/hal/ports/KINETIS/KL2x/hal_lld.h
+++ b/os/hal/ports/KINETIS/KL2x/hal_lld.h
@@ -22,8 +22,8 @@
  * @{

  */

 

-#ifndef _HAL_LLD_H_

-#define _HAL_LLD_H_

+#ifndef HAL_LLD_H_

+#define HAL_LLD_H_

 

 #include "kl2xz.h"

 #include "kinetis_registry.h"

@@ -311,6 +311,6 @@ extern "C" {
 }

 #endif

 

-#endif /* _HAL_LLD_H_ */

+#endif /* HAL_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/KL2x/pwm_lld.c b/os/hal/ports/KINETIS/KL2x/hal_pwm_lld.c
index 2f56216..2f56216 100644
--- a/os/hal/ports/KINETIS/KL2x/pwm_lld.c
+++ b/os/hal/ports/KINETIS/KL2x/hal_pwm_lld.c
diff --git a/os/hal/ports/KINETIS/KL2x/pwm_lld.h b/os/hal/ports/KINETIS/KL2x/hal_pwm_lld.h
index 5a3d7c2..64ff9ee 100644
--- a/os/hal/ports/KINETIS/KL2x/pwm_lld.h
+++ b/os/hal/ports/KINETIS/KL2x/hal_pwm_lld.h
@@ -22,8 +22,8 @@
  * @{

  */

 

-#ifndef _PWM_LLD_H_

-#define _PWM_LLD_H_

+#ifndef HAL_PWM_LLD_H_

+#define HAL_PWM_LLD_H_

 

 #if HAL_USE_PWM || defined(__DOXYGEN__)

 

@@ -300,6 +300,6 @@ extern "C" {
 

 #endif /* HAL_USE_PWM */

 

-#endif /* _PWM_LLD_H_ */

+#endif /* HAL_PWM_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/KL2x/kinetis_registry.h b/os/hal/ports/KINETIS/KL2x/kinetis_registry.h
index 92ea0cc..49b1ec8 100644
--- a/os/hal/ports/KINETIS/KL2x/kinetis_registry.h
+++ b/os/hal/ports/KINETIS/KL2x/kinetis_registry.h
@@ -23,8 +23,8 @@
  * @{

  */

 

-#ifndef _KINETIS_REGISTRY_H_

-#define _KINETIS_REGISTRY_H_

+#ifndef KINETIS_REGISTRY_H_

+#define KINETIS_REGISTRY_H_

 

 #if !defined(KL2x) || defined(__DOXYGEN__)

 #define KL2x

@@ -253,6 +253,6 @@
 

 /** @} */

 

-#endif /* _KINETIS_REGISTRY_H_ */

+#endif /* KINETIS_REGISTRY_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/KL2x/platform.mk b/os/hal/ports/KINETIS/KL2x/platform.mk
index 8ababc3..dda7a6d 100644
--- a/os/hal/ports/KINETIS/KL2x/platform.mk
+++ b/os/hal/ports/KINETIS/KL2x/platform.mk
@@ -1,15 +1,15 @@
 # List of all platform files.

 PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \

               ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/KL2x/hal_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/pal_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/serial_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/i2c_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/ext_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/adc_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/gpt_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/KL2x/pwm_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/st_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/usb_lld.c

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_pal_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_serial_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_i2c_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_ext_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_adc_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_gpt_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/KL2x/hal_pwm_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_st_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_usb_lld.c

 

 # Required include directories

 PLATFORMINC = ${CHIBIOS}/os/hal/ports/common/ARMCMx \

diff --git a/os/hal/ports/KINETIS/LLD/adc_lld.c b/os/hal/ports/KINETIS/LLD/hal_adc_lld.c
index c0904c8..c0904c8 100644
--- a/os/hal/ports/KINETIS/LLD/adc_lld.c
+++ b/os/hal/ports/KINETIS/LLD/hal_adc_lld.c
diff --git a/os/hal/ports/KINETIS/LLD/adc_lld.h b/os/hal/ports/KINETIS/LLD/hal_adc_lld.h
index 22db2c0..c4edbd6 100644
--- a/os/hal/ports/KINETIS/LLD/adc_lld.h
+++ b/os/hal/ports/KINETIS/LLD/hal_adc_lld.h
@@ -22,8 +22,8 @@
  * @{

  */

 

-#ifndef _ADC_LLD_H_

-#define _ADC_LLD_H_

+#ifndef HAL_ADC_LLD_H_

+#define HAL_ADC_LLD_H_

 

 #if HAL_USE_ADC || defined(__DOXYGEN__)

 

@@ -355,6 +355,6 @@ extern "C" {
 

 #endif /* HAL_USE_ADC */

 

-#endif /* _ADC_LLD_H_ */

+#endif /* HAL_ADC_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/LLD/ext_lld.c b/os/hal/ports/KINETIS/LLD/hal_ext_lld.c
index 21bb6e0..21bb6e0 100644
--- a/os/hal/ports/KINETIS/LLD/ext_lld.c
+++ b/os/hal/ports/KINETIS/LLD/hal_ext_lld.c
diff --git a/os/hal/ports/KINETIS/LLD/ext_lld.h b/os/hal/ports/KINETIS/LLD/hal_ext_lld.h
index 465bb89..bcd9cb0 100644
--- a/os/hal/ports/KINETIS/LLD/ext_lld.h
+++ b/os/hal/ports/KINETIS/LLD/hal_ext_lld.h
@@ -22,8 +22,8 @@
  * @{

  */

 

-#ifndef _EXT_LLD_H_

-#define _EXT_LLD_H_

+#ifndef HAL_EXT_LLD_H_

+#define HAL_EXT_LLD_H_

 

 #if HAL_USE_EXT || defined(__DOXYGEN__)

 

@@ -183,6 +183,6 @@ extern "C" {
 

 #endif /* HAL_USE_EXT */

 

-#endif /* _EXT_LLD_H_ */

+#endif /* HAL_EXT_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/LLD/gpt_lld.c b/os/hal/ports/KINETIS/LLD/hal_gpt_lld.c
index 6e88f88..6e88f88 100644
--- a/os/hal/ports/KINETIS/LLD/gpt_lld.c
+++ b/os/hal/ports/KINETIS/LLD/hal_gpt_lld.c
diff --git a/os/hal/ports/KINETIS/LLD/gpt_lld.h b/os/hal/ports/KINETIS/LLD/hal_gpt_lld.h
index 5c3e233..1b9e5ef 100644
--- a/os/hal/ports/KINETIS/LLD/gpt_lld.h
+++ b/os/hal/ports/KINETIS/LLD/hal_gpt_lld.h
@@ -22,8 +22,8 @@
  * @{

  */

 

-#ifndef _GPT_LLD_H_

-#define _GPT_LLD_H_

+#ifndef HAL_GPT_LLD_H_

+#define HAL_GPT_LLD_H_

 

 #if HAL_USE_GPT || defined(__DOXYGEN__)

 

@@ -328,6 +328,6 @@ extern "C" {
 

 #endif /* HAL_USE_GPT */

 

-#endif /* _GPT_LLD_H_ */

+#endif /* HAL_GPT_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/LLD/i2c_lld.c b/os/hal/ports/KINETIS/LLD/hal_i2c_lld.c
index 3659a93..3659a93 100644
--- a/os/hal/ports/KINETIS/LLD/i2c_lld.c
+++ b/os/hal/ports/KINETIS/LLD/hal_i2c_lld.c
diff --git a/os/hal/ports/KINETIS/LLD/i2c_lld.h b/os/hal/ports/KINETIS/LLD/hal_i2c_lld.h
index 5f1ed87..a7214c5 100644
--- a/os/hal/ports/KINETIS/LLD/i2c_lld.h
+++ b/os/hal/ports/KINETIS/LLD/hal_i2c_lld.h
@@ -22,8 +22,8 @@
  * @{

  */

 

-#ifndef _I2C_LLD_H_

-#define _I2C_LLD_H_

+#ifndef HAL_I2C_LLD_H_

+#define HAL_I2C_LLD_H_

 

 #if HAL_USE_I2C || defined(__DOXYGEN__)

 

@@ -231,6 +231,6 @@ extern "C" {
 

 #endif /* HAL_USE_I2C */

 

-#endif /* _I2C_LLD_H_ */

+#endif /* HAL_I2C_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/LLD/pal_lld.c b/os/hal/ports/KINETIS/LLD/hal_pal_lld.c
index b307833..b307833 100644
--- a/os/hal/ports/KINETIS/LLD/pal_lld.c
+++ b/os/hal/ports/KINETIS/LLD/hal_pal_lld.c
diff --git a/os/hal/ports/KINETIS/LLD/pal_lld.h b/os/hal/ports/KINETIS/LLD/hal_pal_lld.h
index 2bd9872..05749d5 100644
--- a/os/hal/ports/KINETIS/LLD/pal_lld.h
+++ b/os/hal/ports/KINETIS/LLD/hal_pal_lld.h
@@ -22,8 +22,8 @@
  * @{

  */

 

-#ifndef _PAL_LLD_H_

-#define _PAL_LLD_H_

+#ifndef HAL_PAL_LLD_H_

+#define HAL_PAL_LLD_H_

 

 #if HAL_USE_PAL || defined(__DOXYGEN__)

 

@@ -381,6 +381,6 @@ extern "C" {
 

 #endif /* HAL_USE_PAL */

 

-#endif /* _PAL_LLD_H_ */

+#endif /* HAL_PAL_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/LLD/serial_lld.c b/os/hal/ports/KINETIS/LLD/hal_serial_lld.c
index c80cf22..c80cf22 100644
--- a/os/hal/ports/KINETIS/LLD/serial_lld.c
+++ b/os/hal/ports/KINETIS/LLD/hal_serial_lld.c
diff --git a/os/hal/ports/KINETIS/LLD/serial_lld.h b/os/hal/ports/KINETIS/LLD/hal_serial_lld.h
index cc66eb3..f11c063 100644
--- a/os/hal/ports/KINETIS/LLD/serial_lld.h
+++ b/os/hal/ports/KINETIS/LLD/hal_serial_lld.h
@@ -22,8 +22,8 @@
  * @{

  */

 

-#ifndef _SERIAL_LLD_H_

-#define _SERIAL_LLD_H_

+#ifndef HAL_SERIAL_LLD_H_

+#define HAL_SERIAL_LLD_H_

 

 #if HAL_USE_SERIAL || defined(__DOXYGEN__)

 

@@ -215,6 +215,6 @@ extern "C" {
 

 #endif /* HAL_USE_SERIAL */

 

-#endif /* _SERIAL_LLD_H_ */

+#endif /* HAL_SERIAL_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/LLD/st_lld.c b/os/hal/ports/KINETIS/LLD/hal_st_lld.c
index e6ed9e5..e6ed9e5 100644
--- a/os/hal/ports/KINETIS/LLD/st_lld.c
+++ b/os/hal/ports/KINETIS/LLD/hal_st_lld.c
diff --git a/os/hal/ports/KINETIS/LLD/st_lld.h b/os/hal/ports/KINETIS/LLD/hal_st_lld.h
index c67a5d0..29c7035 100644
--- a/os/hal/ports/KINETIS/LLD/st_lld.h
+++ b/os/hal/ports/KINETIS/LLD/hal_st_lld.h
@@ -24,8 +24,8 @@
  * @{

  */

 

-#ifndef _ST_LLD_H_

-#define _ST_LLD_H_

+#ifndef HAL_ST_LLD_H_

+#define HAL_ST_LLD_H_

 

 #include "mcuconf.h"

 

@@ -151,6 +151,6 @@ static inline bool st_lld_is_alarm_active(void) {
   return false;

 }

 

-#endif /* _ST_LLD_H_ */

+#endif /* HAL_ST_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/LLD/usb_lld.c b/os/hal/ports/KINETIS/LLD/hal_usb_lld.c
index 159aef9..159aef9 100644
--- a/os/hal/ports/KINETIS/LLD/usb_lld.c
+++ b/os/hal/ports/KINETIS/LLD/hal_usb_lld.c
diff --git a/os/hal/ports/KINETIS/LLD/usb_lld.h b/os/hal/ports/KINETIS/LLD/hal_usb_lld.h
index 978e8a6..593ef16 100644
--- a/os/hal/ports/KINETIS/LLD/usb_lld.h
+++ b/os/hal/ports/KINETIS/LLD/hal_usb_lld.h
@@ -23,8 +23,8 @@
  * @{

  */

 

-#ifndef _USB_LLD_H_

-#define _USB_LLD_H_

+#ifndef HAL_USB_LLD_H_

+#define HAL_USB_LLD_H_

 

 #if HAL_USE_USB || defined(__DOXYGEN__)

 

@@ -423,6 +423,6 @@ extern "C" {
 

 #endif /* HAL_USE_USB */

 

-#endif /* _USB_LLD_H_ */

+#endif /* HAL_USB_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/TIVA/LLD/ext_lld.c b/os/hal/ports/TIVA/LLD/hal_ext_lld.c
index dc58d99..dc58d99 100644
--- a/os/hal/ports/TIVA/LLD/ext_lld.c
+++ b/os/hal/ports/TIVA/LLD/hal_ext_lld.c
diff --git a/os/hal/ports/TIVA/LLD/ext_lld.h b/os/hal/ports/TIVA/LLD/hal_ext_lld.h
index 3817130..a75f167 100644
--- a/os/hal/ports/TIVA/LLD/ext_lld.h
+++ b/os/hal/ports/TIVA/LLD/hal_ext_lld.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _EXT_LLD_H_
-#define _EXT_LLD_H_
+#ifndef HAL_EXT_LLD_H
+#define HAL_EXT_LLD_H
 
 #if HAL_USE_EXT || defined(__DOXYGEN__)
 
@@ -518,6 +518,6 @@ extern "C" {
 
 #endif /* HAL_USE_EXT */
 
-#endif /* _EXT_LLD_H_ */
+#endif /* HAL_EXT_LLD_H */
 
 /** @} */
diff --git a/os/hal/ports/TIVA/LLD/gpt_lld.c b/os/hal/ports/TIVA/LLD/hal_gpt_lld.c
index c160687..c160687 100644
--- a/os/hal/ports/TIVA/LLD/gpt_lld.c
+++ b/os/hal/ports/TIVA/LLD/hal_gpt_lld.c
diff --git a/os/hal/ports/TIVA/LLD/gpt_lld.h b/os/hal/ports/TIVA/LLD/hal_gpt_lld.h
index 2f1f75d..b6f6667 100644
--- a/os/hal/ports/TIVA/LLD/gpt_lld.h
+++ b/os/hal/ports/TIVA/LLD/hal_gpt_lld.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _GPT_LLD_H_
-#define _GPT_LLD_H_
+#ifndef HAL_GPT_LLD_H
+#define HAL_GPT_LLD_H
 
 #if HAL_USE_GPT || defined(__DOXYGEN__)
 
@@ -496,6 +496,6 @@ extern "C" {
 
 #endif /* HAL_USE_GPT */
 
-#endif /* _GPT_LLD_H_ */
+#endif /* HAL_GPT_LLD_H */
 
 /** @} */
diff --git a/os/hal/ports/TIVA/LLD/i2c_lld.c b/os/hal/ports/TIVA/LLD/hal_i2c_lld.c
index f4c555b..f4c555b 100644
--- a/os/hal/ports/TIVA/LLD/i2c_lld.c
+++ b/os/hal/ports/TIVA/LLD/hal_i2c_lld.c
diff --git a/os/hal/ports/TIVA/LLD/i2c_lld.h b/os/hal/ports/TIVA/LLD/hal_i2c_lld.h
index 1479600..d112867 100644
--- a/os/hal/ports/TIVA/LLD/i2c_lld.h
+++ b/os/hal/ports/TIVA/LLD/hal_i2c_lld.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _I2C_LLD_H_
-#define _I2C_LLD_H_
+#ifndef HAL_I2C_LLD_H
+#define HAL_I2C_LLD_H
 
 #if HAL_USE_I2C || defined(__DOXYGEN__)
 
@@ -522,6 +522,6 @@ extern "C" {
 
 #endif /* HAL_USE_I2C  */
 
-#endif /* _I2C_LLD_H_ */
+#endif /* HAL_I2C_LLD_H */
 
 /** @} */
diff --git a/os/hal/ports/TIVA/LLD/mac_lld.c b/os/hal/ports/TIVA/LLD/hal_mac_lld.c
index 226695e..3c6c739 100644
--- a/os/hal/ports/TIVA/LLD/mac_lld.c
+++ b/os/hal/ports/TIVA/LLD/hal_mac_lld.c
@@ -28,7 +28,7 @@
 
 #if HAL_USE_MAC || defined(__DOXYGEN__)
 
-#include "mii.h"
+#include "hal_mii.h"
 
 /*===========================================================================*/
 /* Driver local definitions.                                                 */
diff --git a/os/hal/ports/TIVA/LLD/mac_lld.h b/os/hal/ports/TIVA/LLD/hal_mac_lld.h
index af088b0..9d030d7 100644
--- a/os/hal/ports/TIVA/LLD/mac_lld.h
+++ b/os/hal/ports/TIVA/LLD/hal_mac_lld.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _MAC_LLD_H_
-#define _MAC_LLD_H_
+#ifndef HAL_MAC_LLD_H
+#define HAL_MAC_LLD_H
 
 #if HAL_USE_MAC || defined(__DOXYGEN__)
 
@@ -433,6 +433,6 @@ extern "C" {
 
 #endif /* HAL_USE_MAC */
 
-#endif /* _MAC_LLD_H_ */
+#endif /* HAL_MAC_LLD_H */
 
 /** @} */
diff --git a/os/hal/ports/TIVA/LLD/pal_lld.c b/os/hal/ports/TIVA/LLD/hal_pal_lld.c
index 50a9a82..50a9a82 100644
--- a/os/hal/ports/TIVA/LLD/pal_lld.c
+++ b/os/hal/ports/TIVA/LLD/hal_pal_lld.c
diff --git a/os/hal/ports/TIVA/LLD/pal_lld.h b/os/hal/ports/TIVA/LLD/hal_pal_lld.h
index 116c659..acde7e6 100644
--- a/os/hal/ports/TIVA/LLD/pal_lld.h
+++ b/os/hal/ports/TIVA/LLD/hal_pal_lld.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _PAL_LLD_H_
-#define _PAL_LLD_H_
+#ifndef HAL_PAL_LLD_H
+#define HAL_PAL_LLD_H
 
 #if HAL_USE_PAL || defined(__DOXYGEN__)
 
@@ -755,7 +755,7 @@ extern "C" {
 
 #endif /* HAL_USE_PAL */
 
-#endif /* _PAL_LLD_H_ */
+#endif /* HAL_PAL_LLD_H */
 
 /**
  * @}
diff --git a/os/hal/ports/TIVA/LLD/pwm_lld.c b/os/hal/ports/TIVA/LLD/hal_pwm_lld.c
index fdde9f8..fdde9f8 100644
--- a/os/hal/ports/TIVA/LLD/pwm_lld.c
+++ b/os/hal/ports/TIVA/LLD/hal_pwm_lld.c
diff --git a/os/hal/ports/TIVA/LLD/pwm_lld.h b/os/hal/ports/TIVA/LLD/hal_pwm_lld.h
index 472bae8..374c563 100644
--- a/os/hal/ports/TIVA/LLD/pwm_lld.h
+++ b/os/hal/ports/TIVA/LLD/hal_pwm_lld.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _PWM_LLD_H_
-#define _PWM_LLD_H_
+#ifndef HAL_PWM_LLD_H
+#define HAL_PWM_LLD_H
 
 #if HAL_USE_PWM || defined(__DOXYGEN__)
 
@@ -367,6 +367,6 @@ extern "C" {
 
 #endif /* HAL_USE_PWM */
 
-#endif /* _PWM_LLD_H_ */
+#endif /* HAL_PWM_LLD_H */
 
 /** @} */
diff --git a/os/hal/ports/TIVA/LLD/serial_lld.c b/os/hal/ports/TIVA/LLD/hal_serial_lld.c
index 92761dc..92761dc 100644
--- a/os/hal/ports/TIVA/LLD/serial_lld.c
+++ b/os/hal/ports/TIVA/LLD/hal_serial_lld.c
diff --git a/os/hal/ports/TIVA/LLD/serial_lld.h b/os/hal/ports/TIVA/LLD/hal_serial_lld.h
index 535d0a5..0301a5a 100644
--- a/os/hal/ports/TIVA/LLD/serial_lld.h
+++ b/os/hal/ports/TIVA/LLD/hal_serial_lld.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _SERIAL_LLD_H_
-#define _SERIAL_LLD_H_
+#ifndef HAL_SERIAL_LLD_H
+#define HAL_SERIAL_LLD_H
 
 #if HAL_USE_SERIAL || defined(__DOXYGEN__)
 
@@ -477,6 +477,6 @@ extern "C" {
 
 #endif /* HAL_USE_SERIAL */
 
-#endif /* _SERIAL_LLD_H_ */
+#endif /* HAL_SERIAL_LLD_H */
 
 /** @} */
diff --git a/os/hal/ports/TIVA/LLD/spi_lld.c b/os/hal/ports/TIVA/LLD/hal_spi_lld.c
index cd1c3cf..cd1c3cf 100644
--- a/os/hal/ports/TIVA/LLD/spi_lld.c
+++ b/os/hal/ports/TIVA/LLD/hal_spi_lld.c
diff --git a/os/hal/ports/TIVA/LLD/spi_lld.h b/os/hal/ports/TIVA/LLD/hal_spi_lld.h
index 5c04d69..810489a 100644
--- a/os/hal/ports/TIVA/LLD/spi_lld.h
+++ b/os/hal/ports/TIVA/LLD/hal_spi_lld.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _SPI_LLD_H_
-#define _SPI_LLD_H_
+#ifndef HAL_SPI_LLD_H
+#define HAL_SPI_LLD_H
 
 #if HAL_USE_SPI || defined(__DOXYGEN__)
 
@@ -383,6 +383,6 @@ extern "C" {
 
 #endif /* HAL_USE_SPI */
 
-#endif /* _SPI_LLD_H_ */
+#endif /* HAL_SPI_LLD_H */
 
 /** @} */
diff --git a/os/hal/ports/TIVA/LLD/st_lld.c b/os/hal/ports/TIVA/LLD/hal_st_lld.c
index 1109855..1109855 100644
--- a/os/hal/ports/TIVA/LLD/st_lld.c
+++ b/os/hal/ports/TIVA/LLD/hal_st_lld.c
diff --git a/os/hal/ports/TIVA/LLD/st_lld.h b/os/hal/ports/TIVA/LLD/hal_st_lld.h
index 23b3ef5..61acbf0 100644
--- a/os/hal/ports/TIVA/LLD/st_lld.h
+++ b/os/hal/ports/TIVA/LLD/hal_st_lld.h
@@ -24,8 +24,8 @@
  * @{
  */
 
-#ifndef _ST_LLD_H_
-#define _ST_LLD_H_
+#ifndef HAL_ST_LLD_H
+#define HAL_ST_LLD_H
 
 #include "mcuconf.h"
 #include "tiva_registry.h"
@@ -269,7 +269,7 @@ static inline bool st_lld_is_alarm_active(void)
   return (bool) ((TIVA_ST_TIM->IMR & GPTM_IMR_TAMIM) !=0);
 }
 
-#endif /* _ST_LLD_H_ */
+#endif /* HAL_ST_LLD_H */
 
 /**
  * @}
diff --git a/os/hal/ports/TIVA/TM4C123x/hal_lld.h b/os/hal/ports/TIVA/TM4C123x/hal_lld.h
index 5c2cd25..ea8fc79 100644
--- a/os/hal/ports/TIVA/TM4C123x/hal_lld.h
+++ b/os/hal/ports/TIVA/TM4C123x/hal_lld.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _HAL_LLD_H_
-#define _HAL_LLD_H_
+#ifndef HAL_LLD_H
+#define HAL_LLD_H
 
 #include "tiva_registry.h"
 
@@ -355,7 +355,7 @@ extern "C" {
 }
 #endif
 
-#endif /* _HAL_LLD_H_ */
+#endif /* HAL_LLD_H */
 
 /**
  * @}
diff --git a/os/hal/ports/TIVA/TM4C123x/platform.mk b/os/hal/ports/TIVA/TM4C123x/platform.mk
index 0e69f15..1b8d9ac 100644
--- a/os/hal/ports/TIVA/TM4C123x/platform.mk
+++ b/os/hal/ports/TIVA/TM4C123x/platform.mk
@@ -1,15 +1,15 @@
 # List of all the TM4C123x platform files.
 PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \
               ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/TM4C123x/hal_lld.c \
-              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/st_lld.c \
-              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/pal_lld.c \
-              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/serial_lld.c \
-              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/i2c_lld.c \
-              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/gpt_lld.c \
-              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/pwm_lld.c \
-              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/spi_lld.c \
-              ${CHISIOS_CONTRIB}/os/hal/ports/TIVA/LLD/tiva_udma.c \
-              ${CHISIOS_CONTRIB}/os/hal/ports/TIVA/LLD/ext_lld.c
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_st_lld.c \
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_pal_lld.c \
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_serial_lld.c \
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_i2c_lld.c \
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_gpt_lld.c \
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_pwm_lld.c \
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_spi_lld.c \
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/tiva_udma.c \
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_ext_lld.c
 
 # Required include directories
 PLATFORMINC = ${CHIBIOS}/os/hal/ports/common/ARMCMx \
diff --git a/os/hal/ports/TIVA/TM4C129x/hal_lld.h b/os/hal/ports/TIVA/TM4C129x/hal_lld.h
index dc6644f..9a8f690 100644
--- a/os/hal/ports/TIVA/TM4C129x/hal_lld.h
+++ b/os/hal/ports/TIVA/TM4C129x/hal_lld.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _HAL_LLD_H_
-#define _HAL_LLD_H_
+#ifndef HAL_LLD_H
+#define HAL_LLD_H
 
 #include "tiva_registry.h"
 
@@ -369,7 +369,7 @@ extern "C" {
 }
 #endif
 
-#endif /* _HAL_LLD_H_ */
+#endif /* HAL_LLD_H */
 
 /**
  * @}
diff --git a/os/hal/ports/TIVA/TM4C129x/platform.mk b/os/hal/ports/TIVA/TM4C129x/platform.mk
index a3577d1..6f0c0df 100644
--- a/os/hal/ports/TIVA/TM4C129x/platform.mk
+++ b/os/hal/ports/TIVA/TM4C129x/platform.mk
@@ -1,11 +1,11 @@
 # List of all the TM4C129x platform files.
 PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \
               ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/TM4C129x/hal_lld.c \
-              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/st_lld.c \
-              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/pal_lld.c \
-              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/serial_lld.c \
-              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/mac_lld.c \
-              ${CHISIOS_CONTRIB}/os/hal/ports/TIVA/LLD/ext_lld.c
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_st_lld.c \
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_pal_lld.c \
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_serial_lld.c \
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_mac_lld.c \
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_ext_lld.c
 
 # Required include directories
 PLATFORMINC = ${CHIBIOS}/os/hal/ports/common/ARMCMx \