diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-04-07 19:37:46 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-04-07 19:37:46 +0000 |
| commit | 2e05c03352dc00c22b9508afc112282f671a95a7 (patch) | |
| tree | 2199747c5464ab7a32869a15775a4d1eb498e14f /os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c | |
| parent | 7725e83be6ce927b05fb917a05b0d227a5be1058 (diff) | |
| download | ChibiOS-2e05c03352dc00c22b9508afc112282f671a95a7.tar.gz ChibiOS-2e05c03352dc00c22b9508afc112282f671a95a7.tar.bz2 ChibiOS-2e05c03352dc00c22b9508afc112282f671a95a7.zip | |
Fixed some CH_IRQ_ remaining in STM32 drivers.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7872 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c')
| -rw-r--r-- | os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c b/os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c index b847ef242..fffeae050 100644 --- a/os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c +++ b/os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c @@ -254,10 +254,10 @@ static void i2c_lld_serve_error_interrupt(I2CDriver *i2cp, uint32_t isr) { *
* @notapi
*/
-CH_IRQ_HANDLER(STM32_I2C1_GLOBAL_HANDLER) {
+OSAL_IRQ_HANDLER(STM32_I2C1_GLOBAL_HANDLER) {
uint32_t isr = I2CD1.i2c->ISR;
- CH_IRQ_PROLOGUE();
+ OSAL_IRQ_PROLOGUE();
/* Clearing IRQ bits.*/
I2CD1.i2c->ICR = isr;
@@ -267,34 +267,34 @@ CH_IRQ_HANDLER(STM32_I2C1_GLOBAL_HANDLER) { else if (isr & I2C_INT_MASK)
i2c_lld_serve_interrupt(&I2CD1, isr);
- CH_IRQ_EPILOGUE();
+ OSAL_IRQ_EPILOGUE();
}
#elif defined(STM32_I2C1_EVENT_HANDLER) && defined(STM32_I2C1_ERROR_HANDLER)
-CH_IRQ_HANDLER(STM32_I2C1_EVENT_HANDLER) {
+OSAL_IRQ_HANDLER(STM32_I2C1_EVENT_HANDLER) {
uint32_t isr = I2CD1.i2c->ISR;
- CH_IRQ_PROLOGUE();
+ OSAL_IRQ_PROLOGUE();
/* Clearing IRQ bits.*/
I2CD1.i2c->ICR = isr & I2C_INT_MASK;
i2c_lld_serve_interrupt(&I2CD1, isr);
- CH_IRQ_EPILOGUE();
+ OSAL_IRQ_EPILOGUE();
}
-CH_IRQ_HANDLER(STM32_I2C1_ERROR_HANDLER) {
+OSAL_IRQ_HANDLER(STM32_I2C1_ERROR_HANDLER) {
uint32_t isr = I2CD1.i2c->ISR;
- CH_IRQ_PROLOGUE();
+ OSAL_IRQ_PROLOGUE();
/* Clearing IRQ bits.*/
I2CD1.i2c->ICR = isr & I2C_ERROR_MASK;
i2c_lld_serve_error_interrupt(&I2CD1, isr);
- CH_IRQ_EPILOGUE();
+ OSAL_IRQ_EPILOGUE();
}
#else
@@ -309,10 +309,10 @@ CH_IRQ_HANDLER(STM32_I2C1_ERROR_HANDLER) { *
* @notapi
*/
-CH_IRQ_HANDLER(STM32_I2C2_GLOBAL_HANDLER) {
+OSAL_IRQ_HANDLER(STM32_I2C2_GLOBAL_HANDLER) {
uint32_t isr = I2CD2.i2c->ISR;
- CH_IRQ_PROLOGUE();
+ OSAL_IRQ_PROLOGUE();
/* Clearing IRQ bits.*/
I2CD2.i2c->ICR = isr;
@@ -322,34 +322,34 @@ CH_IRQ_HANDLER(STM32_I2C2_GLOBAL_HANDLER) { else if (isr & I2C_INT_MASK)
i2c_lld_serve_interrupt(&I2CD2, isr);
- CH_IRQ_EPILOGUE();
+ OSAL_IRQ_EPILOGUE();
}
#elif defined(STM32_I2C2_EVENT_HANDLER) && defined(STM32_I2C2_ERROR_HANDLER)
-CH_IRQ_HANDLER(STM32_I2C2_EVENT_HANDLER) {
+OSAL_IRQ_HANDLER(STM32_I2C2_EVENT_HANDLER) {
uint32_t isr = I2CD2.i2c->ISR;
- CH_IRQ_PROLOGUE();
+ OSAL_IRQ_PROLOGUE();
/* Clearing IRQ bits.*/
I2CD2.i2c->ICR = isr & I2C_INT_MASK;
i2c_lld_serve_interrupt(&I2CD2, isr);
- CH_IRQ_EPILOGUE();
+ OSAL_IRQ_EPILOGUE();
}
-CH_IRQ_HANDLER(STM32_I2C2_ERROR_HANDLER) {
+OSAL_IRQ_HANDLER(STM32_I2C2_ERROR_HANDLER) {
uint32_t isr = I2CD2.i2c->ISR;
- CH_IRQ_PROLOGUE();
+ OSAL_IRQ_PROLOGUE();
/* Clearing IRQ bits.*/
I2CD2.i2c->ICR = isr & I2C_ERROR_MASK;
i2c_lld_serve_error_interrupt(&I2CD2, isr);
- CH_IRQ_EPILOGUE();
+ OSAL_IRQ_EPILOGUE();
}
#else
|