diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-01-28 22:32:40 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-01-28 22:32:40 +0000 |
commit | 8475b8bf5337bcb83a2ef35d8d03e7fc33535689 (patch) | |
tree | a07b4f6ce62bbe8120023170fe112b48d496ac23 /nuttx/arch/dm320 | |
parent | a7fffa54ed01e92f3797af5707add81d8c9358cf (diff) | |
download | px4-nuttx-8475b8bf5337bcb83a2ef35d8d03e7fc33535689.tar.gz px4-nuttx-8475b8bf5337bcb83a2ef35d8d03e7fc33535689.tar.bz2 px4-nuttx-8475b8bf5337bcb83a2ef35d8d03e7fc33535689.zip |
UART config is untested
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@578 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/dm320')
-rw-r--r-- | nuttx/arch/dm320/src/up_internal.h | 2 | ||||
-rw-r--r-- | nuttx/arch/dm320/src/up_serial.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/nuttx/arch/dm320/src/up_internal.h b/nuttx/arch/dm320/src/up_internal.h index 6360d552b..16112d980 100644 --- a/nuttx/arch/dm320/src/up_internal.h +++ b/nuttx/arch/dm320/src/up_internal.h @@ -52,7 +52,7 @@ #undef CONFIG_SUPPRESS_INTERRUPTS /* Do not enable interrupts */ #undef CONFIG_SUPPRESS_TIMER_INTS /* No timer */ #undef CONFIG_SUPPRESS_SERIAL_INTS /* Console will poll */ -#undef CONFIG_SUPPRESS_UART_CONFIG /* Do not reconfig UART */ +#define CONFIG_SUPPRESS_UART_CONFIG 1 /* Do not reconfig UART */ #define CONFIG_DUMP_ON_EXIT 1 /* Dump task state on exit */ /************************************************************ diff --git a/nuttx/arch/dm320/src/up_serial.c b/nuttx/arch/dm320/src/up_serial.c index 3d7c09837..bf6560f1c 100644 --- a/nuttx/arch/dm320/src/up_serial.c +++ b/nuttx/arch/dm320/src/up_serial.c @@ -287,13 +287,13 @@ static int up_setup(struct uart_dev_s *dev) /* Clear fifos */ - up_serialout(priv, UART_DM320_RFCR, 0x8000); - up_serialout(priv, UART_DM320_TFCR, 0x8000); + up_serialout(priv, UART_RFCR, 0x8000); + up_serialout(priv, UART_TFCR, 0x8000); /* Set rx and tx triggers */ - up_serialout(priv, UART_DM320_RFCR, UART_RFCR_RTL_1); - up_serialout(priv, UART_DM320_TFCR, UART_TFCR_TTL_16); + up_serialout(priv, UART_RFCR, UART_RFCR_RTL_1); + up_serialout(priv, UART_TFCR, UART_TFCR_TTL_16); /* Set up the MSR */ @@ -331,7 +331,7 @@ static int up_setup(struct uart_dev_s *dev) /* Set up the BRSR */ - switch (dev->baud) + switch (priv->baud) { case 2400: brsr = UART_BAUD_2400; @@ -375,7 +375,7 @@ static int up_setup(struct uart_dev_s *dev) /* Setup the new UART configuration */ up_serialout(priv,UART_MSR, priv->msr); - up_serialout(priv, UART_DM320_BRSR, brsr); + up_serialout(priv, UART_BRSR, brsr); up_enablebreaks(priv, FALSE); #endif return OK; |