diff options
author | Fabio Utzig <utzig@utzig.org> | 2016-04-10 21:09:36 -0300 |
---|---|---|
committer | Fabio Utzig <utzig@utzig.org> | 2016-04-10 21:09:36 -0300 |
commit | 5323be76402e0359570e81cdabd3cf929b8d41b2 (patch) | |
tree | 1c17a57e5f4ec142f0a3cc609ce5f60999d623d1 /os/hal/ports/TIVA/LLD | |
parent | 99c3815a527585127b850f555078de4792ca7caf (diff) | |
parent | b86af2c09feea9b50cb241c147a3881e55763a55 (diff) | |
download | ChibiOS-Contrib-5323be76402e0359570e81cdabd3cf929b8d41b2.tar.gz ChibiOS-Contrib-5323be76402e0359570e81cdabd3cf929b8d41b2.tar.bz2 ChibiOS-Contrib-5323be76402e0359570e81cdabd3cf929b8d41b2.zip |
Merge branch 'master' into fix-nrf51-port
Diffstat (limited to 'os/hal/ports/TIVA/LLD')
-rw-r--r-- | os/hal/ports/TIVA/LLD/hal_ext_lld.c (renamed from os/hal/ports/TIVA/LLD/ext_lld.c) | 0 | ||||
-rw-r--r-- | os/hal/ports/TIVA/LLD/hal_ext_lld.h (renamed from os/hal/ports/TIVA/LLD/ext_lld.h) | 6 | ||||
-rw-r--r-- | os/hal/ports/TIVA/LLD/hal_gpt_lld.c (renamed from os/hal/ports/TIVA/LLD/gpt_lld.c) | 0 | ||||
-rw-r--r-- | os/hal/ports/TIVA/LLD/hal_gpt_lld.h (renamed from os/hal/ports/TIVA/LLD/gpt_lld.h) | 6 | ||||
-rw-r--r-- | os/hal/ports/TIVA/LLD/hal_i2c_lld.c (renamed from os/hal/ports/TIVA/LLD/i2c_lld.c) | 0 | ||||
-rw-r--r-- | os/hal/ports/TIVA/LLD/hal_i2c_lld.h (renamed from os/hal/ports/TIVA/LLD/i2c_lld.h) | 6 | ||||
-rw-r--r-- | os/hal/ports/TIVA/LLD/hal_mac_lld.c (renamed from os/hal/ports/TIVA/LLD/mac_lld.c) | 2 | ||||
-rw-r--r-- | os/hal/ports/TIVA/LLD/hal_mac_lld.h (renamed from os/hal/ports/TIVA/LLD/mac_lld.h) | 6 | ||||
-rw-r--r-- | os/hal/ports/TIVA/LLD/hal_pal_lld.c (renamed from os/hal/ports/TIVA/LLD/pal_lld.c) | 0 | ||||
-rw-r--r-- | os/hal/ports/TIVA/LLD/hal_pal_lld.h (renamed from os/hal/ports/TIVA/LLD/pal_lld.h) | 6 | ||||
-rw-r--r-- | os/hal/ports/TIVA/LLD/hal_pwm_lld.c (renamed from os/hal/ports/TIVA/LLD/pwm_lld.c) | 0 | ||||
-rw-r--r-- | os/hal/ports/TIVA/LLD/hal_pwm_lld.h (renamed from os/hal/ports/TIVA/LLD/pwm_lld.h) | 6 | ||||
-rw-r--r-- | os/hal/ports/TIVA/LLD/hal_serial_lld.c (renamed from os/hal/ports/TIVA/LLD/serial_lld.c) | 0 | ||||
-rw-r--r-- | os/hal/ports/TIVA/LLD/hal_serial_lld.h (renamed from os/hal/ports/TIVA/LLD/serial_lld.h) | 6 | ||||
-rw-r--r-- | os/hal/ports/TIVA/LLD/hal_spi_lld.c (renamed from os/hal/ports/TIVA/LLD/spi_lld.c) | 0 | ||||
-rw-r--r-- | os/hal/ports/TIVA/LLD/hal_spi_lld.h (renamed from os/hal/ports/TIVA/LLD/spi_lld.h) | 6 | ||||
-rw-r--r-- | os/hal/ports/TIVA/LLD/hal_st_lld.c (renamed from os/hal/ports/TIVA/LLD/st_lld.c) | 0 | ||||
-rw-r--r-- | os/hal/ports/TIVA/LLD/hal_st_lld.h (renamed from os/hal/ports/TIVA/LLD/st_lld.h) | 6 |
18 files changed, 28 insertions, 28 deletions
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 */ /** * @} |