tidy up

1 files changed, 130 insertions, 26 deletions

diff --git a/app/usart.c b/app/usart.c
index 273c3bc..4061076 100644
--- a/app/usart.c
+++ b/app/usart.c
@@ -2,11 +2,20 @@
 
 #define BUFFER_SIZE 256
 
-ring_t rx_ring;
-static uint8_t rx_ring_buf[BUFFER_SIZE];
+ring_t rx1_ring;
+static uint8_t rx1_ring_buf[BUFFER_SIZE];
 
-ring_t tx_ring;
-static uint8_t tx_ring_buf[BUFFER_SIZE];
+ring_t tx1_ring;
+static uint8_t tx1_ring_buf[BUFFER_SIZE];
+
+ring_t rx2_ring;
+static uint8_t rx2_ring_buf[BUFFER_SIZE];
+
+ring_t tx2_ring;
+static uint8_t tx2_ring_buf[BUFFER_SIZE];
+
+ring_t tx3_ring;
+static uint8_t tx3_ring_buf[BUFFER_SIZE];
 
 void
 usart1_isr (void)
@@ -21,7 +30,8 @@ usart1_isr (void)
       /* Retrieve the data from the peripheral. */
       data = usart_recv (USART1);
 
-      ring_write_byte(&rx_ring,data);
+
+      ring_write_byte(&rx1_ring,data);
     }
 
   /* Check if we were called because of TXE. */
@@ -29,7 +39,7 @@ usart1_isr (void)
       ((USART_SR (USART1) & USART_SR_TXE) != 0))
     {
 
-      if (ring_read_byte (&tx_ring, &data))
+      if (ring_read_byte (&tx1_ring, &data))
         {
           /*No more data, Disable the TXE interrupt, it's no longer needed. */
           USART_CR1 (USART1) &= ~USART_CR1_TXEIE;
@@ -42,6 +52,64 @@ usart1_isr (void)
 
 }
 
+void
+usart2_isr (void)
+{
+  uint8_t data;
+
+  /* Check if we were called because of RXNE. */
+  if (((USART_CR1 (USART2) & USART_CR1_RXNEIE) != 0) &&
+      ((USART_SR (USART2) & USART_SR_RXNE) != 0))
+    {
+
+      /* Retrieve the data from the peripheral. */
+      data = usart_recv (USART2);
+
+      ring_write_byte(&rx2_ring,data);
+    }
+
+  /* Check if we were called because of TXE. */
+  if (((USART_CR1 (USART2) & USART_CR1_TXEIE) != 0) &&
+      ((USART_SR (USART2) & USART_SR_TXE) != 0))
+    {
+
+      if (ring_read_byte (&tx2_ring, &data))
+        {
+          /*No more data, Disable the TXE interrupt, it's no longer needed. */
+          USART_CR1 (USART2) &= ~USART_CR1_TXEIE;
+        }
+      else
+        {
+          usart_send_blocking (USART2, data);
+        }
+    }
+
+}
+
+void
+usart3_isr (void)
+{
+  uint8_t data;
+
+  /* Check if we were called because of TXE. */
+  if (((USART_CR1 (USART3) & USART_CR1_TXEIE) != 0) &&
+      ((USART_SR (USART3) & USART_SR_TXE) != 0))
+    {
+
+      if (ring_read_byte (&tx3_ring, &data))
+        {
+          /*No more data, Disable the TXE interrupt, it's no longer needed. */
+          USART_CR1 (USART3) &= ~USART_CR1_TXEIE;
+        }
+      else
+        {
+          usart_send (USART3, data);
+        }
+    }
+
+}
+
+
 int
 _write (int file, char *ptr, int len)
 {
@@ -49,7 +117,7 @@ _write (int file, char *ptr, int len)
 
   if (file == 1)
     {
-      ret = ring_write (&tx_ring, (uint8_t *) ptr, len);
+      ret = ring_write (&tx1_ring, (uint8_t *) ptr, len);
 
       if (ret < 0)
         ret = -ret;
@@ -63,37 +131,53 @@ _write (int file, char *ptr, int len)
 }
 
 void
-usart_queue (uint8_t d)
+usart2_queue (uint8_t d)
 {
+  ring_write_byte (&tx2_ring, d);
+  USART_CR1 (USART2) |= USART_CR1_TXEIE;
+}
 
-  ring_write_byte (&tx_ring, d);
-  USART_CR1 (USART1) |= USART_CR1_TXEIE;
 
-#if 0
-  printf ("0x%02x ", d);
-  fflush (stdout);
-#endif
+void
+usart3_queue (uint8_t d)
+{
+  ring_write_byte (&tx3_ring, d);
+  USART_CR1 (USART3) |= USART_CR1_TXEIE;
 }
 
 
 void
 usart_init (void)
 {
-  ring_init (&tx_ring, tx_ring_buf, sizeof (tx_ring_buf));
-  ring_init (&rx_ring, rx_ring_buf, sizeof (rx_ring_buf));
+  ring_init (&rx1_ring, rx1_ring_buf, sizeof (rx1_ring_buf));
+  ring_init (&tx1_ring, tx1_ring_buf, sizeof (tx1_ring_buf));
+
+  ring_init (&rx2_ring, rx2_ring_buf, sizeof (rx2_ring_buf));
+  ring_init (&tx2_ring, tx2_ring_buf, sizeof (tx2_ring_buf));
+
+  ring_init (&tx3_ring, tx3_ring_buf, sizeof (tx3_ring_buf));
 
-  /* Enable the USART1 interrupt. */
+
+  /* Enable the USART1,2,3 interrupt. */
   nvic_enable_irq (NVIC_USART1_IRQ);
+  nvic_enable_irq (NVIC_USART2_IRQ);
+  nvic_enable_irq (NVIC_USART3_IRQ);
+
+  /* Map pins, and set usarts2 and 3 to have pull ups*/
+  gpio_set_mode (GPIOA, GPIO_MODE_OUTPUT_50_MHZ, GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX);
+  gpio_set_mode (GPIOA, GPIO_MODE_INPUT, GPIO_CNF_INPUT_FLOAT, GPIO_USART1_RX);
+
+  gpio_set_mode (GPIOA, GPIO_MODE_OUTPUT_50_MHZ, GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART2_TX);
+  gpio_set_mode (GPIOA, GPIO_MODE_INPUT, GPIO_CNF_INPUT_PULL_UPDOWN, GPIO_USART2_RX);
+  gpio_set(GPIOA, GPIO_USART2_RX);
+
+  gpio_set_mode (GPIOB, GPIO_MODE_OUTPUT_50_MHZ, GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART3_TX);
+  gpio_set_mode (GPIOB, GPIO_MODE_INPUT, GPIO_CNF_INPUT_PULL_UPDOWN, GPIO_USART3_RX);
+  gpio_set(GPIOB, GPIO_USART3_RX);
 
-  /* Setup GPIO pin GPIO_USART1_RE_TX on GPIO port B for transmit. */
-  gpio_set_mode (GPIOA, GPIO_MODE_OUTPUT_50_MHZ,
-                 GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX);
 
-  /* Setup GPIO pin GPIO_USART1_RE_RX on GPIO port B for receive. */
-  gpio_set_mode (GPIOA, GPIO_MODE_INPUT,
-                 GPIO_CNF_INPUT_FLOAT, GPIO_USART1_RX);
 
-  /* Setup UART parameters. */
+  /* Setup UART1 parameters. */
   usart_set_baudrate (USART1, 38400);
   usart_set_databits (USART1, 8);
   usart_set_stopbits (USART1, USART_STOPBITS_1);
@@ -101,9 +185,29 @@ usart_init (void)
   usart_set_flow_control (USART1, USART_FLOWCONTROL_NONE);
   usart_set_mode (USART1, USART_MODE_TX_RX);
 
-  /* Enable USART1 Receive interrupt. */
+  /* Setup UART2 parameters. */
+  usart_set_baudrate (USART2, 38400);
+  usart_set_databits (USART2, 8);
+  usart_set_stopbits (USART2, USART_STOPBITS_1);
+  usart_set_parity (USART2, USART_PARITY_NONE);
+  usart_set_flow_control (USART2, USART_FLOWCONTROL_NONE);
+  usart_set_mode (USART2, USART_MODE_TX_RX);
+
+
+  /* Setup UART3 parameters. */
+  usart_set_baudrate (USART3, 38400);
+  usart_set_databits (USART3, 8);
+  usart_set_stopbits (USART3, USART_STOPBITS_1);
+  usart_set_parity (USART3, USART_PARITY_NONE);
+  usart_set_flow_control (USART3, USART_FLOWCONTROL_NONE);
+  usart_set_mode (USART3, USART_MODE_TX_RX);
+
+  /* Enable USART1,2 Receive interrupt. */
   USART_CR1 (USART1) |= USART_CR1_RXNEIE;
+  USART_CR1 (USART2) |= USART_CR1_RXNEIE;
 
-  /* Finally enable the USART. */
+  /* Finally enable the USARTs. */
   usart_enable (USART1);
+  usart_enable (USART2);
+  usart_enable (USART3);
 }