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/c5471 | |
| 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/c5471')
| -rw-r--r-- | nuttx/arch/c5471/src/up_internal.h | 2 | ||||
| -rw-r--r-- | nuttx/arch/c5471/src/up_serial.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/nuttx/arch/c5471/src/up_internal.h b/nuttx/arch/c5471/src/up_internal.h index c032fa543..fc3333bf9 100644 --- a/nuttx/arch/c5471/src/up_internal.h +++ b/nuttx/arch/c5471/src/up_internal.h @@ -60,7 +60,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 */ #undef CONFIG_DUMP_ON_EXIT /* Dump task state on exit */ /************************************************************ diff --git a/nuttx/arch/c5471/src/up_serial.c b/nuttx/arch/c5471/src/up_serial.c index 3cba4a2d8..7b2b9a24e 100644 --- a/nuttx/arch/c5471/src/up_serial.c +++ b/nuttx/arch/c5471/src/up_serial.c @@ -406,16 +406,18 @@ static int up_setup(struct uart_dev_s *dev) up_disablebreaks(priv); - priv->regs.fcr = (priv->regs.fcr & 0xffffffcf) | (val & 0x30); + /* Set the RX and TX trigger levels to the minimum */ + + priv->regs.fcr = (priv->regs.fcr & 0xffffffcf) | UART_FCR_FTL; up_serialout(priv, UART_RFCR_OFFS, priv->regs.fcr); - priv->regs.fcr = (priv->regs.fcr & 0xffffff3f) | (val & 0xc0); + priv->regs.fcr = (priv->regs.fcr & 0xffffff3f) | UART_FCR_FTL; up_serialout(priv, UART_RFCR_OFFS, priv->regs.fcr); up_setrate(priv, priv->baud); priv->regs.lcr &= 0xffffffe0; /* clear original field, and... */ - priv->regs.lcr |= (uint32)mode; /* Set new bits in that field. */ + priv->regs.lcr |= (uint32)cval; /* Set new bits in that field. */ up_serialout(priv, UART_LCR_OFFS, priv->regs.lcr); #ifdef CONFIG_UART_HWFLOWCONTROL |