diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-04-26 08:23:11 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-04-26 08:23:11 -0600 |
| commit | e21999101a78864ef2eb5984d12c0cefca427b4b (patch) | |
| tree | e21c54f4432e0c32a9858fbbecb52cf021ca9497 /nuttx/arch/z16 | |
| parent | ec8c32f99f5639dbd7b58a03cc4be561d61d1a1a (diff) | |
| download | nuttx-e21999101a78864ef2eb5984d12c0cefca427b4b.tar.gz nuttx-e21999101a78864ef2eb5984d12c0cefca427b4b.tar.bz2 nuttx-e21999101a78864ef2eb5984d12c0cefca427b4b.zip | |
Zneo Serial: Fix cut'n'paste error in some conditional configuration
Diffstat (limited to 'nuttx/arch/z16')
| -rw-r--r-- | nuttx/arch/z16/src/z16f/z16f_serial.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/nuttx/arch/z16/src/z16f/z16f_serial.c b/nuttx/arch/z16/src/z16f/z16f_serial.c index 58b847ae8..ee9ddee03 100644 --- a/nuttx/arch/z16/src/z16f/z16f_serial.c +++ b/nuttx/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); |