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

3 files changed, 16 insertions, 16 deletions

diff --git a/os/hal/src/adc.c b/os/hal/src/adc.c
index d0e814ae2..aeb1f6c6b 100644
--- a/os/hal/src/adc.c
+++ b/os/hal/src/adc.c
@@ -81,7 +81,7 @@ void adcObjectInit(ADCDriver *adcp) {
   adcp->thread   = NULL;

 #endif /* ADC_USE_WAIT */

 #if ADC_USE_MUTUAL_EXCLUSION

-#if CH_USE_MUTEXES

+#if CH_CFG_USE_MUTEXES

   chMtxInit(&adcp->mutex);

 #else

   chSemInit(&adcp->semaphore, 1);

@@ -309,9 +309,9 @@ void adcAcquireBus(ADCDriver *adcp) {
 

   chDbgCheck(adcp != NULL, "adcAcquireBus");

 

-#if CH_USE_MUTEXES

+#if CH_CFG_USE_MUTEXES

   chMtxLock(&adcp->mutex);

-#elif CH_USE_SEMAPHORES

+#elif CH_CFG_USE_SEMAPHORES

   chSemWait(&adcp->semaphore);

 #endif

 }

@@ -329,10 +329,10 @@ void adcReleaseBus(ADCDriver *adcp) {
 

   chDbgCheck(adcp != NULL, "adcReleaseBus");

 

-#if CH_USE_MUTEXES

+#if CH_CFG_USE_MUTEXES

   (void)adcp;

   chMtxUnlock();

-#elif CH_USE_SEMAPHORES

+#elif CH_CFG_USE_SEMAPHORES

   chSemSignal(&adcp->semaphore);

 #endif

 }

diff --git a/os/hal/src/i2c.c b/os/hal/src/i2c.c
index 78519cc35..8604488e5 100644
--- a/os/hal/src/i2c.c
+++ b/os/hal/src/i2c.c
@@ -78,11 +78,11 @@ void i2cObjectInit(I2CDriver *i2cp) {
   i2cp->config = NULL;

 

 #if I2C_USE_MUTUAL_EXCLUSION

-#if CH_USE_MUTEXES

+#if CH_CFG_USE_MUTEXES

   chMtxInit(&i2cp->mutex);

 #else

   chSemInit(&i2cp->semaphore, 1);

-#endif /* CH_USE_MUTEXES */

+#endif /* CH_CFG_USE_MUTEXES */

 #endif /* I2C_USE_MUTUAL_EXCLUSION */

 

 #if defined(I2C_DRIVER_EXT_INIT_HOOK)

@@ -270,9 +270,9 @@ void i2cAcquireBus(I2CDriver *i2cp) {
 

   chDbgCheck(i2cp != NULL, "i2cAcquireBus");

 

-#if CH_USE_MUTEXES

+#if CH_CFG_USE_MUTEXES

   chMtxLock(&i2cp->mutex);

-#elif CH_USE_SEMAPHORES

+#elif CH_CFG_USE_SEMAPHORES

   chSemWait(&i2cp->semaphore);

 #endif

 }

@@ -290,9 +290,9 @@ void i2cReleaseBus(I2CDriver *i2cp) {
 

   chDbgCheck(i2cp != NULL, "i2cReleaseBus");

 

-#if CH_USE_MUTEXES

+#if CH_CFG_USE_MUTEXES

   chMtxUnlock();

-#elif CH_USE_SEMAPHORES

+#elif CH_CFG_USE_SEMAPHORES

   chSemSignal(&i2cp->semaphore);

 #endif

 }

diff --git a/os/hal/src/spi.c b/os/hal/src/spi.c
index 2dc0cc6ee..b2ddf48d2 100644
--- a/os/hal/src/spi.c
+++ b/os/hal/src/spi.c
@@ -78,7 +78,7 @@ void spiObjectInit(SPIDriver *spip) {
   spip->thread = NULL;

 #endif /* SPI_USE_WAIT */

 #if SPI_USE_MUTUAL_EXCLUSION

-#if CH_USE_MUTEXES

+#if CH_CFG_USE_MUTEXES

   chMtxInit(&spip->mutex);

 #else

   chSemInit(&spip->semaphore, 1);

@@ -405,9 +405,9 @@ void spiAcquireBus(SPIDriver *spip) {
 

   chDbgCheck(spip != NULL, "spiAcquireBus");

 

-#if CH_USE_MUTEXES

+#if CH_CFG_USE_MUTEXES

   chMtxLock(&spip->mutex);

-#elif CH_USE_SEMAPHORES

+#elif CH_CFG_USE_SEMAPHORES

   chSemWait(&spip->semaphore);

 #endif

 }

@@ -425,10 +425,10 @@ void spiReleaseBus(SPIDriver *spip) {
 

   chDbgCheck(spip != NULL, "spiReleaseBus");

 

-#if CH_USE_MUTEXES

+#if CH_CFG_USE_MUTEXES

   (void)spip;

   chMtxUnlock();

-#elif CH_USE_SEMAPHORES

+#elif CH_CFG_USE_SEMAPHORES

   chSemSignal(&spip->semaphore);

 #endif

 }