1 files changed, 22 insertions, 22 deletions

diff --git a/app/usart.c b/app/usart.c
index 26616da..b01f09f 100644
--- a/app/usart.c
+++ b/app/usart.c
@@ -4,17 +4,17 @@
 #define BIG_BUFFER_SIZE 600
 
 
-volatile ring_t rx2_ring;
-static uint8_t rx2_ring_buf[BUFFER_SIZE];
+volatile ring_t usart2_rx_ring;
+static uint8_t usart2_rx_ring_buf[BUFFER_SIZE];
 
-volatile ring_t tx2_ring;
-static uint8_t tx2_ring_buf[BUFFER_SIZE];
+volatile ring_t usart2_tx_ring;
+static uint8_t usart2_tx_ring_buf[BUFFER_SIZE];
 
-volatile ring_t rx1_ring;
-static uint8_t rx1_ring_buf[BUFFER_SIZE];
+volatile ring_t usart1_rx_ring;
+static uint8_t usart1_rx_ring_buf[BUFFER_SIZE];
 
-volatile ring_t tx1_ring;
-static uint8_t tx1_ring_buf[BUFFER_SIZE];
+volatile ring_t usart1_tx_ring;
+static uint8_t usart1_tx_ring_buf[BUFFER_SIZE];
 
 
 #define TX1   GPIO9
@@ -43,7 +43,7 @@ void usart2_isr (void)
     /* Retrieve the data from the peripheral. */
     data = usart_recv (USART2);
 
-    ring_write_byte (&rx2_ring, data);
+    ring_write_byte (&usart2_rx_ring, data);
     //usart6_queue(data);
   }
 
@@ -51,7 +51,7 @@ void usart2_isr (void)
   if (((USART_CR1 (USART2) & USART_CR1_TXEIE) != 0) &&
       ((USART_SR (USART2) & USART_SR_TXE) != 0)) {
 
-    if (ring_read_byte (&tx2_ring, &data)) {
+    if (ring_read_byte (&usart2_tx_ring, &data)) {
       /*No more data, Disable the TXE interrupt, it's no longer needed. */
       usart_disable_tx_interrupt (USART2);
     } else
@@ -63,14 +63,14 @@ void usart2_isr (void)
 void
 usart2_queue (uint8_t d)
 {
-  ring_write_byte (&tx2_ring, d);
+  ring_write_byte (&usart2_tx_ring, d);
   usart_enable_tx_interrupt (USART2);
 }
 
 void
 usart2_drain (void)
 {
-  while (!ring_empty (&tx2_ring));
+  while (!ring_empty (&usart2_tx_ring));
 }
 
 
@@ -79,7 +79,7 @@ usart2_write (char *ptr, int len, int blocking)
 {
   int ret;
 
-  ret = ring_write (&tx2_ring, (uint8_t *) ptr, len, blocking);
+  ret = ring_write (&usart2_tx_ring, (uint8_t *) ptr, len, blocking);
   usart_enable_tx_interrupt (USART2);
   return ret;
 }
@@ -97,14 +97,14 @@ void usart1_isr (void)
     /* Retrieve the data from the peripheral. */
     data = usart_recv (USART1);
 
-    ring_write_byte (&rx1_ring, data);
+    ring_write_byte (&usart1_rx_ring, data);
   }
 
   /* Check if we were called because of TXE. */
   if (((USART_CR1 (USART1) & USART_CR1_TXEIE) != 0) &&
       ((USART_SR (USART1) & USART_SR_TXE) != 0)) {
 
-    if (ring_read_byte (&tx1_ring, &data)) {
+    if (ring_read_byte (&usart1_tx_ring, &data)) {
       /*No more data, Disable the TXE interrupt, it's no longer needed. */
       usart_disable_tx_interrupt (USART1);
     } else
@@ -116,14 +116,14 @@ void usart1_isr (void)
 void
 usart1_queue (uint8_t d)
 {
-  ring_write_byte (&tx1_ring, d);
+  ring_write_byte (&usart1_tx_ring, d);
   usart_enable_tx_interrupt (USART1);
 }
 
 void
 usart1_drain (void)
 {
-  while (!ring_empty (&tx1_ring));
+  while (!ring_empty (&usart1_tx_ring));
 }
 
 
@@ -132,17 +132,17 @@ usart1_write (char *ptr, int len, int blocking)
 {
   int ret;
 
-  ret = ring_write (&tx1_ring, (uint8_t *) ptr, len, blocking);
+  ret = ring_write (&usart1_tx_ring, (uint8_t *) ptr, len, blocking);
   usart_enable_tx_interrupt (USART1);
   return ret;
 }
 
 void usart_rings_init (void)
 {
-  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 (&usart1_rx_ring, usart1_rx_ring_buf, sizeof (usart1_rx_ring_buf));
+  ring_init (&usart1_tx_ring, usart1_tx_ring_buf, sizeof (usart1_tx_ring_buf));
+  ring_init (&usart2_rx_ring, usart2_rx_ring_buf, sizeof (usart2_rx_ring_buf));
+  ring_init (&usart2_tx_ring, usart2_tx_ring_buf, sizeof (usart2_tx_ring_buf));
 }
 
 void