From f8671a7ab4ce7fc927d4b6baf83c13720ded84dd Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sat, 26 Apr 2014 08:23:11 -0600
Subject: [PATCH] Zneo Serial: Fix cut'n'paste error in some conditional
configuration
---
arch/z16/src/z16f/z16f_serial.c | 13 ++++++++-----
configs/z16f2800100zcog/README.txt | 31 +++++++++++++++++++++++++++++-
2 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/arch/z16/src/z16f/z16f_serial.c b/arch/z16/src/z16f/z16f_serial.c
index 58b847ae81..ee9ddee038 100644
--- a/arch/z16/src/z16f/z16f_serial.c
+++ b/arch/z16/src/z16f/z16f_serial.c
@@ -255,10 +255,10 @@ static uart_dev_t g_uart1port =
# define UART1_ASSIGNED 1
#else
# undef CONSOLE_DEV /* No console */
-# if defined(CONFIG_KINETIS_UART0)
+# if defined(CONFIG_Z16F_UART0)
# define TTYS0_DEV g_uart0port /* UART0 is ttyS0 */
# define UART0_ASSIGNED 1
-# elif defined(CONFIG_KINETIS_UART1)
+# elif defined(CONFIG_Z16F_UART1)
# define TTYS0_DEV g_uart1port /* UART1 is ttyS0 */
# define UART1_ASSIGNED 1
# endif
@@ -266,10 +266,10 @@ static uart_dev_t g_uart1port =
/* Pick ttys1. This could be either of UART0-1 excluding the console UART. */
-#if defined(CONFIG_KINETIS_UART0) && !defined(UART0_ASSIGNED)
+#if defined(CONFIG_Z16F_UART0) && !defined(UART0_ASSIGNED)
# define TTYS1_DEV g_uart0port /* UART0 is ttyS1 */
# define UART0_ASSIGNED 1
-#elif defined(CONFIG_KINETIS_UART1) && !defined(UART1_ASSIGNED)
+#elif defined(CONFIG_Z16F_UART1) && !defined(UART1_ASSIGNED)
# define TTYS1_DEV g_uart1port /* UART1 is ttyS1 */
# define UART1_ASSIGNED 1
#endif
@@ -781,7 +781,10 @@ int up_putc(int ch)
uint8_t state;
/* Keep interrupts disabled so that we do not interfere with normal
- * driver operation
+ * driver operation.
+ *
+ * REVISIT: I can imagine scenarios where the follow logic gets pre-empted
+ * and the the UART interrupts get left in a bad state.
*/
state = z16f_disableuartirq(&CONSOLE_DEV);
diff --git a/configs/z16f2800100zcog/README.txt b/configs/z16f2800100zcog/README.txt
index a9fb474373..618855223b 100644
--- a/configs/z16f2800100zcog/README.txt
+++ b/configs/z16f2800100zcog/README.txt
@@ -3,6 +3,21 @@ README.txt
This is the README file for the NuttX port to the ZiLog ZNEO MCU.
+- Console output is on UART0.
+
+- NOTE: My board has a 20MHz crystal, but I have heard of other boards with
+ 18.432MHz crystals. If you board has a diff crystal installed, then
+ modify the system frequency in include/board.h.
+
+Contents
+========
+
+ - ZDS-II Compiler Versions
+ - Patches
+ - Serial Console
+ - Selecting Configurations
+ - Configuration Sub-directories
+
ZDS-II Compiler Versions
========================
@@ -91,6 +106,20 @@ The patch can also be removed with:
See the section "Selecting Configurations" below.
+Serial Console
+==============
+
+By default, console output is on UART1 which corresponds to the DB9
+connector labelled CONSOLE.
+
+UART1 is also available on JP2:
+
+ MCU PIN GPIO JP2
+ Pin 86 TXD1 PD5 JP2 Pin 25
+ Pin 87 RXD1 PD4 JP2 Pin 25
+ Vcc JP2 Pin 59
+ GND JP2 Pins 19, 39, 46, 48, 56
+
Selecting Configurations
========================
@@ -208,7 +237,7 @@ ostest
c. At present, the native Windows build fails at the final link stages.
The failure is due to problems in arch/z16/src/nuttx.linkcmd that
is autogenerated by arch/z16/src/Makefile. The basic problem
- is the spurious spaces and and carrirage returns are generated at
+ is the spurious spaces and and carriage returns are generated at
the end of the lines after a line continuation (\ ^M). If these
trailing bad characters are manually eliminated, then the build
will succeed on the next try.