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/platforms/AT91SAM7/at91sam7_mii.c | 4 ++-- os/hal/platforms/AT91SAM7/at91sam7_mii.h | 4 ++-- os/hal/platforms/AT91SAM7/mac_lld.c | 4 ++-- os/hal/platforms/AT91SAM7/mac_lld.h | 4 ++-- os/hal/platforms/AT91SAM7/pal_lld.c | 4 ++-- os/hal/platforms/AT91SAM7/pal_lld.h | 4 ++-- os/hal/platforms/AT91SAM7/serial_lld.c | 4 ++-- os/hal/platforms/AT91SAM7/serial_lld.h | 4 ++-- os/hal/platforms/AT91SAM7/spi_lld.c | 4 ++-- os/hal/platforms/AT91SAM7/spi_lld.h | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) (limited to 'os/hal/platforms/AT91SAM7') diff --git a/os/hal/platforms/AT91SAM7/at91sam7_mii.c b/os/hal/platforms/AT91SAM7/at91sam7_mii.c index 2f1665847..54f1b8d57 100644 --- a/os/hal/platforms/AT91SAM7/at91sam7_mii.c +++ b/os/hal/platforms/AT91SAM7/at91sam7_mii.c @@ -29,7 +29,7 @@ #include "hal.h" #include "at91sam7_mii.h" -#if CH_HAL_USE_MAC || defined(__DOXYGEN__) +#if HAL_USE_MAC || defined(__DOXYGEN__) /*===========================================================================*/ /* Driver exported variables. */ @@ -142,6 +142,6 @@ void miiPut(MACDriver *macp, phyaddr_t addr, phyreg_t value) { ; } -#endif /* CH_HAL_USE_MAC */ +#endif /* HAL_USE_MAC */ /** @} */ diff --git a/os/hal/platforms/AT91SAM7/at91sam7_mii.h b/os/hal/platforms/AT91SAM7/at91sam7_mii.h index a02ca90c9..c417a0d15 100644 --- a/os/hal/platforms/AT91SAM7/at91sam7_mii.h +++ b/os/hal/platforms/AT91SAM7/at91sam7_mii.h @@ -28,7 +28,7 @@ #ifndef _AT91SAM7_MII_H_ #define _AT91SAM7_MII_H_ -#if CH_HAL_USE_MAC || defined(__DOXYGEN__) +#if HAL_USE_MAC || defined(__DOXYGEN__) /*===========================================================================*/ /* Driver constants. */ @@ -107,7 +107,7 @@ extern "C" { } #endif -#endif /* CH_HAL_USE_MAC */ +#endif /* HAL_USE_MAC */ #endif /* _AT91SAM7_MII_H_ */ diff --git a/os/hal/platforms/AT91SAM7/mac_lld.c b/os/hal/platforms/AT91SAM7/mac_lld.c index 089554c6c..ee71b2e23 100644 --- a/os/hal/platforms/AT91SAM7/mac_lld.c +++ b/os/hal/platforms/AT91SAM7/mac_lld.c @@ -32,7 +32,7 @@ #include "mii.h" #include "at91sam7_mii.h" -#if CH_HAL_USE_MAC || defined(__DOXYGEN__) +#if HAL_USE_MAC || defined(__DOXYGEN__) #define EMAC_PIN_MASK (AT91C_PB0_ETXCK_EREFCK | AT91C_PB1_ETXEN | \ AT91C_PB2_ETX0 | AT91C_PB3_ETX1 | \ @@ -527,6 +527,6 @@ bool_t mac_lld_poll_link_status(MACDriver *macp) { return link_up = TRUE; } -#endif /* CH_HAL_USE_MAC */ +#endif /* HAL_USE_MAC */ /** @} */ diff --git a/os/hal/platforms/AT91SAM7/mac_lld.h b/os/hal/platforms/AT91SAM7/mac_lld.h index 1535b06f4..21503dd53 100644 --- a/os/hal/platforms/AT91SAM7/mac_lld.h +++ b/os/hal/platforms/AT91SAM7/mac_lld.h @@ -28,7 +28,7 @@ #ifndef _MAC_LLD_H_ #define _MAC_LLD_H_ -#if CH_HAL_USE_MAC || defined(__DOXYGEN__) +#if HAL_USE_MAC || defined(__DOXYGEN__) /*===========================================================================*/ /* Driver constants. */ @@ -194,7 +194,7 @@ extern "C" { } #endif -#endif /* CH_HAL_USE_MAC */ +#endif /* HAL_USE_MAC */ #endif /* _MAC_LLD_H_ */ diff --git a/os/hal/platforms/AT91SAM7/pal_lld.c b/os/hal/platforms/AT91SAM7/pal_lld.c index ffbe05578..4b43cd8d6 100644 --- a/os/hal/platforms/AT91SAM7/pal_lld.c +++ b/os/hal/platforms/AT91SAM7/pal_lld.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. */ @@ -148,6 +148,6 @@ void _pal_lld_setgroupmode(ioportid_t port, } } -#endif /* CH_HAL_USE_PAL */ +#endif /* HAL_USE_PAL */ /** @} */ diff --git a/os/hal/platforms/AT91SAM7/pal_lld.h b/os/hal/platforms/AT91SAM7/pal_lld.h index 1fe386068..afcc7c238 100644 --- a/os/hal/platforms/AT91SAM7/pal_lld.h +++ b/os/hal/platforms/AT91SAM7/pal_lld.h @@ -28,7 +28,7 @@ #ifndef _PAL_LLD_H_ #define _PAL_LLD_H_ -#if CH_HAL_USE_PAL || defined(__DOXYGEN__) +#if HAL_USE_PAL || defined(__DOXYGEN__) /*===========================================================================*/ /* Unsupported modes and specific modes */ @@ -247,7 +247,7 @@ extern "C" { } #endif -#endif /* CH_HAL_USE_PAL */ +#endif /* HAL_USE_PAL */ #endif /* _PAL_LLD_H_ */ diff --git a/os/hal/platforms/AT91SAM7/serial_lld.c b/os/hal/platforms/AT91SAM7/serial_lld.c index 72207a249..fa3b15226 100644 --- a/os/hal/platforms/AT91SAM7/serial_lld.c +++ b/os/hal/platforms/AT91SAM7/serial_lld.c @@ -28,7 +28,7 @@ #include "ch.h" #include "hal.h" -#if CH_HAL_USE_SERIAL || defined(__DOXYGEN__) +#if HAL_USE_SERIAL || defined(__DOXYGEN__) #if SAM7_PLATFORM == SAM7S256 @@ -370,6 +370,6 @@ void sd_lld_stop(SerialDriver *sdp) { } } -#endif /* CH_HAL_USE_SERIAL */ +#endif /* HAL_USE_SERIAL */ /** @} */ diff --git a/os/hal/platforms/AT91SAM7/serial_lld.h b/os/hal/platforms/AT91SAM7/serial_lld.h index 0b9b1973e..027cf90cd 100644 --- a/os/hal/platforms/AT91SAM7/serial_lld.h +++ b/os/hal/platforms/AT91SAM7/serial_lld.h @@ -28,7 +28,7 @@ #ifndef _SERIAL_LLD_H_ #define _SERIAL_LLD_H_ -#if CH_HAL_USE_SERIAL || defined(__DOXYGEN__) +#if HAL_USE_SERIAL || defined(__DOXYGEN__) /*===========================================================================*/ /* Driver constants. */ @@ -171,7 +171,7 @@ extern "C" { } #endif -#endif /* CH_HAL_USE_SERIAL */ +#endif /* HAL_USE_SERIAL */ #endif /* _SERIAL_LLD_H_ */ diff --git a/os/hal/platforms/AT91SAM7/spi_lld.c b/os/hal/platforms/AT91SAM7/spi_lld.c index 2cd552ebf..316ff65c9 100644 --- a/os/hal/platforms/AT91SAM7/spi_lld.c +++ b/os/hal/platforms/AT91SAM7/spi_lld.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. */ @@ -395,6 +395,6 @@ uint16_t spi_lld_polled_exchange(SPIDriver *spip, uint16_t frame) { return spip->spd_spi->SPI_RDR; } -#endif /* CH_HAL_USE_SPI */ +#endif /* HAL_USE_SPI */ /** @} */ diff --git a/os/hal/platforms/AT91SAM7/spi_lld.h b/os/hal/platforms/AT91SAM7/spi_lld.h index 2b5ec2acb..6243e66fa 100644 --- a/os/hal/platforms/AT91SAM7/spi_lld.h +++ b/os/hal/platforms/AT91SAM7/spi_lld.h @@ -28,7 +28,7 @@ #ifndef _SPI_LLD_H_ #define _SPI_LLD_H_ -#if CH_HAL_USE_SPI || defined(__DOXYGEN__) +#if HAL_USE_SPI || defined(__DOXYGEN__) /*===========================================================================*/ /* Device compatibility.. */ @@ -218,7 +218,7 @@ extern "C" { } #endif -#endif /* CH_HAL_USE_SPI */ +#endif /* HAL_USE_SPI */ #endif /* _SPI_LLD_H_ */ -- cgit v1.2.3