Fixed bug 3100946, renamed HAL switches removing the CH_ part.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2326 35acf78f-673a-0410-8e92-d51de3d6d3f4

11 files changed, 30 insertions, 30 deletions

diff --git a/os/hal/src/adc.c b/os/hal/src/adc.c
index e18995089..2af890b63 100644
--- a/os/hal/src/adc.c
+++ b/os/hal/src/adc.c
@@ -28,7 +28,7 @@
 #include "ch.h"

 #include "hal.h"

 

-#if CH_HAL_USE_ADC || defined(__DOXYGEN__)

+#if HAL_USE_ADC || defined(__DOXYGEN__)

 

 /*===========================================================================*/

 /* Driver exported variables.                                                */

@@ -323,6 +323,6 @@ void adcReleaseBus(ADCDriver *adcp) {
 }

 #endif /* ADC_USE_MUTUAL_EXCLUSION */

 

-#endif /* CH_HAL_USE_ADC */

+#endif /* HAL_USE_ADC */

 

 /** @} */

diff --git a/os/hal/src/can.c b/os/hal/src/can.c
index ec907de97..59a7b5dbf 100644
--- a/os/hal/src/can.c
+++ b/os/hal/src/can.c
@@ -28,7 +28,7 @@
 #include "ch.h"

 #include "hal.h"

 

-#if CH_HAL_USE_CAN || defined(__DOXYGEN__)

+#if HAL_USE_CAN || defined(__DOXYGEN__)

 

 /*===========================================================================*/

 /* Driver exported variables.                                                */

@@ -282,6 +282,6 @@ void canWakeup(CANDriver *canp) {
 }

 #endif /* CAN_USE_SLEEP_MODE */

 

-#endif /* CH_HAL_USE_CAN */

+#endif /* HAL_USE_CAN */

 

 /** @} */

diff --git a/os/hal/src/hal.c b/os/hal/src/hal.c
index c0e3d2c28..4cf145059 100644
--- a/os/hal/src/hal.c
+++ b/os/hal/src/hal.c
@@ -53,34 +53,34 @@ void halInit(void) {
 

   hal_lld_init();

 

-#if CH_HAL_USE_PAL

+#if HAL_USE_PAL

   palInit(&pal_default_config);

 #endif

-#if CH_HAL_USE_ADC

+#if HAL_USE_ADC

   adcInit();

 #endif

-#if CH_HAL_USE_CAN

+#if HAL_USE_CAN

   canInit();

 #endif

-#if CH_HAL_USE_I2C

+#if HAL_USE_I2C

   i2cInit();

 #endif

-#if CH_HAL_USE_MAC

+#if HAL_USE_MAC

   macInit();

 #endif

-#if CH_HAL_USE_PWM

+#if HAL_USE_PWM

   pwmInit();

 #endif

-#if CH_HAL_USE_SERIAL

+#if HAL_USE_SERIAL

   sdInit();

 #endif

-#if CH_HAL_USE_SPI

+#if HAL_USE_SPI

   spiInit();

 #endif

-#if CH_HAL_USE_MMC_SPI

+#if HAL_USE_MMC_SPI

   mmcInit();

 #endif

-#if CH_HAL_USE_UART

+#if HAL_USE_UART

   uartInit();

 #endif

 }

diff --git a/os/hal/src/i2c.c b/os/hal/src/i2c.c
index 7558d6741..b432fa89f 100644
--- a/os/hal/src/i2c.c
+++ b/os/hal/src/i2c.c
@@ -28,7 +28,7 @@
 #include "ch.h"

 #include "hal.h"

 

-#if CH_HAL_USE_I2C || defined(__DOXYGEN__)

+#if HAL_USE_I2C || defined(__DOXYGEN__)

 

 /*===========================================================================*/

 /* Driver exported variables.                                                */

@@ -265,6 +265,6 @@ void i2cReleaseBus(I2CDriver *i2cp) {
 }

 #endif /* I2C_USE_MUTUAL_EXCLUSION */

 

-#endif /* CH_HAL_USE_I2C */

+#endif /* HAL_USE_I2C */

 

 /** @} */

diff --git a/os/hal/src/mac.c b/os/hal/src/mac.c
index 62340dc31..bed07fbbb 100644
--- a/os/hal/src/mac.c
+++ b/os/hal/src/mac.c
@@ -28,7 +28,7 @@
 #include "ch.h"

 #include "hal.h"

 

-#if CH_HAL_USE_MAC || defined(__DOXYGEN__)

+#if HAL_USE_MAC || defined(__DOXYGEN__)

 

 /*===========================================================================*/

 /* Driver exported variables.                                                */

@@ -209,6 +209,6 @@ bool_t macPollLinkStatus(MACDriver *macp) {
   return mac_lld_poll_link_status(macp);

 }

 

-#endif /* CH_HAL_USE_MAC */

+#endif /* HAL_USE_MAC */

 

 /** @} */

diff --git a/os/hal/src/mmc_spi.c b/os/hal/src/mmc_spi.c
index 49f75c3cc..813ed9de1 100644
--- a/os/hal/src/mmc_spi.c
+++ b/os/hal/src/mmc_spi.c
@@ -28,7 +28,7 @@
 #include "ch.h"

 #include "hal.h"

 

-#if CH_HAL_USE_MMC_SPI || defined(__DOXYGEN__)

+#if HAL_USE_MMC_SPI || defined(__DOXYGEN__)

 

 /*===========================================================================*/

 /* Driver exported variables.                                                */

@@ -621,6 +621,6 @@ bool_t mmcStopSequentialWrite(MMCDriver *mmcp) {
   return TRUE;

 }

 

-#endif /* CH_HAL_USE_MMC_SPI */

+#endif /* HAL_USE_MMC_SPI */

 

 /** @} */

diff --git a/os/hal/src/pal.c b/os/hal/src/pal.c
index 824ebae0d..ce7c226e9 100644
--- a/os/hal/src/pal.c
+++ b/os/hal/src/pal.c
@@ -28,7 +28,7 @@
 #include "ch.h"

 #include "hal.h"

 

-#if CH_HAL_USE_PAL || defined(__DOXYGEN__)

+#if HAL_USE_PAL || defined(__DOXYGEN__)

 

 /*===========================================================================*/

 /* Driver exported variables.                                                */

@@ -117,6 +117,6 @@ void palSetBusMode(IOBus *bus, uint_fast8_t mode) {
   palSetGroupMode(bus->bus_portid, bus->bus_mask, mode);

 }

 

-#endif /* CH_HAL_USE_PAL */

+#endif /* HAL_USE_PAL */

 

 /** @} */

diff --git a/os/hal/src/pwm.c b/os/hal/src/pwm.c
index 13c77bfc6..95c3f4750 100644
--- a/os/hal/src/pwm.c
+++ b/os/hal/src/pwm.c
@@ -28,7 +28,7 @@
 #include "ch.h"

 #include "hal.h"

 

-#if CH_HAL_USE_PWM || defined(__DOXYGEN__)

+#if HAL_USE_PWM || defined(__DOXYGEN__)

 

 /*===========================================================================*/

 /* Driver exported variables.                                                */

@@ -158,6 +158,6 @@ void pwmDisableChannel(PWMDriver *pwmp, pwmchannel_t channel) {
   chSysUnlock();

 }

 

-#endif /* CH_HAL_USE_PWM */

+#endif /* HAL_USE_PWM */

 

 /** @} */

diff --git a/os/hal/src/serial.c b/os/hal/src/serial.c
index 6c47d7fc3..8ec75d000 100644
--- a/os/hal/src/serial.c
+++ b/os/hal/src/serial.c
@@ -28,7 +28,7 @@
 #include "ch.h"

 #include "hal.h"

 

-#if CH_HAL_USE_SERIAL || defined(__DOXYGEN__)

+#if HAL_USE_SERIAL || defined(__DOXYGEN__)

 

 /*===========================================================================*/

 /* Driver exported variables.                                                */

@@ -273,6 +273,6 @@ sdflags_t sdGetAndClearFlags(SerialDriver *sdp) {
   return mask;

 }

 

-#endif /* CH_HAL_USE_SERIAL */

+#endif /* HAL_USE_SERIAL */

 

 /** @} */

diff --git a/os/hal/src/spi.c b/os/hal/src/spi.c
index be5cf9452..4d9749962 100644
--- a/os/hal/src/spi.c
+++ b/os/hal/src/spi.c
@@ -28,7 +28,7 @@
 #include "ch.h"

 #include "hal.h"

 

-#if CH_HAL_USE_SPI || defined(__DOXYGEN__)

+#if HAL_USE_SPI || defined(__DOXYGEN__)

 

 /*===========================================================================*/

 /* Driver exported variables.                                                */

@@ -441,6 +441,6 @@ void spiReleaseBus(SPIDriver *spip) {
 }

 #endif /* SPI_USE_MUTUAL_EXCLUSION */

 

-#endif /* CH_HAL_USE_SPI */

+#endif /* HAL_USE_SPI */

 

 /** @} */

diff --git a/os/hal/src/uart.c b/os/hal/src/uart.c
index a2b21f6c8..eb771bb7b 100644
--- a/os/hal/src/uart.c
+++ b/os/hal/src/uart.c
@@ -28,7 +28,7 @@
 #include "ch.h"

 #include "hal.h"

 

-#if CH_HAL_USE_UART || defined(__DOXYGEN__)

+#if HAL_USE_UART || defined(__DOXYGEN__)

 

 /*===========================================================================*/

 /* Driver exported variables.                                                */

@@ -349,6 +349,6 @@ size_t uartStopReceiveI(UARTDriver *uartp) {
   return 0;

 }

 

-#endif /* CH_HAL_USE_UART */

+#endif /* HAL_USE_UART */

 

 /** @} */