aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/platforms/STM32
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-11-01 17:29:56 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-11-01 17:29:56 +0000
commitd8be44136c1e6d02ee105ac0791f9e6732551fec (patch)
tree31636040799a284f1f3b650f4ece699f4cf5ad7b /os/hal/platforms/STM32
parente1f07aa7c670e670890698ba99df7c07fb78cb5a (diff)
downloadChibiOS-d8be44136c1e6d02ee105ac0791f9e6732551fec.tar.gz
ChibiOS-d8be44136c1e6d02ee105ac0791f9e6732551fec.tar.bz2
ChibiOS-d8be44136c1e6d02ee105ac0791f9e6732551fec.zip
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
Diffstat (limited to 'os/hal/platforms/STM32')
-rw-r--r--os/hal/platforms/STM32/adc_lld.c4
-rw-r--r--os/hal/platforms/STM32/adc_lld.h4
-rw-r--r--os/hal/platforms/STM32/can_lld.c4
-rw-r--r--os/hal/platforms/STM32/can_lld.h4
-rw-r--r--os/hal/platforms/STM32/hal_lld.c2
-rw-r--r--os/hal/platforms/STM32/pal_lld.c4
-rw-r--r--os/hal/platforms/STM32/pal_lld.h4
-rw-r--r--os/hal/platforms/STM32/pwm_lld.c4
-rw-r--r--os/hal/platforms/STM32/pwm_lld.h4
-rw-r--r--os/hal/platforms/STM32/serial_lld.c4
-rw-r--r--os/hal/platforms/STM32/serial_lld.h4
-rw-r--r--os/hal/platforms/STM32/spi_lld.c4
-rw-r--r--os/hal/platforms/STM32/spi_lld.h4
-rw-r--r--os/hal/platforms/STM32/uart_lld.c4
-rw-r--r--os/hal/platforms/STM32/uart_lld.h8
15 files changed, 31 insertions, 31 deletions
diff --git a/os/hal/platforms/STM32/adc_lld.c b/os/hal/platforms/STM32/adc_lld.c
index b1257c194..ae983e7bf 100644
--- a/os/hal/platforms/STM32/adc_lld.c
+++ b/os/hal/platforms/STM32/adc_lld.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. */
@@ -228,6 +228,6 @@ void adc_lld_stop_conversion(ADCDriver *adcp) {
adcp->ad_adc->CR2 = 0;
}
-#endif /* CH_HAL_USE_ADC */
+#endif /* HAL_USE_ADC */
/** @} */
diff --git a/os/hal/platforms/STM32/adc_lld.h b/os/hal/platforms/STM32/adc_lld.h
index cb425f326..ba353c76e 100644
--- a/os/hal/platforms/STM32/adc_lld.h
+++ b/os/hal/platforms/STM32/adc_lld.h
@@ -28,7 +28,7 @@
#ifndef _ADC_LLD_H_
#define _ADC_LLD_H_
-#if CH_HAL_USE_ADC || defined(__DOXYGEN__)
+#if HAL_USE_ADC || defined(__DOXYGEN__)
/*===========================================================================*/
/* Driver constants. */
@@ -299,7 +299,7 @@ extern "C" {
}
#endif
-#endif /* CH_HAL_USE_ADC */
+#endif /* HAL_USE_ADC */
#endif /* _ADC_LLD_H_ */
diff --git a/os/hal/platforms/STM32/can_lld.c b/os/hal/platforms/STM32/can_lld.c
index 4a00aa9e7..0d9d173db 100644
--- a/os/hal/platforms/STM32/can_lld.c
+++ b/os/hal/platforms/STM32/can_lld.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. */
@@ -405,6 +405,6 @@ void can_lld_wakeup(CANDriver *canp) {
}
#endif /* CAN_USE_SLEEP_MODE */
-#endif /* CH_HAL_USE_CAN */
+#endif /* HAL_USE_CAN */
/** @} */
diff --git a/os/hal/platforms/STM32/can_lld.h b/os/hal/platforms/STM32/can_lld.h
index 6d4067d9a..871ab7adf 100644
--- a/os/hal/platforms/STM32/can_lld.h
+++ b/os/hal/platforms/STM32/can_lld.h
@@ -28,7 +28,7 @@
#ifndef _CAN_LLD_H_
#define _CAN_LLD_H_
-#if CH_HAL_USE_CAN || defined(__DOXYGEN__)
+#if HAL_USE_CAN || defined(__DOXYGEN__)
/*===========================================================================*/
/* Driver constants. */
@@ -318,7 +318,7 @@ extern "C" {
}
#endif
-#endif /* CH_HAL_USE_CAN */
+#endif /* HAL_USE_CAN */
#endif /* _CAN_LLD_H_ */
diff --git a/os/hal/platforms/STM32/hal_lld.c b/os/hal/platforms/STM32/hal_lld.c
index f099be983..a46a5c65f 100644
--- a/os/hal/platforms/STM32/hal_lld.c
+++ b/os/hal/platforms/STM32/hal_lld.c
@@ -83,7 +83,7 @@ void hal_lld_init(void) {
SysTick_CTRL_ENABLE_Msk |
SysTick_CTRL_TICKINT_Msk;
-#if CH_HAL_USE_ADC || CH_HAL_USE_SPI || CH_HAL_USE_UART
+#if HAL_USE_ADC || HAL_USE_SPI || HAL_USE_UART
dmaInit();
#endif
}
diff --git a/os/hal/platforms/STM32/pal_lld.c b/os/hal/platforms/STM32/pal_lld.c
index 49bfadf14..6e2346000 100644
--- a/os/hal/platforms/STM32/pal_lld.c
+++ b/os/hal/platforms/STM32/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__)
#if defined(STM32F10X_LD)
#define APB2_RST_MASK (RCC_APB2RSTR_IOPARST | RCC_APB2RSTR_IOPBRST | \
@@ -192,6 +192,6 @@ void _pal_lld_setgroupmode(ioportid_t port,
port->CRL = (port->CRL & ml) | crl;
}
-#endif /* CH_HAL_USE_PAL */
+#endif /* HAL_USE_PAL */
/** @} */
diff --git a/os/hal/platforms/STM32/pal_lld.h b/os/hal/platforms/STM32/pal_lld.h
index 31364cae8..017f140da 100644
--- a/os/hal/platforms/STM32/pal_lld.h
+++ b/os/hal/platforms/STM32/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 */
@@ -320,7 +320,7 @@ extern "C" {
}
#endif
-#endif /* CH_HAL_USE_PAL */
+#endif /* HAL_USE_PAL */
#endif /* _PAL_LLD_H_ */
diff --git a/os/hal/platforms/STM32/pwm_lld.c b/os/hal/platforms/STM32/pwm_lld.c
index 20ab05211..249de1651 100644
--- a/os/hal/platforms/STM32/pwm_lld.c
+++ b/os/hal/platforms/STM32/pwm_lld.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. */
@@ -525,6 +525,6 @@ void pwm_lld_disable_channel(PWMDriver *pwmp, pwmchannel_t channel) {
}
}
-#endif /* CH_HAL_USE_PWM */
+#endif /* HAL_USE_PWM */
/** @} */
diff --git a/os/hal/platforms/STM32/pwm_lld.h b/os/hal/platforms/STM32/pwm_lld.h
index f512f08d6..d8440e361 100644
--- a/os/hal/platforms/STM32/pwm_lld.h
+++ b/os/hal/platforms/STM32/pwm_lld.h
@@ -28,7 +28,7 @@
#ifndef _PWM_LLD_H_
#define _PWM_LLD_H_
-#if CH_HAL_USE_PWM || defined(__DOXYGEN__)
+#if HAL_USE_PWM || defined(__DOXYGEN__)
/*===========================================================================*/
/* Driver constants. */
@@ -324,7 +324,7 @@ extern "C" {
}
#endif
-#endif /* CH_HAL_USE_PWM */
+#endif /* HAL_USE_PWM */
#endif /* _PWM_LLD_H_ */
diff --git a/os/hal/platforms/STM32/serial_lld.c b/os/hal/platforms/STM32/serial_lld.c
index 71fd20372..43fb6229a 100644
--- a/os/hal/platforms/STM32/serial_lld.c
+++ b/os/hal/platforms/STM32/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__)
/*===========================================================================*/
/* Driver exported variables. */
@@ -444,6 +444,6 @@ void sd_lld_stop(SerialDriver *sdp) {
}
}
-#endif /* CH_HAL_USE_SERIAL */
+#endif /* HAL_USE_SERIAL */
/** @} */
diff --git a/os/hal/platforms/STM32/serial_lld.h b/os/hal/platforms/STM32/serial_lld.h
index ef9e4598a..00617a98a 100644
--- a/os/hal/platforms/STM32/serial_lld.h
+++ b/os/hal/platforms/STM32/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. */
@@ -239,7 +239,7 @@ extern "C" {
}
#endif
-#endif /* CH_HAL_USE_SERIAL */
+#endif /* HAL_USE_SERIAL */
#endif /* _SERIAL_LLD_H_ */
diff --git a/os/hal/platforms/STM32/spi_lld.c b/os/hal/platforms/STM32/spi_lld.c
index 7d4d182bb..d9abd5ba1 100644
--- a/os/hal/platforms/STM32/spi_lld.c
+++ b/os/hal/platforms/STM32/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. */
@@ -486,6 +486,6 @@ uint16_t spi_lld_polled_exchange(SPIDriver *spip, uint16_t frame) {
return spip->spd_spi->DR;
}
-#endif /* CH_HAL_USE_SPI */
+#endif /* HAL_USE_SPI */
/** @} */
diff --git a/os/hal/platforms/STM32/spi_lld.h b/os/hal/platforms/STM32/spi_lld.h
index 54b995a02..592a904f0 100644
--- a/os/hal/platforms/STM32/spi_lld.h
+++ b/os/hal/platforms/STM32/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__)
/*===========================================================================*/
/* Driver constants. */
@@ -287,7 +287,7 @@ extern "C" {
}
#endif
-#endif /* CH_HAL_USE_SPI */
+#endif /* HAL_USE_SPI */
#endif /* _SPI_LLD_H_ */
diff --git a/os/hal/platforms/STM32/uart_lld.c b/os/hal/platforms/STM32/uart_lld.c
index b08c0015d..2b30ce6a3 100644
--- a/os/hal/platforms/STM32/uart_lld.c
+++ b/os/hal/platforms/STM32/uart_lld.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. */
@@ -667,6 +667,6 @@ size_t uart_lld_stop_receive(UARTDriver *uartp) {
return n;
}
-#endif /* CH_HAL_USE_UART */
+#endif /* HAL_USE_UART */
/** @} */
diff --git a/os/hal/platforms/STM32/uart_lld.h b/os/hal/platforms/STM32/uart_lld.h
index e18a21b97..a1c6235ee 100644
--- a/os/hal/platforms/STM32/uart_lld.h
+++ b/os/hal/platforms/STM32/uart_lld.h
@@ -28,7 +28,7 @@
#ifndef _UART_LLD_H_
#define _UART_LLD_H_
-#if CH_HAL_USE_UART || defined(__DOXYGEN__)
+#if HAL_USE_UART || defined(__DOXYGEN__)
/*===========================================================================*/
/* Driver constants. */
@@ -213,11 +213,11 @@ typedef struct {
/**
* @brief Character received while out if the @p UART_RECEIVE state.
*/
- uartcb_t uc_rxchar;
+ uartccb_t uc_rxchar;
/**
* @brief Receive error callback.
*/
- uartcb_t uc_rxerr;
+ uartecb_t uc_rxerr;
/* End of the mandatory fields.*/
/**
* @brief Bit rate.
@@ -321,7 +321,7 @@ extern "C" {
}
#endif
-#endif /* CH_HAL_USE_UART */
+#endif /* HAL_USE_UART */
#endif /* _UART_LLD_H_ */
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-24 23:00:44 +0000