Fix Kinetics UART watermark setting

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@3894 7fd9a85b-ad96-42d3-883c-3090e2eb8679

2 files changed, 7 insertions, 7 deletions

diff --git a/nuttx/arch/arm/src/kinetis/kinetis_lowputc.c b/nuttx/arch/arm/src/kinetis/kinetis_lowputc.c
index bf987b177d..5529443c37 100644
--- a/nuttx/arch/arm/src/kinetis/kinetis_lowputc.c
+++ b/nuttx/arch/arm/src/kinetis/kinetis_lowputc.c
@@ -424,10 +424,10 @@ void kinetis_uartconfigure(uintptr_t uart_base, uint32_t baud,
 
   putreg8(UART_PFIFO_RXFE | UART_PFIFO_TXFE, uart_base+KINETIS_UART_PFIFO_OFFSET);
 #else
-  /* Set the watermarks to zero and disable the FIFOs */
+  /* Set the watermarks to one and disable the FIFOs */
 
-  putreg8(0, uart_base+KINETIS_UART_RWFIFO_OFFSET);
-  putreg8(0, uart_base+KINETIS_UART_TWFIFO_OFFSET);
+  putreg8(1, uart_base+KINETIS_UART_RWFIFO_OFFSET);
+  putreg8(1, uart_base+KINETIS_UART_TWFIFO_OFFSET);
   putreg8(0, uart_base+KINETIS_UART_PFIFO_OFFSET);
 #endif
 
diff --git a/nuttx/arch/arm/src/kinetis/kinetis_serial.c b/nuttx/arch/arm/src/kinetis/kinetis_serial.c
index 0cb2d89e14..1e98b722fe 100644
--- a/nuttx/arch/arm/src/kinetis/kinetis_serial.c
+++ b/nuttx/arch/arm/src/kinetis/kinetis_serial.c
@@ -682,7 +682,7 @@ static int up_attach(struct uart_dev_s *dev)
     }
 #endif
 
-  if (ret == 0)
+  if (ret == OK)
     {
 #ifdef CONFIG_DEBUG
       up_enable_irq(priv->irqe);
@@ -1300,9 +1300,9 @@ int up_putc(int ch)
 {
 #ifdef HAVE_SERIAL_CONSOLE
   struct up_dev_s *priv = (struct up_dev_s*)CONSOLE_DEV.priv;
-  uint8_t imr;
+  uint8_t ie;
 
-  up_disableuartint(priv, &imr);
+  up_disableuartint(priv, &ie);
 
   /* Check for LF */
 
@@ -1314,7 +1314,7 @@ int up_putc(int ch)
     }
 
   up_lowputc(ch);
-  up_restoreuartint(priv, imr);
+  up_restoreuartint(priv, ie);
 #endif
   return ch;
 }