andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[KINETIS] Fixed drivers that used rt/nil APIs to use OSAL API 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7868 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Fabio Utzig 2015-04-07 10:12:08 +00:00
parent dc3fe1994c
commit 16c53c9c52
4 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
os/hal/ports/KINETIS/K20x/serial_lld.c
View File

@ -82,9 +82,9 @@ static void serve_interrupt(SerialDriver *sdp) {
if (s1 & UARTx_S1_RDRF) { if (s1 & UARTx_S1_RDRF) {
osalSysLockFromISR(); osalSysLockFromISR();
if (chIQIsEmptyI(&sdp->iqueue)) if (iqIsEmptyI(&sdp->iqueue))
chnAddFlagsI(sdp, CHN_INPUT_AVAILABLE); chnAddFlagsI(sdp, CHN_INPUT_AVAILABLE);
if (chIQPutI(&sdp->iqueue, u->D) < Q_OK) if (iqPutI(&sdp->iqueue, u->D) < Q_OK)
chnAddFlagsI(sdp, SD_OVERRUN_ERROR); chnAddFlagsI(sdp, SD_OVERRUN_ERROR);
osalSysUnlockFromISR(); osalSysUnlockFromISR();
} }
@ -93,7 +93,7 @@ static void serve_interrupt(SerialDriver *sdp) {
msg_t b; msg_t b;
osalSysLockFromISR(); osalSysLockFromISR();
b = chOQGetI(&sdp->oqueue); b = oqGetI(&sdp->oqueue);
osalSysUnlockFromISR(); osalSysUnlockFromISR();
if (b < Q_OK) { if (b < Q_OK) {
@ -114,7 +114,7 @@ static void preload(SerialDriver *sdp) {
UART_TypeDef *u = sdp->uart; UART_TypeDef *u = sdp->uart;
if (u->S1 & UARTx_S1_TDRE) { if (u->S1 & UARTx_S1_TDRE) {
msg_t b = chOQGetI(&sdp->oqueue); msg_t b = oqGetI(&sdp->oqueue);
if (b < Q_OK) { if (b < Q_OK) {
chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY); chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY);
return; return;
@ -182,29 +182,29 @@ static void configure_uart(UART_TypeDef *uart, const SerialConfig *config)
*/ */
#if KINETIS_SERIAL_USE_UART0 || defined(__DOXYGEN__) #if KINETIS_SERIAL_USE_UART0 || defined(__DOXYGEN__)
CH_IRQ_HANDLER(Vector80) { OSAL_IRQ_HANDLER(Vector80) {
CH_IRQ_PROLOGUE(); OSAL_IRQ_PROLOGUE();
serve_interrupt(&SD1); serve_interrupt(&SD1);
CH_IRQ_EPILOGUE(); OSAL_IRQ_EPILOGUE();
} }
#endif #endif
#if KINETIS_SERIAL_USE_UART1 || defined(__DOXYGEN__) #if KINETIS_SERIAL_USE_UART1 || defined(__DOXYGEN__)
CH_IRQ_HANDLER(Vector88) { OSAL_IRQ_HANDLER(Vector88) {
CH_IRQ_PROLOGUE(); OSAL_IRQ_PROLOGUE();
serve_interrupt(&SD2); serve_interrupt(&SD2);
CH_IRQ_EPILOGUE(); OSAL_IRQ_EPILOGUE();
} }
#endif #endif
#if KINETIS_SERIAL_USE_UART2 || defined(__DOXYGEN__) #if KINETIS_SERIAL_USE_UART2 || defined(__DOXYGEN__)
CH_IRQ_HANDLER(Vector90) { OSAL_IRQ_HANDLER(Vector90) {
CH_IRQ_PROLOGUE(); OSAL_IRQ_PROLOGUE();
serve_interrupt(&SD3); serve_interrupt(&SD3);
CH_IRQ_EPILOGUE(); OSAL_IRQ_EPILOGUE();
} }
#endif #endif

26
os/hal/ports/KINETIS/KL2x/serial_lld.c
View File

@ -81,9 +81,9 @@ static void serve_interrupt(SerialDriver *sdp) {
if (u->S1 & UARTx_S1_RDRF) { if (u->S1 & UARTx_S1_RDRF) {
osalSysLockFromISR(); osalSysLockFromISR();
if (chIQIsEmptyI(&sdp->iqueue)) if (iqIsEmptyI(&sdp->iqueue))
chnAddFlagsI(sdp, CHN_INPUT_AVAILABLE); chnAddFlagsI(sdp, CHN_INPUT_AVAILABLE);
if (chIQPutI(&sdp->iqueue, u->D) < Q_OK) if (iqPutI(&sdp->iqueue, u->D) < Q_OK)
chnAddFlagsI(sdp, SD_OVERRUN_ERROR); chnAddFlagsI(sdp, SD_OVERRUN_ERROR);
osalSysUnlockFromISR(); osalSysUnlockFromISR();
} }
@ -92,7 +92,7 @@ static void serve_interrupt(SerialDriver *sdp) {
msg_t b; msg_t b;
osalSysLockFromISR(); osalSysLockFromISR();
b = chOQGetI(&sdp->oqueue); b = oqGetI(&sdp->oqueue);
osalSysUnlockFromISR(); osalSysUnlockFromISR();
if (b < Q_OK) { if (b < Q_OK) {
@ -122,7 +122,7 @@ static void preload(SerialDriver *sdp) {
UARTLP_TypeDef *u = sdp->uart; UARTLP_TypeDef *u = sdp->uart;
if (u->S1 & UARTx_S1_TDRE) { if (u->S1 & UARTx_S1_TDRE) {
msg_t b = chOQGetI(&sdp->oqueue); msg_t b = oqGetI(&sdp->oqueue);
if (b < Q_OK) { if (b < Q_OK) {
chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY); chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY);
return; return;
@ -205,29 +205,29 @@ static void configure_uart(UARTLP_TypeDef *uart, const SerialConfig *config)
/*===========================================================================*/ /*===========================================================================*/
#if KINETIS_SERIAL_USE_UART0 || defined(__DOXYGEN__) #if KINETIS_SERIAL_USE_UART0 || defined(__DOXYGEN__)
CH_IRQ_HANDLER(Vector70) { OSAL_IRQ_HANDLER(Vector70) {
CH_IRQ_PROLOGUE(); OSAL_IRQ_PROLOGUE();
serve_interrupt(&SD1); serve_interrupt(&SD1);
CH_IRQ_EPILOGUE(); OSAL_IRQ_EPILOGUE();
} }
#endif #endif
#if KINETIS_SERIAL_USE_UART1 || defined(__DOXYGEN__) #if KINETIS_SERIAL_USE_UART1 || defined(__DOXYGEN__)
CH_IRQ_HANDLER(Vector74) { OSAL_IRQ_HANDLER(Vector74) {
CH_IRQ_PROLOGUE(); OSAL_IRQ_PROLOGUE();
serve_interrupt(&SD2); serve_interrupt(&SD2);
CH_IRQ_EPILOGUE(); OSAL_IRQ_EPILOGUE();
} }
#endif #endif
#if KINETIS_SERIAL_USE_UART2 || defined(__DOXYGEN__) #if KINETIS_SERIAL_USE_UART2 || defined(__DOXYGEN__)
CH_IRQ_HANDLER(Vector78) { OSAL_IRQ_HANDLER(Vector78) {
CH_IRQ_PROLOGUE(); OSAL_IRQ_PROLOGUE();
serve_interrupt(&SD3); serve_interrupt(&SD3);
CH_IRQ_EPILOGUE(); OSAL_IRQ_EPILOGUE();
} }
#endif #endif

2
os/hal/ports/KINETIS/LLD/ext_lld.c
View File

@ -215,7 +215,7 @@ OSAL_IRQ_HANDLER(KINETIS_PORTD_IRQ_VECTOR) {
* @isr * @isr
*/ */
#if defined(KINETIS_PORTE_IRQ_VECTOR) && KINETIS_EXT_PORTE_WIDTH > 0 #if defined(KINETIS_PORTE_IRQ_VECTOR) && KINETIS_EXT_PORTE_WIDTH > 0
CH_IRQ_HANDLER(KINETIS_PORTE_IRQ_VECTOR) { OSAL_IRQ_HANDLER(KINETIS_PORTE_IRQ_VECTOR) {
OSAL_IRQ_PROLOGUE(); OSAL_IRQ_PROLOGUE();
irq_handler(PORTE, KINETIS_EXT_PORTE_WIDTH, porte_channel_map); irq_handler(PORTE, KINETIS_EXT_PORTE_WIDTH, porte_channel_map);

12
os/hal/ports/KINETIS/LLD/i2c_lld.c
View File

@ -180,11 +180,11 @@ static void serve_interrupt(I2CDriver *i2cp) {
#if KINETIS_I2C_USE_I2C0 || defined(__DOXYGEN__) #if KINETIS_I2C_USE_I2C0 || defined(__DOXYGEN__)
PORT_IRQ_HANDLER(KINETIS_I2C0_IRQ_VECTOR) { OSAL_IRQ_HANDLER(KINETIS_I2C0_IRQ_VECTOR) {
PORT_IRQ_PROLOGUE(); OSAL_IRQ_PROLOGUE();
serve_interrupt(&I2CD1); serve_interrupt(&I2CD1);
PORT_IRQ_EPILOGUE(); OSAL_IRQ_EPILOGUE();
} }
#endif #endif
@ -192,11 +192,11 @@ PORT_IRQ_HANDLER(KINETIS_I2C0_IRQ_VECTOR) {
#if KINETIS_I2C_USE_I2C1 || defined(__DOXYGEN__) #if KINETIS_I2C_USE_I2C1 || defined(__DOXYGEN__)
/* FIXME: KL2x has I2C1 on Vector64; K2x don't have I2C1! */ /* FIXME: KL2x has I2C1 on Vector64; K2x don't have I2C1! */
PORT_IRQ_HANDLER(Vector64) { OSAL_IRQ_HANDLER(Vector64) {
PORT_IRQ_PROLOGUE(); OSAL_IRQ_PROLOGUE();
serve_interrupt(&I2CD2); serve_interrupt(&I2CD2);
PORT_IRQ_EPILOGUE(); OSAL_IRQ_EPILOGUE();
} }
#endif #endif