termios: Update due to API changes

Termios notifies now the driver about an inactive transmit with the
length argument set to zero.

2 files changed, 30 insertions, 33 deletions

diff --git a/c/src/lib/libbsp/sparc/erc32/console/erc32_console.c b/c/src/lib/libbsp/sparc/erc32/console/erc32_console.c
index 08606957d4..2acc72f156 100644
--- a/c/src/lib/libbsp/sparc/erc32/console/erc32_console.c
+++ b/c/src/lib/libbsp/sparc/erc32/console/erc32_console.c
@@ -149,28 +149,28 @@ static int erc32_console_first_open(int major, int minor, void *arg)
 #if (CONSOLE_USE_INTERRUPTS)
 static ssize_t erc32_console_write_support_int(int minor, const char *buf, size_t len)
 {
-  console_data *cd = &Console_Port_Data[minor];
-  int k = 0;
+  if (len > 0) {
+    console_data *cd = &Console_Port_Data[minor];
+    int k = 0;
 
-  if (minor == 0) { /* uart a */
-    for (k = 0;
-         k < len && (ERC32_MEC.UART_Status & ERC32_MEC_UART_STATUS_THEA); k ++) {
-      ERC32_MEC.UART_Channel_A = (unsigned char)buf[k];
-    }
-    ERC32_Force_interrupt(ERC32_INTERRUPT_UART_A_RX_TX);
-  } else { /* uart b */
-    for (k = 0;
-         k < len && (ERC32_MEC.UART_Status & ERC32_MEC_UART_STATUS_THEB); k ++) {
-      ERC32_MEC.UART_Channel_B = (unsigned char)buf[k];
+    if (minor == 0) { /* uart a */
+      for (k = 0;
+           k < len && (ERC32_MEC.UART_Status & ERC32_MEC_UART_STATUS_THEA); k ++) {
+        ERC32_MEC.UART_Channel_A = (unsigned char)buf[k];
+      }
+      ERC32_Force_interrupt(ERC32_INTERRUPT_UART_A_RX_TX);
+    } else { /* uart b */
+      for (k = 0;
+           k < len && (ERC32_MEC.UART_Status & ERC32_MEC_UART_STATUS_THEB); k ++) {
+        ERC32_MEC.UART_Channel_B = (unsigned char)buf[k];
+      }
+      ERC32_Force_interrupt(ERC32_INTERRUPT_UART_B_RX_TX);
     }
-    ERC32_Force_interrupt(ERC32_INTERRUPT_UART_B_RX_TX);
-  }
-  
-  if (len > 0) {
+
     cd->pDeviceContext = (void *)k;
     cd->bActive = true;
   }
-  
+
   return 0;
 }
 
diff --git a/c/src/lib/libbsp/sparc/leon3/console/console.c b/c/src/lib/libbsp/sparc/leon3/console/console.c
index 3870685b50..566b0581f6 100644
--- a/c/src/lib/libbsp/sparc/leon3/console/console.c
+++ b/c/src/lib/libbsp/sparc/leon3/console/console.c
@@ -117,27 +117,24 @@ void console_isr(void *arg)
  */
 int console_write_interrupt(int minor, const char *buf, int len)
 {
-  struct apbuart_priv *uart;
-  unsigned int oldLevel;
-
-  if (minor == 0)
-    uart = &apbuarts[syscon_uart_index];
-  else
-    uart = &apbuarts[minor - 1];
+  if (len > 0) {
+    struct apbuart_priv *uart;
 
-  /* Remember what position in buffer */
+    if (minor == 0)
+      uart = &apbuarts[syscon_uart_index];
+    else
+      uart = &apbuarts[minor - 1];
 
-  rtems_interrupt_disable(oldLevel);
+    /* Remember what position in buffer */
 
-  /* Enable TX interrupt */
-  uart->regs->ctrl |= LEON_REG_UART_CTRL_TI;
+    /* Enable TX interrupt */
+    uart->regs->ctrl |= LEON_REG_UART_CTRL_TI;
 
-  /* start UART TX, this will result in an interrupt when done */
-  uart->regs->data = *buf;
+    /* start UART TX, this will result in an interrupt when done */
+    uart->regs->data = *buf;
 
-  uart->sending = 1;
-
-  rtems_interrupt_enable(oldLevel);
+    uart->sending = 1;
+  }
 
   return 0;
 }