X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=cpu%2Farm%2Fdrv%2Fser_at91.c;h=339ce65991c3be7eb132b842a5f5a0f12c51dd48;hb=3325db8b1e7a713d5c4cabb97dcaa488d93a3179;hp=650529b5d6f1a7b88464ea884af24435d0388d4b;hpb=569cd794010c99ae8e3e2e37a207b0a2eaeb2c3f;p=bertos.git diff --git a/cpu/arm/drv/ser_at91.c b/cpu/arm/drv/ser_at91.c index 650529b5..339ce659 100644 --- a/cpu/arm/drv/ser_at91.c +++ b/cpu/arm/drv/ser_at91.c @@ -40,7 +40,7 @@ #include -//#include "ser_at91.h" +#include #include #include @@ -52,6 +52,7 @@ #include +#define SERIRQ_PRIORITY 4 ///< default priority for serial irqs. /** * \name Overridable serial bus hooks @@ -74,7 +75,139 @@ * \{ */ +#ifndef SER_UART0_IRQ_INIT + /** + * Default IRQ INIT macro - invoked in uart0_init() + * + * - Disable all interrupt + * - Register USART0 interrupt + * - Enable USART0 clock. + */ + #define SER_UART0_IRQ_INIT do { \ + US0_IDR = 0xFFFFFFFF; \ + /* 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 | SERIRQ_PRIORITY; \ + /* Enable the USART IRQ */ \ + AIC_IECR = BV(US0_ID); \ + PMC_PCER = BV(US0_ID); \ + } while (0) +#endif + +#ifndef SER_UART0_BUS_TXINIT + /** + * Default TXINIT macro - invoked in uart0_init() + * + * - Disable GPIO on USART0 tx/rx pins + * - Reset USART0 + * - Set serial param: mode Normal, 8bit data, 1bit stop + * - Enable both the receiver and the transmitter + * - Enable only the RX complete interrupt + */ + #if !CPU_ARM_AT91SAM7S256 + #warning Check USART0 pins! + #endif + #define SER_UART0_BUS_TXINIT do { \ + 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); \ + US0_IER = BV(US_RXRDY); \ + } while (0) +#endif + +#ifndef SER_UART0_BUS_TXBEGIN + /** + * Invoked before starting a transmission + * + * - Enable both the receiver and the transmitter + * - Enable both the RX complete and TX empty interrupts + */ + #define SER_UART0_BUS_TXBEGIN do { \ + US0_CR = BV(US_RXEN) | BV(US_TXEN); \ + US0_IER = BV(US_TXRDY) | BV(US_RXRDY); \ + } while (0) +#endif + +#ifndef SER_UART0_BUS_TXCHAR + /** + * Invoked to send one character. + */ + #define SER_UART0_BUS_TXCHAR(c) do { \ + US0_THR = (c); \ + } while (0) +#endif + +#ifndef SER_UART0_BUS_TXEND + /** + * Invoked as soon as the txfifo becomes empty + * + * - Keep both the receiver and the transmitter enabled + * - Keep the RX complete interrupt enabled + * - Disable the TX empty interrupts + */ + #define SER_UART0_BUS_TXEND do { \ + US0_CR = BV(US_RXEN) | BV(US_TXEN); \ + US0_IER = BV(US_RXRDY); \ + US0_IDR = BV(US_TXRDY); \ + } while (0) +#endif + +/* End USART0 macros */ + +#ifndef SER_UART1_IRQ_INIT + /** \sa SER_UART0_BUS_TXINIT */ + #define SER_UART1_IRQ_INIT do { \ + US1_IDR = 0xFFFFFFFF; \ + /* Set the vector. */ \ + AIC_SVR(US1_ID) = uart1_irq_dispatcher; \ + /* Initialize to edge triggered with defined priority. */ \ + 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); \ + } while (0) +#endif + +#ifndef SER_UART1_BUS_TXINIT + /** \sa SER_UART1_BUS_TXINIT */ + #if !CPU_ARM_AT91SAM7S256 + #warning Check USART1 pins! + #endif + #define SER_UART1_BUS_TXINIT do { \ + 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); \ + US1_IER = BV(US_RXRDY); \ + } while (0) +#endif + +#ifndef SER_UART1_BUS_TXBEGIN + /** \sa SER_UART1_BUS_TXBEGIN */ + #define SER_UART1_BUS_TXBEGIN do { \ + US1_CR = BV(US_RXEN) | BV(US_TXEN); \ + US1_IER = BV(US_TXRDY) | BV(US_RXRDY); \ + } while (0) +#endif + +#ifndef SER_UART1_BUS_TXCHAR + /** \sa SER_UART1_BUS_TXCHAR */ + #define SER_UART1_BUS_TXCHAR(c) do { \ + US1_THR = (c); \ + } while (0) +#endif + +#ifndef SER_UART1_BUS_TXEND + /** \sa SER_UART1_BUS_TXEND */ + #define SER_UART1_BUS_TXEND do { \ + US1_CR = BV(US_RXEN) | BV(US_TXEN); \ + US1_IER = BV(US_RXRDY); \ + US1_IDR = BV(US_TXRDY); \ + } while (0) +#endif /** * \def CONFIG_SER_STROBE @@ -100,6 +233,9 @@ extern struct Serial ser_handles[SER_CNT]; static unsigned char uart0_txbuffer[CONFIG_UART0_TXBUFSIZE]; static unsigned char uart0_rxbuffer[CONFIG_UART0_RXBUFSIZE]; +static unsigned char uart1_txbuffer[CONFIG_UART1_TXBUFSIZE]; +static unsigned char uart1_rxbuffer[CONFIG_UART1_RXBUFSIZE]; + /** * Internal hardware state structure * @@ -131,125 +267,98 @@ struct ArmSerial * (and hopefully faster) code. */ struct Serial *ser_uart0 = &ser_handles[SER_UART0]; +struct Serial *ser_uart1 = &ser_handles[SER_UART1]; -/** - * Serial 0 TX interrupt handler + +static void uart0_irq_dispatcher(void); +static void uart1_irq_dispatcher(void); +/* + * Callbacks for USART0 */ -static void serirq_tx(void) +static void uart0_init( + UNUSED_ARG(struct SerialHardware *, _hw), + UNUSED_ARG(struct Serial *, ser)) { - SER_STROBE_ON; - - struct FIFOBuffer * const txfifo = &ser_uart0->txfifo; - - if (fifo_isempty(txfifo)) - { - /* Enable Tx and Rx */ - US0_CR = BV(US_RXEN) | BV(US_TXEN); - /* Enable Rx interrupt */ - US0_IER = BV(US_RXRDY); - /* Disable Tx interrupt */ - US0_IDR = BV(US_TXRDY); - } - else - { - char c = fifo_pop(txfifo); - kprintf("Tx char: %c\n", c); - /* Send one char */ - US0_THR = c; - } - - SER_STROBE_OFF; + SER_UART0_IRQ_INIT; + SER_UART0_BUS_TXINIT; + SER_STROBE_INIT; } -/** - * Serial 0 RX complete interrupt handler. - */ -static void serirq_rx(void) +static void uart0_cleanup(UNUSED_ARG(struct SerialHardware *, _hw)) { - SER_STROBE_ON; - - /* Should be read before US_CRS */ - ser_uart0->status |= US0_CSR & (SERRF_RXSROVERRUN | SERRF_FRAMEERROR); + US0_CR = BV(US_RSTRX) | BV(US_RSTTX) | BV(US_RXDIS) | BV(US_TXDIS) | BV(US_RSTSTA); +} - char c = US0_RHR; - struct FIFOBuffer * const rxfifo = &ser_uart0->rxfifo; +static void uart0_enabletxirq(struct SerialHardware *_hw) +{ + struct ArmSerial *hw = (struct ArmSerial *)_hw; - if (fifo_isfull(rxfifo)) - ser_uart0->status |= SERRF_RXFIFOOVERRUN; - else + /* + * WARNING: racy code here! The tx interrupt sets hw->sending to false + * when it runs with an empty fifo. The order of statements in the + * if-block matters. + */ + if (!hw->sending) { - kprintf("Recv char: %c\n", c); - fifo_push(rxfifo, c); + hw->sending = true; + SER_UART0_BUS_TXBEGIN; } - - SER_STROBE_OFF; } -/** - * Serial IRQ dispatcher. - */ -static void serirq_dispatcher(void) __attribute__ ((naked)); -static void serirq_dispatcher(void) +static void uart0_setbaudrate(UNUSED_ARG(struct SerialHardware *, _hw), unsigned long rate) { - IRQ_ENTRY(); + /* Compute baud-rate period */ + US0_BRGR = CLOCK_FREQ / (16 * rate); + //DB(kprintf("uart0_setbaudrate(rate=%lu): period=%d\n", rate, period);) +} - if (US0_IMR & BV(US_RXRDY)) - { - kprintf("IRQ RX\n"); - serirq_rx(); - } - if (US0_IMR & BV(US_TXRDY)) +static void uart0_setparity(UNUSED_ARG(struct SerialHardware *, _hw), int parity) +{ + US0_MR &= ~US_PAR_MASK; + /* Set UART parity */ + switch(parity) { - kprintf("IRQ TX\n"); - serirq_tx(); + case SER_PARITY_NONE: + { + /* Parity mode. */ + US0_MR |= US_PAR_NO; + break; + } + case SER_PARITY_EVEN: + { + /* Even parity.*/ + US0_MR |= US_PAR_EVEN; + break; + } + case SER_PARITY_ODD: + { + /* Odd parity.*/ + US0_MR |= US_PAR_ODD; + break; + } + default: + ASSERT(0); } - IRQ_EXIT(); -} +} /* - * Callbacks + * Callbacks for USART1 */ -static void uart0_init( +static void uart1_init( UNUSED_ARG(struct SerialHardware *, _hw), UNUSED_ARG(struct Serial *, ser)) { - /* Disable all interrupt */ - US0_IDR = 0xFFFFFFFF; - - /* Set the vector. */ - AIC_SVR(US0_ID) = serirq_dispatcher; - /* Initialize to edge triggered with defined priority. */ - AIC_SMR(US0_ID) = AIC_SRCTYPE_INT_EDGE_TRIGGERED; - /* Enable the USART IRQ */ - AIC_IECR = BV(US0_ID); - - /* Enable UART clock. */ - PMC_PCER = BV(US0_ID); - - /* Disable GPIO on UART tx/rx pins. */ - PIOA_PDR = BV(5) | BV(6); - - /* Reset UART. */ - US0_CR = BV(US_RSTRX) | BV(US_RSTTX); - - /* Set serial param: mode Normal, 8bit data, 1bit stop */ - US0_MR = US_CHMODE_NORMAL | US_CHRL_8 | US_NBSTOP_1; - - /* Enable Tx and Rx */ - US0_CR = BV(US_RXEN) | BV(US_TXEN); - - /* Enable Rx interrupt*/ - US0_IER = BV(US_RXRDY); - - + SER_UART1_IRQ_INIT; + SER_UART1_BUS_TXINIT; + SER_STROBE_INIT; } -static void uart0_cleanup(UNUSED_ARG(struct SerialHardware *, _hw)) +static void uart1_cleanup(UNUSED_ARG(struct SerialHardware *, _hw)) { - US0_CR = BV(US_RSTRX) | BV(US_RSTTX) | BV(US_RXDIS) | BV(US_TXDIS) | BV(US_RSTSTA); + US1_CR = BV(US_RSTRX) | BV(US_RSTTX) | BV(US_RXDIS) | BV(US_TXDIS) | BV(US_RSTSTA); } -static void uart0_enabletxirq(struct SerialHardware *_hw) +static void uart1_enabletxirq(struct SerialHardware *_hw) { struct ArmSerial *hw = (struct ArmSerial *)_hw; @@ -261,43 +370,43 @@ static void uart0_enabletxirq(struct SerialHardware *_hw) if (!hw->sending) { hw->sending = true; - /* Enable Tx and Rx */ - US0_CR = BV(US_RXEN) | BV(US_TXEN); - /* Enable Tx and Rx interrupt*/ - US0_IER = BV(US_TXRDY) | BV(US_RXRDY); + SER_UART1_BUS_TXBEGIN; } } -static void uart0_setbaudrate(UNUSED_ARG(struct SerialHardware *, _hw), unsigned long rate) +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);) } -static void uart0_setparity(UNUSED_ARG(struct SerialHardware *, _hw), int parity) +static void uart1_setparity(UNUSED_ARG(struct SerialHardware *, _hw), int parity) { + US1_MR &= ~US_PAR_MASK; /* Set UART parity */ switch(parity) { case SER_PARITY_NONE: { /* Parity mode. */ - US0_MR |= US_PAR_MASK; + US1_MR |= US_PAR_NO; break; } case SER_PARITY_EVEN: { /* Even parity.*/ - US0_MR |= US_PAR_EVEN; + US1_MR |= US_PAR_EVEN; break; } case SER_PARITY_ODD: { /* Odd parity.*/ - US0_MR |= US_PAR_ODD; + US1_MR |= US_PAR_ODD; break; } + default: + ASSERT(0); } } @@ -331,6 +440,16 @@ static const struct SerialHardwareVT UART0_VT = C99INIT(txSending, tx_sending), }; +static const struct SerialHardwareVT UART1_VT = +{ + C99INIT(init, uart1_init), + C99INIT(cleanup, uart1_cleanup), + C99INIT(setBaudrate, uart1_setbaudrate), + C99INIT(setParity, uart1_setparity), + C99INIT(txStart, uart1_enabletxirq), + C99INIT(txSending, tx_sending), +}; + static struct ArmSerial UARTDescs[SER_CNT] = { { @@ -342,6 +461,16 @@ static struct ArmSerial UARTDescs[SER_CNT] = C99INIT(rxbuffer_size, sizeof(uart0_rxbuffer)), }, C99INIT(sending, false), + }, + { + C99INIT(hw, /**/) { + C99INIT(table, &UART1_VT), + C99INIT(txbuffer, uart1_txbuffer), + C99INIT(rxbuffer, uart1_rxbuffer), + C99INIT(txbuffer_size, sizeof(uart1_txbuffer)), + C99INIT(rxbuffer_size, sizeof(uart1_rxbuffer)), + }, + C99INIT(sending, false), } }; @@ -350,3 +479,125 @@ struct SerialHardware *ser_hw_getdesc(int unit) ASSERT(unit < SER_CNT); return &UARTDescs[unit].hw; } + +/** + * Serial 0 TX interrupt handler + */ +static void uart0_irq_tx(void) +{ + SER_STROBE_ON; + + struct FIFOBuffer * const txfifo = &ser_uart0->txfifo; + + if (fifo_isempty(txfifo)) + { + SER_UART0_BUS_TXEND; + UARTDescs[SER_UART0].sending = false; + } + else + { + char c = fifo_pop(txfifo); + SER_UART0_BUS_TXCHAR(c); + } + + SER_STROBE_OFF; +} + +/** + * Serial 0 RX complete interrupt handler. + */ +static void uart0_irq_rx(void) +{ + SER_STROBE_ON; + + /* Should be read before US_CRS */ + ser_uart0->status |= US0_CSR & (SERRF_RXSROVERRUN | SERRF_FRAMEERROR); + + char c = US0_RHR; + struct FIFOBuffer * const rxfifo = &ser_uart0->rxfifo; + + if (fifo_isfull(rxfifo)) + ser_uart0->status |= SERRF_RXFIFOOVERRUN; + else + fifo_push(rxfifo, c); + + SER_STROBE_OFF; +} + +/** + * Serial IRQ dispatcher for USART0. + */ +static void uart0_irq_dispatcher(void) __attribute__ ((naked)); +static void uart0_irq_dispatcher(void) +{ + IRQ_ENTRY(); + + if (US0_IMR & BV(US_RXRDY)) + uart0_irq_rx(); + + if (US0_IMR & BV(US_TXRDY)) + uart0_irq_tx(); + + IRQ_EXIT(); +} + +/** + * Serial 1 TX interrupt handler + */ +static void uart1_irq_tx(void) +{ + SER_STROBE_ON; + + struct FIFOBuffer * const txfifo = &ser_uart1->txfifo; + + if (fifo_isempty(txfifo)) + { + SER_UART1_BUS_TXEND; + UARTDescs[SER_UART1].sending = false; + } + else + { + char c = fifo_pop(txfifo); + SER_UART1_BUS_TXCHAR(c); + } + + SER_STROBE_OFF; +} + +/** + * Serial 1 RX complete interrupt handler. + */ +static void uart1_irq_rx(void) +{ + SER_STROBE_ON; + + /* Should be read before US_CRS */ + ser_uart1->status |= US1_CSR & (SERRF_RXSROVERRUN | SERRF_FRAMEERROR); + + char c = US1_RHR; + struct FIFOBuffer * const rxfifo = &ser_uart1->rxfifo; + + if (fifo_isfull(rxfifo)) + ser_uart1->status |= SERRF_RXFIFOOVERRUN; + else + fifo_push(rxfifo, c); + + SER_STROBE_OFF; +} + +/** + * Serial IRQ dispatcher for USART1. + */ +static void uart1_irq_dispatcher(void) __attribute__ ((naked)); +static void uart1_irq_dispatcher(void) +{ + IRQ_ENTRY(); + + if (US1_IMR & BV(US_RXRDY)) + uart1_irq_rx(); + + if (US1_IMR & BV(US_TXRDY)) + uart1_irq_tx(); + + IRQ_EXIT(); +}