#include <io/arm.h>
-//#include "ser_at91.h"
+#include <cpu/attr.h>
#include <drv/ser.h>
#include <drv/ser_p.h>
#include <appconfig.h>
+#define SERIRQ_PRIORITY 4 ///< default priority for serial irqs.
/**
* \name Overridable serial bus hooks
/* 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); \
* - Enable both the receiver and the transmitter
* - Enable only the RX complete interrupt
*/
- #if CPU_ARM_AT91
- #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)
- /*#elif Add other ARM families here */
- #else
- #error Unknown CPU
+ #if !CPU_ARM_AT91SAM7S256
+ #warning Check USART0 pins!
#endif
+ #define SER_UART0_BUS_TXINIT do { \
+ PIOA_PDR = BV(RXD0) | BV(TXD0); \
+ 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
* Invoked to send one character.
*/
#define SER_UART0_BUS_TXCHAR(c) do { \
- US0_THR = c; \
+ US0_THR = (c); \
} while (0)
#endif
#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); \
#ifndef SER_UART1_BUS_TXINIT
/** \sa SER_UART1_BUS_TXINIT */
- #if CPU_ARM_AT91
- #define SER_UART1_BUS_TXINIT do { \
- PIOA_PDR = BV(0) | BV(1); \
- 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)
- /*#elif Add other ARM families here */
- #else
- #error Unknown CPU
+ #if !CPU_ARM_AT91SAM7S256
+ #warning Check USART1 pins!
#endif
-
+ #define SER_UART1_BUS_TXINIT do { \
+ PIOA_PDR = BV(RXD1) | BV(TXD1); \
+ 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
#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
struct Serial *ser_uart0 = &ser_handles[SER_UART0];
struct Serial *ser_uart1 = &ser_handles[SER_UART1];
-/**
- * Serial 0 TX interrupt handler
- */
-static void usart0_irq_tx(void)
-{
- SER_STROBE_ON;
-
- struct FIFOBuffer * const txfifo = &ser_uart0->txfifo;
-
- if (fifo_isempty(txfifo))
- {
- SER_UART0_BUS_TXEND;
- }
- else
- {
- char c = fifo_pop(txfifo);
-// kprintf("USART0 tx char: %c\n", c);
- SER_UART0_BUS_TXCHAR(c);
- }
-
- SER_STROBE_OFF;
-}
-
-/**
- * Serial 0 RX complete interrupt handler.
- */
-static void usart0_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
- {
-// kprintf("USART0 recv char: %c\n", c);
- 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))
- {
-// kprintf("IRQ RX USART0\n");
- usart0_irq_rx();
- }
- if (US0_IMR & BV(US_TXRDY))
- {
-// kprintf("IRQ TX USART0\n");
- usart0_irq_tx();
- }
- IRQ_EXIT();
-}
-
-/**
- * Serial 1 TX interrupt handler
- */
-static void usart1_irq_tx(void)
-{
- SER_STROBE_ON;
-
- struct FIFOBuffer * const txfifo = &ser_uart1->txfifo;
- if (fifo_isempty(txfifo))
- {
- SER_UART1_BUS_TXEND;
- }
- else
- {
- char c = fifo_pop(txfifo);
-// kprintf("USART1 tx char: %c\n", c);
- SER_UART1_BUS_TXCHAR(c);
- }
-
- SER_STROBE_OFF;
-}
-
-/**
- * Serial 1 RX complete interrupt handler.
- */
-static void usart1_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
- {
-// kprintf("USART1 recv char: %c\n", c);
- 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))
- {
-// kprintf("IRQ RX USART1\n");
- usart1_irq_rx();
- }
- if (US1_IMR & BV(US_TXRDY))
- {
-// kprintf("IRQ TX USART1\n");
- usart1_irq_tx();
- }
- IRQ_EXIT();
-}
+static void uart0_irq_dispatcher(void);
+static void uart1_irq_dispatcher(void);
/*
* Callbacks for USART0
*/
static void uart0_setparity(UNUSED_ARG(struct SerialHardware *, _hw), int parity)
{
+ US0_MR &= ~US_PAR_MASK;
/* Set UART parity */
switch(parity)
{
case SER_PARITY_NONE:
{
/* Parity mode. */
- US0_MR |= US_PAR_MASK;
+ US0_MR |= US_PAR_NO;
break;
}
case SER_PARITY_EVEN:
US0_MR |= US_PAR_ODD;
break;
}
+ default:
+ ASSERT(0);
}
}
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 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. */
- US1_MR |= US_PAR_MASK;
+ US1_MR |= US_PAR_NO;
break;
}
case SER_PARITY_EVEN:
US1_MR |= US_PAR_ODD;
break;
}
+ default:
+ ASSERT(0);
}
}
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),
};
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();
+}
projects / bertos.git / blobdiff