diff options
author | Fabio Utzig <utzig@utzig.org> | 2016-04-04 19:36:24 -0300 |
---|---|---|
committer | Fabio Utzig <utzig@utzig.org> | 2016-04-04 19:36:24 -0300 |
commit | 4c5a09e72722351d0139a64f3c9f476e38f95554 (patch) | |
tree | 5473ff62ef035c5683ad7a72643be34454b3c3e7 /os/hal/ports/NRF51 | |
parent | f679a82be7d4292c3ac5d3db86df429dbf2ddbeb (diff) | |
download | ChibiOS-Contrib-4c5a09e72722351d0139a64f3c9f476e38f95554.tar.gz ChibiOS-Contrib-4c5a09e72722351d0139a64f3c9f476e38f95554.tar.bz2 ChibiOS-Contrib-4c5a09e72722351d0139a64f3c9f476e38f95554.zip |
Fix headers guards + style fixes
Diffstat (limited to 'os/hal/ports/NRF51')
-rw-r--r-- | os/hal/ports/NRF51/NRF51822/hal_adc_lld.h | 6 | ||||
-rw-r--r-- | os/hal/ports/NRF51/NRF51822/hal_ext_lld.h | 6 | ||||
-rw-r--r-- | os/hal/ports/NRF51/NRF51822/hal_ext_lld_isr.h | 6 | ||||
-rw-r--r-- | os/hal/ports/NRF51/NRF51822/hal_gpt_lld.h | 6 | ||||
-rw-r--r-- | os/hal/ports/NRF51/NRF51822/hal_i2c_lld.h | 6 | ||||
-rw-r--r-- | os/hal/ports/NRF51/NRF51822/hal_lld.h | 10 | ||||
-rw-r--r-- | os/hal/ports/NRF51/NRF51822/hal_pal_lld.h | 6 | ||||
-rw-r--r-- | os/hal/ports/NRF51/NRF51822/hal_rng_lld.c | 4 | ||||
-rw-r--r-- | os/hal/ports/NRF51/NRF51822/hal_rng_lld.h | 10 | ||||
-rw-r--r-- | os/hal/ports/NRF51/NRF51822/hal_serial_lld.h | 6 | ||||
-rw-r--r-- | os/hal/ports/NRF51/NRF51822/hal_spi_lld.h | 6 | ||||
-rw-r--r-- | os/hal/ports/NRF51/NRF51822/hal_st_lld.h | 6 | ||||
-rw-r--r-- | os/hal/ports/NRF51/NRF51822/hal_wdg_lld.h | 20 |
13 files changed, 49 insertions, 49 deletions
diff --git a/os/hal/ports/NRF51/NRF51822/hal_adc_lld.h b/os/hal/ports/NRF51/NRF51822/hal_adc_lld.h index 52d8e78..36854fb 100644 --- a/os/hal/ports/NRF51/NRF51822/hal_adc_lld.h +++ b/os/hal/ports/NRF51/NRF51822/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__)
@@ -224,6 +224,6 @@ extern "C" { #endif /* HAL_USE_ADC */
-#endif /* _ADC_LLD_H_ */
+#endif /* HAL_ADC_LLD_H */
/** @} */
diff --git a/os/hal/ports/NRF51/NRF51822/hal_ext_lld.h b/os/hal/ports/NRF51/NRF51822/hal_ext_lld.h index 11eae69..37ae721 100644 --- a/os/hal/ports/NRF51/NRF51822/hal_ext_lld.h +++ b/os/hal/ports/NRF51/NRF51822/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__)
@@ -134,6 +134,6 @@ extern "C" { #endif /* HAL_USE_EXT */
-#endif /* _EXT_LLD_H_ */
+#endif /* HAL_EXT_LLD_H */
/** @} */
diff --git a/os/hal/ports/NRF51/NRF51822/hal_ext_lld_isr.h b/os/hal/ports/NRF51/NRF51822/hal_ext_lld_isr.h index 5ea8763..736e55c 100644 --- a/os/hal/ports/NRF51/NRF51822/hal_ext_lld_isr.h +++ b/os/hal/ports/NRF51/NRF51822/hal_ext_lld_isr.h @@ -22,8 +22,8 @@ * @{
*/
-#ifndef _EXT_LLD_ISR_H_
-#define _EXT_LLD_ISR_H_
+#ifndef HAL_EXT_LLD_ISR_H
+#define HAL_EXT_LLD_ISR_H
#if HAL_USE_EXT || defined(__DOXYGEN__)
@@ -74,6 +74,6 @@ extern "C" { #endif /* HAL_USE_EXT */
-#endif /* _EXT_LLD_ISR_H_ */
+#endif /* HAL_EXT_LLD_ISR_H */
/** @} */
diff --git a/os/hal/ports/NRF51/NRF51822/hal_gpt_lld.h b/os/hal/ports/NRF51/NRF51822/hal_gpt_lld.h index 2c84d6c..748be0a 100644 --- a/os/hal/ports/NRF51/NRF51822/hal_gpt_lld.h +++ b/os/hal/ports/NRF51/NRF51822/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__)
@@ -261,6 +261,6 @@ extern "C" { #endif /* HAL_USE_GPT */
-#endif /* _GPT_LLD_H_ */
+#endif /* HAL_GPT_LLD_H */
/** @} */
diff --git a/os/hal/ports/NRF51/NRF51822/hal_i2c_lld.h b/os/hal/ports/NRF51/NRF51822/hal_i2c_lld.h index be3ea5b..555ced1 100644 --- a/os/hal/ports/NRF51/NRF51822/hal_i2c_lld.h +++ b/os/hal/ports/NRF51/NRF51822/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__)
@@ -217,6 +217,6 @@ extern "C" { #endif /* HAL_USE_I2C */
-#endif /* _I2C_LLD_H_ */
+#endif /* HAL_I2C_LLD_H */
/** @} */
diff --git a/os/hal/ports/NRF51/NRF51822/hal_lld.h b/os/hal/ports/NRF51/NRF51822/hal_lld.h index 283c207..e404020 100644 --- a/os/hal/ports/NRF51/NRF51822/hal_lld.h +++ b/os/hal/ports/NRF51/NRF51822/hal_lld.h @@ -22,8 +22,8 @@ * @{ */ -#ifndef _HAL_LLD_H_ -#define _HAL_LLD_H_ +#ifndef HAL_LLD_H +#define HAL_LLD_H /*===========================================================================*/ /* Driver constants. */ @@ -83,8 +83,8 @@ #include "nvic.h" -#define NRF51_LFCLK_FREQUENCY 32768 -#define NRF51_HFCLK_FREQUENCY 16000000 +#define NRF51_LFCLK_FREQUENCY 32768 +#define NRF51_HFCLK_FREQUENCY 16000000 #ifdef __cplusplus extern "C" { @@ -95,7 +95,7 @@ extern "C" { } #endif -#endif /* _HAL_LLD_H_ */ +#endif /* HAL_LLD_H */ /** * @} diff --git a/os/hal/ports/NRF51/NRF51822/hal_pal_lld.h b/os/hal/ports/NRF51/NRF51822/hal_pal_lld.h index d2f0dfb..4425d24 100644 --- a/os/hal/ports/NRF51/NRF51822/hal_pal_lld.h +++ b/os/hal/ports/NRF51/NRF51822/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 == TRUE) || defined(__DOXYGEN__)
@@ -303,6 +303,6 @@ extern "C" { #endif /* HAL_USE_PAL == TRUE */
-#endif /* _PAL_LLD_H_ */
+#endif /* HAL_PAL_LLD_H */
/** @} */
diff --git a/os/hal/ports/NRF51/NRF51822/hal_rng_lld.c b/os/hal/ports/NRF51/NRF51822/hal_rng_lld.c index 74bba64..5e501ed 100644 --- a/os/hal/ports/NRF51/NRF51822/hal_rng_lld.c +++ b/os/hal/ports/NRF51/NRF51822/hal_rng_lld.c @@ -34,7 +34,7 @@ * @brief RNG default configuration. */ static const RNGConfig default_config = { - .digital_error_correction = 1, + .digital_error_correction = 1, }; /*===========================================================================*/ @@ -119,7 +119,7 @@ void rng_lld_stop(RNGDriver *rngp) { * @notapi */ msg_t rng_lld_write(RNGDriver *rngp, uint8_t *buf, size_t n, - systime_t timeout) { + systime_t timeout) { size_t i; for (i = 0 ; i < n ; i++) { diff --git a/os/hal/ports/NRF51/NRF51822/hal_rng_lld.h b/os/hal/ports/NRF51/NRF51822/hal_rng_lld.h index 8d4db02..475770b 100644 --- a/os/hal/ports/NRF51/NRF51822/hal_rng_lld.h +++ b/os/hal/ports/NRF51/NRF51822/hal_rng_lld.h @@ -22,8 +22,8 @@ * @{ */ -#ifndef _RNG_LLD_H_ -#define _RNG_LLD_H_ +#ifndef HAL_RNG_LLD_H +#define HAL_RNG_LLD_H #if (HAL_USE_RNG == TRUE) || defined(__DOXYGEN__) @@ -61,7 +61,7 @@ * @brief RNG1 interrupt priority level setting. */ #if !defined(NRF51_RNG_RNG1_IRQ_PRIORITY) || defined(__DOXYGEN__) -#define NRF51_RNG_RNG1_IRQ_PRIORITY 10 +#define NRF51_RNG_RNG1_IRQ_PRIORITY 10 #endif @@ -151,13 +151,13 @@ extern "C" { void rng_lld_start(RNGDriver *rngp); void rng_lld_stop(RNGDriver *rngp); msg_t rng_lld_write(RNGDriver *rngp, uint8_t *buf, size_t n, - systime_t timeout); + systime_t timeout); #ifdef __cplusplus } #endif #endif /* HAL_USE_RNG */ -#endif /* _RNG_LLD_H_ */ +#endif /* HAL_RNG_LLD_H */ /** @} */ diff --git a/os/hal/ports/NRF51/NRF51822/hal_serial_lld.h b/os/hal/ports/NRF51/NRF51822/hal_serial_lld.h index 5fc5e87..304c07d 100644 --- a/os/hal/ports/NRF51/NRF51822/hal_serial_lld.h +++ b/os/hal/ports/NRF51/NRF51822/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 == TRUE) || defined(__DOXYGEN__)
@@ -145,6 +145,6 @@ extern "C" { #endif /* HAL_USE_SERIAL == TRUE */
-#endif /* _SERIAL_LLD_H_ */
+#endif /* HAL_SERIAL_LLD_H */
/** @} */
diff --git a/os/hal/ports/NRF51/NRF51822/hal_spi_lld.h b/os/hal/ports/NRF51/NRF51822/hal_spi_lld.h index 4deb4c7..d339a91 100644 --- a/os/hal/ports/NRF51/NRF51822/hal_spi_lld.h +++ b/os/hal/ports/NRF51/NRF51822/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__)
@@ -223,6 +223,6 @@ extern "C" { #endif /* HAL_USE_SPI */
-#endif /* _SPI_LLD_H_ */
+#endif /* HAL_SPI_LLD_H */
/** @} */
diff --git a/os/hal/ports/NRF51/NRF51822/hal_st_lld.h b/os/hal/ports/NRF51/NRF51822/hal_st_lld.h index 957f80b..bde9950 100644 --- a/os/hal/ports/NRF51/NRF51822/hal_st_lld.h +++ b/os/hal/ports/NRF51/NRF51822/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 "halconf.h"
@@ -266,6 +266,6 @@ static inline bool st_lld_is_alarm_active(void) { #endif
}
-#endif /* _ST_LLD_H_ */
+#endif /* HAL_ST_LLD_H */
/** @} */
diff --git a/os/hal/ports/NRF51/NRF51822/hal_wdg_lld.h b/os/hal/ports/NRF51/NRF51822/hal_wdg_lld.h index 581c25b..8fea304 100644 --- a/os/hal/ports/NRF51/NRF51822/hal_wdg_lld.h +++ b/os/hal/ports/NRF51/NRF51822/hal_wdg_lld.h @@ -22,8 +22,8 @@ * @{
*/
-#ifndef _WDG_LLD_H_
-#define _WDG_LLD_H_
+#ifndef HAL_WDG_LLD_H
+#define HAL_WDG_LLD_H
#if (HAL_USE_WDG == TRUE) || defined(__DOXYGEN__)
@@ -31,7 +31,7 @@ /* Driver constants. */
/*===========================================================================*/
-#define WDG_MAX_TIMEOUT_MS \
+#define WDG_MAX_TIMEOUT_MS \
((uint32_t)(0xFFFFFFFFu * 1000 / NRF51_LFCLK_FREQUENCY))
/*===========================================================================*/
@@ -71,13 +71,13 @@ typedef struct WDGDriver WDGDriver; * @note It could be empty on some architectures.
*/
typedef struct {
- struct {
- uint8_t pause_on_sleep : 1;
- uint8_t pause_on_halt : 1;
- } flags;
- uint32_t timeout_ms;
+ struct {
+ uint8_t pause_on_sleep : 1;
+ uint8_t pause_on_halt : 1;
+ } flags;
+ uint32_t timeout_ms;
#if WDG_USE_TIMEOUT_CALLBACK == TRUE
- void (*callback)(void);
+ void (*callback)(void);
#endif
} WDGConfig;
@@ -122,6 +122,6 @@ extern "C" { #endif /* HAL_USE_WDG == TRUE */
-#endif /* _WDG_LLD_H_ */
+#endif /* HAL_WDG_LLD_H */
/** @} */
|