summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-04-26 10:51:29 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-04-26 10:51:29 -0600
commit60df8151c8f84ca7372de7fb5e3e290332879279 (patch)
tree1fb8e536ba3d315d3ff581bb17761efe65f0d386
parente79358bac151b886e0ff79312990868f166dd953 (diff)
downloadnuttx-60df8151c8f84ca7372de7fb5e3e290332879279.tar.gz
nuttx-60df8151c8f84ca7372de7fb5e3e290332879279.tar.bz2
nuttx-60df8151c8f84ca7372de7fb5e3e290332879279.zip
Zneo: Fix UART1 buffer setup
-rw-r--r--nuttx/arch/z16/src/z16f/z16f_serial.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/nuttx/arch/z16/src/z16f/z16f_serial.c b/nuttx/arch/z16/src/z16f/z16f_serial.c
index 6cc83949e..8dca7d03b 100644
--- a/nuttx/arch/z16/src/z16f/z16f_serial.c
+++ b/nuttx/arch/z16/src/z16f/z16f_serial.c
@@ -225,8 +225,8 @@ static uart_dev_t g_uart1port =
{ 0 }, /* recv.sem */
0, /* recv.head */
0, /* recv.tail */
- CONFIG_UART0_RXBUFSIZE, /* recv.size */
- g_uart0rxbuffer, /* recv.buffer */
+ CONFIG_UART1_RXBUFSIZE, /* recv.size */
+ g_uart1rxbuffer, /* recv.buffer */
},
&g_uart_ops, /* ops */
&g_uart1priv, /* priv */
@@ -353,7 +353,7 @@ static int z16f_setup(struct uart_dev_s *dev)
* BRG = (freq + baud * 8)/(baud * 16)
*/
- brg = (_DEFCLK + (priv->baud << 3))/(priv->baud << 4);
+ brg = (_DEFCLK + (priv->baud << 3)) / (priv->baud << 4);
putreg16((uint16_t)brg, priv->uartbase + Z16F_UART_BR);
/* Configure STOP bits */
@@ -736,7 +736,9 @@ void up_earlyserialinit(void)
{
uint8_t regval;
- /* Configure UART alternate pin functions */
+ /* Configure UART alternate pin functions. This may duplicate logic in
+ * z16f_lowuartinit().
+ */
#ifdef CONFIG_Z16F_UART0
/* UART0 is PA4 and PA5, alternate function 1 */