diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-07-04 22:38:45 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-07-04 22:38:45 +0000 |
| commit | 27654586d00c4fb566ce1f218d52bd1f0282a6cd (patch) | |
| tree | 8081c21f09fa32ac906c1b0a07b51c85d4c0b4ea /nuttx/arch/arm/src/stm32/stm32_serial.c | |
| parent | 935109930f10485e622386010fe03e0ef0e34497 (diff) | |
| download | px4-nuttx-27654586d00c4fb566ce1f218d52bd1f0282a6cd.tar.gz px4-nuttx-27654586d00c4fb566ce1f218d52bd1f0282a6cd.tar.bz2 px4-nuttx-27654586d00c4fb566ce1f218d52bd1f0282a6cd.zip | |
Correct several errors in STM32 serial port configuration
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3744 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/stm32/stm32_serial.c')
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_serial.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_serial.c b/nuttx/arch/arm/src/stm32/stm32_serial.c index a529285f4..7255ef491 100644 --- a/nuttx/arch/arm/src/stm32/stm32_serial.c +++ b/nuttx/arch/arm/src/stm32/stm32_serial.c @@ -425,8 +425,8 @@ static inline void up_disableusartint(struct up_dev_s *priv, uint16_t *ie) static int up_setup(struct uart_dev_s *dev) { struct up_dev_s *priv = (struct up_dev_s*)dev->priv; -#ifdef CONFIG_SUPPRESS_UART_CONFIG - uint32_t uartdiv32; +#ifndef CONFIG_SUPPRESS_UART_CONFIG + uint32_t usartdiv32; uint32_t mantissa; uint32_t fraction; uint32_t brr; @@ -483,7 +483,7 @@ static int up_setup(struct uart_dev_s *dev) /* Configure hardware flow control -- Not yet supported */ - up_serialout(priv, STM32_USART_CR1_OFFSET, regval); + up_serialout(priv, STM32_USART_CR3_OFFSET, regval); /* Configure the USART Baud Rate. The baud rate for the receiver and * transmitter (Rx and Tx) are both set to the same value as programmed @@ -521,7 +521,7 @@ static int up_setup(struct uart_dev_s *dev) up_serialout(priv, STM32_USART_CR1_OFFSET, regval); #endif - /* Set up the cache interrupt enables value */ + /* Set up the cached interrupt enables value */ priv->ie = 0; return OK; |