diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-07-20 10:12:44 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-07-20 10:12:44 +0000 |
| commit | 49d71a01abeefa000a4cd7a556052d826b096d49 (patch) | |
| tree | 8c5ce964f194d9f7b17e91d912d9e6d723e4b8ae /os/hal/platforms/LPC122x | |
| parent | dc7b36df31f4d9dbd9a039319df74f4b2c8eed0c (diff) | |
| download | ChibiOS-49d71a01abeefa000a4cd7a556052d826b096d49.tar.gz ChibiOS-49d71a01abeefa000a4cd7a556052d826b096d49.tar.bz2 ChibiOS-49d71a01abeefa000a4cd7a556052d826b096d49.zip | |
Renamed or added prefix to all hernel configuration options.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6010 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/platforms/LPC122x')
| -rw-r--r-- | os/hal/platforms/LPC122x/hal_lld.c | 2 | ||||
| -rw-r--r-- | os/hal/platforms/LPC122x/i2c_lld.h | 4 | ||||
| -rw-r--r-- | os/hal/platforms/LPC122x/spi_lld.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/os/hal/platforms/LPC122x/hal_lld.c b/os/hal/platforms/LPC122x/hal_lld.c index 9069434ba..d457c7aea 100644 --- a/os/hal/platforms/LPC122x/hal_lld.c +++ b/os/hal/platforms/LPC122x/hal_lld.c @@ -54,7 +54,7 @@ void hal_lld_init(void) { /* SysTick initialization using the system clock.*/
nvicSetSystemHandlerPriority(HANDLER_SYSTICK, CORTEX_PRIORITY_SYSTICK);
- SysTick->LOAD = LPC122x_SYSCLK / CH_FREQUENCY - 1;
+ SysTick->LOAD = LPC122x_SYSCLK / CH_CFG_FREQUENCY - 1;
SysTick->VAL = 0;
SysTick->CTRL = SysTick_CTRL_CLKSOURCE_Msk |
SysTick_CTRL_ENABLE_Msk |
diff --git a/os/hal/platforms/LPC122x/i2c_lld.h b/os/hal/platforms/LPC122x/i2c_lld.h index edff13a95..1603da79c 100644 --- a/os/hal/platforms/LPC122x/i2c_lld.h +++ b/os/hal/platforms/LPC122x/i2c_lld.h @@ -138,12 +138,12 @@ struct I2CDriver { */
i2cflags_t errors;
#if I2C_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__)
-#if CH_USE_MUTEXES || defined(__DOXYGEN__)
+#if CH_CFG_USE_MUTEXES || defined(__DOXYGEN__)
/**
* @brief Mutex protecting the bus.
*/
Mutex mutex;
-#elif CH_USE_SEMAPHORES
+#elif CH_CFG_USE_SEMAPHORES
Semaphore semaphore;
#endif
#endif /* I2C_USE_MUTUAL_EXCLUSION */
diff --git a/os/hal/platforms/LPC122x/spi_lld.h b/os/hal/platforms/LPC122x/spi_lld.h index 0cb48f89f..d53ed620a 100644 --- a/os/hal/platforms/LPC122x/spi_lld.h +++ b/os/hal/platforms/LPC122x/spi_lld.h @@ -209,12 +209,12 @@ struct SPIDriver { Thread *thread;
#endif /* SPI_USE_WAIT */
#if SPI_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__)
-#if CH_USE_MUTEXES || defined(__DOXYGEN__)
+#if CH_CFG_USE_MUTEXES || defined(__DOXYGEN__)
/**
* @brief Mutex protecting the bus.
*/
Mutex mutex;
-#elif CH_USE_SEMAPHORES
+#elif CH_CFG_USE_SEMAPHORES
Semaphore semaphore;
#endif
#endif /* SPI_USE_MUTUAL_EXCLUSION */
|