From d8be44136c1e6d02ee105ac0791f9e6732551fec Mon Sep 17 00:00:00 2001 From: gdisirio Date: Mon, 1 Nov 2010 17:29:56 +0000 Subject: 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 --- os/hal/include/adc.h | 4 ++-- os/hal/include/can.h | 4 ++-- os/hal/include/i2c.h | 4 ++-- os/hal/include/mac.h | 4 ++-- os/hal/include/mmc_spi.h | 8 ++++---- os/hal/include/pal.h | 4 ++-- os/hal/include/pwm.h | 4 ++-- os/hal/include/serial.h | 4 ++-- os/hal/include/spi.h | 4 ++-- os/hal/include/uart.h | 4 ++-- 10 files changed, 22 insertions(+), 22 deletions(-) (limited to 'os/hal/include') diff --git a/os/hal/include/adc.h b/os/hal/include/adc.h index 3a4a08de0..df019fd27 100644 --- a/os/hal/include/adc.h +++ b/os/hal/include/adc.h @@ -28,7 +28,7 @@ #ifndef _ADC_H_ #define _ADC_H_ -#if CH_HAL_USE_ADC || defined(__DOXYGEN__) +#if HAL_USE_ADC || defined(__DOXYGEN__) /*===========================================================================*/ /* Driver constants. */ @@ -250,7 +250,7 @@ extern "C" { } #endif -#endif /* CH_HAL_USE_ADC */ +#endif /* HAL_USE_ADC */ #endif /* _ADC_H_ */ diff --git a/os/hal/include/can.h b/os/hal/include/can.h index bf0caabed..dc258193a 100644 --- a/os/hal/include/can.h +++ b/os/hal/include/can.h @@ -28,7 +28,7 @@ #ifndef _CAN_H_ #define _CAN_H_ -#if CH_HAL_USE_CAN || defined(__DOXYGEN__) +#if HAL_USE_CAN || defined(__DOXYGEN__) /*===========================================================================*/ /* Driver constants. */ @@ -127,7 +127,7 @@ extern "C" { } #endif -#endif /* CH_HAL_USE_CAN */ +#endif /* HAL_USE_CAN */ #endif /* _CAN_H_ */ diff --git a/os/hal/include/i2c.h b/os/hal/include/i2c.h index ef8e93f40..b95aa6bf9 100644 --- a/os/hal/include/i2c.h +++ b/os/hal/include/i2c.h @@ -28,7 +28,7 @@ #ifndef _I2C_H_ #define _I2C_H_ -#if CH_HAL_USE_I2C || defined(__DOXYGEN__) +#if HAL_USE_I2C || defined(__DOXYGEN__) /*===========================================================================*/ /* Driver constants. */ @@ -137,7 +137,7 @@ extern "C" { } #endif -#endif /* CH_HAL_USE_I2C */ +#endif /* HAL_USE_I2C */ #endif /* _I2C_H_ */ diff --git a/os/hal/include/mac.h b/os/hal/include/mac.h index ce6ca0add..8978f007e 100644 --- a/os/hal/include/mac.h +++ b/os/hal/include/mac.h @@ -27,7 +27,7 @@ #ifndef _MAC_H_ #define _MAC_H_ -#if CH_HAL_USE_MAC || defined(__DOXYGEN__) +#if HAL_USE_MAC || defined(__DOXYGEN__) /*===========================================================================*/ /* Driver constants. */ @@ -121,7 +121,7 @@ extern "C" { } #endif -#endif /* CH_HAL_USE_MAC */ +#endif /* HAL_USE_MAC */ #endif /* _MAC_H_ */ diff --git a/os/hal/include/mmc_spi.h b/os/hal/include/mmc_spi.h index 582ed1653..f413e3c15 100644 --- a/os/hal/include/mmc_spi.h +++ b/os/hal/include/mmc_spi.h @@ -28,7 +28,7 @@ #ifndef _MMC_SPI_H_ #define _MMC_SPI_H_ -#if CH_HAL_USE_MMC_SPI || defined(__DOXYGEN__) +#if HAL_USE_MMC_SPI || defined(__DOXYGEN__) /*===========================================================================*/ /* Driver constants. */ @@ -90,8 +90,8 @@ /* Derived constants and error checks. */ /*===========================================================================*/ -#if !CH_HAL_USE_SPI || !CH_USE_EVENTS -#error "MMC_SPI driver requires CH_HAL_USE_SPI and CH_USE_EVENTS" +#if !HAL_USE_SPI || !CH_USE_EVENTS +#error "MMC_SPI driver requires HAL_USE_SPI and CH_USE_EVENTS" #endif /*===========================================================================*/ @@ -226,7 +226,7 @@ extern "C" { } #endif -#endif /* CH_HAL_USE_MMC_SPI */ +#endif /* HAL_USE_MMC_SPI */ #endif /* _MMC_SPI_H_ */ diff --git a/os/hal/include/pal.h b/os/hal/include/pal.h index 8e66eb522..211a2538f 100644 --- a/os/hal/include/pal.h +++ b/os/hal/include/pal.h @@ -28,7 +28,7 @@ #ifndef _PAL_H_ #define _PAL_H_ -#if CH_HAL_USE_PAL || defined(__DOXYGEN__) +#if HAL_USE_PAL || defined(__DOXYGEN__) /*===========================================================================*/ /* Driver constants. */ @@ -525,6 +525,6 @@ extern "C" { #endif /* _PAL_H_ */ -#endif /* CH_HAL_USE_PAL */ +#endif /* HAL_USE_PAL */ /** @} */ diff --git a/os/hal/include/pwm.h b/os/hal/include/pwm.h index d37e449aa..867cc1de6 100644 --- a/os/hal/include/pwm.h +++ b/os/hal/include/pwm.h @@ -28,7 +28,7 @@ #ifndef _PWM_H_ #define _PWM_H_ -#if CH_HAL_USE_PWM || defined(__DOXYGEN__) +#if HAL_USE_PWM || defined(__DOXYGEN__) /*===========================================================================*/ /* Driver constants. */ @@ -119,7 +119,7 @@ extern "C" { } #endif -#endif /* CH_HAL_USE_PWM */ +#endif /* HAL_USE_PWM */ #endif /* _PWM_H_ */ diff --git a/os/hal/include/serial.h b/os/hal/include/serial.h index d14a47805..2ad454e86 100644 --- a/os/hal/include/serial.h +++ b/os/hal/include/serial.h @@ -28,7 +28,7 @@ #ifndef _SERIAL_H_ #define _SERIAL_H_ -#if CH_HAL_USE_SERIAL || defined(__DOXYGEN__) +#if HAL_USE_SERIAL || defined(__DOXYGEN__) /*===========================================================================*/ /* Driver constants. */ @@ -317,7 +317,7 @@ extern "C" { } #endif -#endif /* CH_HAL_USE_SERIAL */ +#endif /* HAL_USE_SERIAL */ #endif /* _SERIAL_H_ */ diff --git a/os/hal/include/spi.h b/os/hal/include/spi.h index d7a5c6ecd..93aba4980 100644 --- a/os/hal/include/spi.h +++ b/os/hal/include/spi.h @@ -28,7 +28,7 @@ #ifndef _SPI_H_ #define _SPI_H_ -#if CH_HAL_USE_SPI || defined(__DOXYGEN__) +#if HAL_USE_SPI || defined(__DOXYGEN__) /*===========================================================================*/ /* Driver constants. */ @@ -301,7 +301,7 @@ extern "C" { } #endif -#endif /* CH_HAL_USE_SPI */ +#endif /* HAL_USE_SPI */ #endif /* _SPI_H_ */ diff --git a/os/hal/include/uart.h b/os/hal/include/uart.h index 7d707d4d0..2ea69309f 100644 --- a/os/hal/include/uart.h +++ b/os/hal/include/uart.h @@ -28,7 +28,7 @@ #ifndef _UART_H_ #define _UART_H_ -#if CH_HAL_USE_UART || defined(__DOXYGEN__) +#if HAL_USE_UART || defined(__DOXYGEN__) /*===========================================================================*/ /* Driver constants. */ @@ -115,7 +115,7 @@ extern "C" { } #endif -#endif /* CH_HAL_USE_UART */ +#endif /* HAL_USE_UART */ #endif /* _UART_H_ */ -- cgit v1.2.3