Reformat.

[bertos.git] / cpu / arm / drv / ser_at91.c

diff --git a/cpu/arm/drv/ser_at91.c b/cpu/arm/drv/ser_at91.c
index 27f4c06bc1195fc92ea8cc7a223db5f5716aa5c2..3ec9ea9063d264036afc9961f22483b79e763c7a 100644 (file)
--- a/cpu/arm/drv/ser_at91.c
+++ b/cpu/arm/drv/ser_at91.c
@@ -40,7 +40,6 @@
 
 #include <io/arm.h>
 
-//#include "ser_at91.h"
 #include <drv/ser.h>
 #include <drv/ser_p.h>
 
@@ -52,6 +51,7 @@
 
 #include <appconfig.h>
 
+#define SERIRQ_PRIORITY 4 ///< default priority for serial irqs.
 
 /**
  * \name Overridable serial bus hooks
@@ -87,7 +87,7 @@
                /* Set the vector. */ \
                AIC_SVR(US0_ID) = uart0_irq_dispatcher; \
                /* Initialize to edge triggered with defined priority. */ \
-               AIC_SMR(US0_ID) = AIC_SRCTYPE_INT_EDGE_TRIGGERED; \
+               AIC_SMR(US0_ID) = AIC_SRCTYPE_INT_EDGE_TRIGGERED | SERIRQ_PRIORITY; \
                /* Enable the USART IRQ */ \
                AIC_IECR = BV(US0_ID); \
                PMC_PCER = BV(US0_ID); \
@@ -106,7 +106,7 @@
         */
        #if CPU_ARM_AT91
                #define SER_UART0_BUS_TXINIT do { \
-                       PIOA_PDR = BV(5) | BV(6);\
+                       PIOA_PDR = BV(5) | BV(6); \
                        US0_CR = BV(US_RSTRX) | BV(US_RSTTX); \
                        US0_MR = US_CHMODE_NORMAL | US_CHRL_8 | US_NBSTOP_1; \
                        US0_CR = BV(US_RXEN) | BV(US_TXEN); \
@@ -137,7 +137,7 @@
         * Invoked to send one character.
         */
        #define SER_UART0_BUS_TXCHAR(c) do { \
-               US0_THR = c; \
+               US0_THR = (c); \
        } while (0)
 #endif
 
@@ -163,9 +163,9 @@
        #define SER_UART1_IRQ_INIT do { \
                US1_IDR = 0xFFFFFFFF; \
                /* Set the vector. */ \
-               AIC_SVR(US1_ID) = uart0_irq_dispatcher; \
+               AIC_SVR(US1_ID) = uart1_irq_dispatcher; \
                /* Initialize to edge triggered with defined priority. */ \
-               AIC_SMR(US1_ID) = AIC_SRCTYPE_INT_EDGE_TRIGGERED; \
+               AIC_SMR(US1_ID) = AIC_SRCTYPE_INT_EDGE_TRIGGERED | SERIRQ_PRIORITY; \
                /* Enable the USART IRQ */ \
                AIC_IECR = BV(US1_ID); \
                PMC_PCER = BV(US1_ID); \
@@ -176,7 +176,7 @@
        /** \sa SER_UART1_BUS_TXINIT */
        #if CPU_ARM_AT91
                #define SER_UART1_BUS_TXINIT do { \
-                       PIOA_PDR = BV(0) | BV(1); \
+                       PIOA_PDR = BV(21) | BV(22); \
                        US1_CR = BV(US_RSTRX) | BV(US_RSTTX); \
                        US1_MR = US_CHMODE_NORMAL | US_CHRL_8 | US_NBSTOP_1; \
                        US1_CR = BV(US_RXEN) | BV(US_TXEN); \
@@ -200,7 +200,7 @@
 #ifndef SER_UART1_BUS_TXCHAR
        /** \sa SER_UART1_BUS_TXCHAR */
        #define SER_UART1_BUS_TXCHAR(c) do { \
-               US1_THR = c; \
+               US1_THR = (c); \
        } while (0)
 #endif
 
@@ -276,7 +276,7 @@ struct Serial *ser_uart1 = &ser_handles[SER_UART1];
 /**
  * Serial 0 TX interrupt handler
  */
-static void usart0_irq_tx(void)
+static void uart0_irq_tx(void)
 {
        SER_STROBE_ON;
 
@@ -289,7 +289,6 @@ static void usart0_irq_tx(void)
        else
        {
                char c = fifo_pop(txfifo);
-//             kprintf("USART0 tx char: %c\n", c);
                SER_UART0_BUS_TXCHAR(c);
        }
 
@@ -299,7 +298,7 @@ static void usart0_irq_tx(void)
 /**
  * Serial 0 RX complete interrupt handler.
  */
-static void usart0_irq_rx(void)
+static void uart0_irq_rx(void)
 {
        SER_STROBE_ON;
 
@@ -312,10 +311,7 @@ static void usart0_irq_rx(void)
        if (fifo_isfull(rxfifo))
                ser_uart0->status |= SERRF_RXFIFOOVERRUN;
        else
-       {
-//             kprintf("USART0 recv char: %c\n", c);
                fifo_push(rxfifo, c);
-       }
 
        SER_STROBE_OFF;
 }
@@ -329,22 +325,18 @@ static void uart0_irq_dispatcher(void)
        IRQ_ENTRY();
 
        if (US0_IMR & BV(US_RXRDY))
-       {
-//             kprintf("IRQ RX USART0\n");
-               usart0_irq_rx();
-       }
+               uart0_irq_rx();
+
        if (US0_IMR & BV(US_TXRDY))
-       {
-//             kprintf("IRQ TX USART0\n");
-               usart0_irq_tx();
-       }
+               uart0_irq_tx();
+
        IRQ_EXIT();
 }
 
 /**
  * Serial 1 TX interrupt handler
  */
-static void usart1_irq_tx(void)
+static void uart1_irq_tx(void)
 {
        SER_STROBE_ON;
 
@@ -357,7 +349,6 @@ static void usart1_irq_tx(void)
        else
        {
                char c = fifo_pop(txfifo);
-//             kprintf("USART1 tx char: %c\n", c);
                SER_UART1_BUS_TXCHAR(c);
        }
 
@@ -367,7 +358,7 @@ static void usart1_irq_tx(void)
 /**
  * Serial 1 RX complete interrupt handler.
  */
-static void usart1_irq_rx(void)
+static void uart1_irq_rx(void)
 {
        SER_STROBE_ON;
 
@@ -380,10 +371,7 @@ static void usart1_irq_rx(void)
        if (fifo_isfull(rxfifo))
                ser_uart1->status |= SERRF_RXFIFOOVERRUN;
        else
-       {
-//             kprintf("USART1 recv char: %c\n", c);
                fifo_push(rxfifo, c);
-       }
 
        SER_STROBE_OFF;
 }
@@ -397,15 +385,11 @@ static void uart1_irq_dispatcher(void)
        IRQ_ENTRY();
 
        if (US1_IMR & BV(US_RXRDY))
-       {
-//             kprintf("IRQ RX USART1\n");
-               usart1_irq_rx();
-       }
+               uart1_irq_rx();
+
        if (US1_IMR & BV(US_TXRDY))
-       {
-//             kprintf("IRQ TX USART1\n");
-               usart1_irq_tx();
-       }
+               uart1_irq_tx();
+
        IRQ_EXIT();
 }
 /*
@@ -510,7 +494,7 @@ static void uart1_enabletxirq(struct SerialHardware *_hw)
 static void uart1_setbaudrate(UNUSED_ARG(struct SerialHardware *, _hw), unsigned long rate)
 {
        /* Compute baud-rate period */
-       US0_BRGR = CLOCK_FREQ / (16 * rate);
+       US1_BRGR = CLOCK_FREQ / (16 * rate);
        //DB(kprintf("uart0_setbaudrate(rate=%lu): period=%d\n", rate, period);)
 }
 
@@ -572,11 +556,11 @@ static const struct SerialHardwareVT UART0_VT =
 
 static const struct SerialHardwareVT UART1_VT =
 {
-       C99INIT(init, uart0_init),
-       C99INIT(cleanup, uart0_cleanup),
-       C99INIT(setBaudrate, uart0_setbaudrate),
-       C99INIT(setParity, uart0_setparity),
-       C99INIT(txStart, uart0_enabletxirq),
+       C99INIT(init, uart1_init),
+       C99INIT(cleanup, uart1_cleanup),
+       C99INIT(setBaudrate, uart1_setbaudrate),
+       C99INIT(setParity, uart1_setparity),
+       C99INIT(txStart, uart1_enabletxirq),
        C99INIT(txSending, tx_sending),
 };