[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

4 files changed, 33 insertions, 33 deletions

diff --git a/os/hal/ports/KINETIS/K20x/serial_lld.c b/os/hal/ports/KINETIS/K20x/serial_lld.c
index 2bb7e55a9..009274710 100644
--- a/os/hal/ports/KINETIS/K20x/serial_lld.c
+++ b/os/hal/ports/KINETIS/K20x/serial_lld.c
@@ -82,9 +82,9 @@ static void serve_interrupt(SerialDriver *sdp) {
 

   if (s1 & UARTx_S1_RDRF) {

     osalSysLockFromISR();

-    if (chIQIsEmptyI(&sdp->iqueue))

+    if (iqIsEmptyI(&sdp->iqueue))

       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);

     osalSysUnlockFromISR();

   }

@@ -93,7 +93,7 @@ static void serve_interrupt(SerialDriver *sdp) {
     msg_t b;

 

     osalSysLockFromISR();

-    b = chOQGetI(&sdp->oqueue);

+    b = oqGetI(&sdp->oqueue);

     osalSysUnlockFromISR();

 

     if (b < Q_OK) {

@@ -114,7 +114,7 @@ static void preload(SerialDriver *sdp) {
   UART_TypeDef *u = sdp->uart;

 

   if (u->S1 & UARTx_S1_TDRE) {

-    msg_t b = chOQGetI(&sdp->oqueue);

+    msg_t b = oqGetI(&sdp->oqueue);

     if (b < Q_OK) {

       chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY);

       return;

@@ -182,29 +182,29 @@ static void configure_uart(UART_TypeDef *uart, const SerialConfig *config)
  */

 

 #if KINETIS_SERIAL_USE_UART0 || defined(__DOXYGEN__)

-CH_IRQ_HANDLER(Vector80) {

+OSAL_IRQ_HANDLER(Vector80) {

 

-  CH_IRQ_PROLOGUE();

+  OSAL_IRQ_PROLOGUE();

   serve_interrupt(&SD1);

-  CH_IRQ_EPILOGUE();

+  OSAL_IRQ_EPILOGUE();

 }

 #endif

 

 #if KINETIS_SERIAL_USE_UART1 || defined(__DOXYGEN__)

-CH_IRQ_HANDLER(Vector88) {

+OSAL_IRQ_HANDLER(Vector88) {

 

-  CH_IRQ_PROLOGUE();

+  OSAL_IRQ_PROLOGUE();

   serve_interrupt(&SD2);

-  CH_IRQ_EPILOGUE();

+  OSAL_IRQ_EPILOGUE();

 }

 #endif

 

 #if KINETIS_SERIAL_USE_UART2 || defined(__DOXYGEN__)

-CH_IRQ_HANDLER(Vector90) {

+OSAL_IRQ_HANDLER(Vector90) {

 

-  CH_IRQ_PROLOGUE();

+  OSAL_IRQ_PROLOGUE();

   serve_interrupt(&SD3);

-  CH_IRQ_EPILOGUE();

+  OSAL_IRQ_EPILOGUE();

 }

 #endif

 

diff --git a/os/hal/ports/KINETIS/KL2x/serial_lld.c b/os/hal/ports/KINETIS/KL2x/serial_lld.c
index e6d1ae836..f0cbc46ac 100644
--- a/os/hal/ports/KINETIS/KL2x/serial_lld.c
+++ b/os/hal/ports/KINETIS/KL2x/serial_lld.c
@@ -81,9 +81,9 @@ static void serve_interrupt(SerialDriver *sdp) {
 

   if (u->S1 & UARTx_S1_RDRF) {

     osalSysLockFromISR();

-    if (chIQIsEmptyI(&sdp->iqueue))

+    if (iqIsEmptyI(&sdp->iqueue))

       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);

     osalSysUnlockFromISR();

   }

@@ -92,7 +92,7 @@ static void serve_interrupt(SerialDriver *sdp) {
     msg_t b;

 

     osalSysLockFromISR();

-    b = chOQGetI(&sdp->oqueue);

+    b = oqGetI(&sdp->oqueue);

     osalSysUnlockFromISR();

 

     if (b < Q_OK) {

@@ -122,7 +122,7 @@ static void preload(SerialDriver *sdp) {
   UARTLP_TypeDef *u = sdp->uart;

 

   if (u->S1 & UARTx_S1_TDRE) {

-    msg_t b = chOQGetI(&sdp->oqueue);

+    msg_t b = oqGetI(&sdp->oqueue);

     if (b < Q_OK) {

       chnAddFlagsI(sdp, CHN_OUTPUT_EMPTY);

       return;

@@ -205,29 +205,29 @@ static void configure_uart(UARTLP_TypeDef *uart, const SerialConfig *config)
 /*===========================================================================*/

 

 #if KINETIS_SERIAL_USE_UART0 || defined(__DOXYGEN__)

-CH_IRQ_HANDLER(Vector70) {

+OSAL_IRQ_HANDLER(Vector70) {

 

-  CH_IRQ_PROLOGUE();

+  OSAL_IRQ_PROLOGUE();

   serve_interrupt(&SD1);

-  CH_IRQ_EPILOGUE();

+  OSAL_IRQ_EPILOGUE();

 }

 #endif

 

 #if KINETIS_SERIAL_USE_UART1 || defined(__DOXYGEN__)

-CH_IRQ_HANDLER(Vector74) {

+OSAL_IRQ_HANDLER(Vector74) {

 

-  CH_IRQ_PROLOGUE();

+  OSAL_IRQ_PROLOGUE();

   serve_interrupt(&SD2);

-  CH_IRQ_EPILOGUE();

+  OSAL_IRQ_EPILOGUE();

 }

 #endif

 

 #if KINETIS_SERIAL_USE_UART2 || defined(__DOXYGEN__)

-CH_IRQ_HANDLER(Vector78) {

+OSAL_IRQ_HANDLER(Vector78) {

 

-  CH_IRQ_PROLOGUE();

+  OSAL_IRQ_PROLOGUE();

   serve_interrupt(&SD3);

-  CH_IRQ_EPILOGUE();

+  OSAL_IRQ_EPILOGUE();

 }

 #endif

 

diff --git a/os/hal/ports/KINETIS/LLD/ext_lld.c b/os/hal/ports/KINETIS/LLD/ext_lld.c
index c0800cd9f..e85f0328c 100644
--- a/os/hal/ports/KINETIS/LLD/ext_lld.c
+++ b/os/hal/ports/KINETIS/LLD/ext_lld.c
@@ -215,7 +215,7 @@ OSAL_IRQ_HANDLER(KINETIS_PORTD_IRQ_VECTOR) {
  * @isr

  */

 #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();

 

   irq_handler(PORTE, KINETIS_EXT_PORTE_WIDTH, porte_channel_map);

diff --git a/os/hal/ports/KINETIS/LLD/i2c_lld.c b/os/hal/ports/KINETIS/LLD/i2c_lld.c
index d9980ab79..4e42d1692 100644
--- a/os/hal/ports/KINETIS/LLD/i2c_lld.c
+++ b/os/hal/ports/KINETIS/LLD/i2c_lld.c
@@ -180,11 +180,11 @@ static void serve_interrupt(I2CDriver *i2cp) {
 

 #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);

-  PORT_IRQ_EPILOGUE();

+  OSAL_IRQ_EPILOGUE();

 }

 

 #endif

@@ -192,11 +192,11 @@ PORT_IRQ_HANDLER(KINETIS_I2C0_IRQ_VECTOR) {
 #if KINETIS_I2C_USE_I2C1 || defined(__DOXYGEN__)

 

 /* 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);

-  PORT_IRQ_EPILOGUE();

+  OSAL_IRQ_EPILOGUE();

 }

 

 #endif