diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-05-09 06:41:01 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-05-09 06:41:01 -0600 |
| commit | 56078d9f356c73497be755f6a912b7d2da6c66e8 (patch) | |
| tree | 2f0a640f8eea47472251fd63ff7a198d768b3fd8 | |
| parent | faa1f56b5d4ea2e756b8ab44563d1fb68f7595e1 (diff) | |
| download | nuttx-56078d9f356c73497be755f6a912b7d2da6c66e8.tar.gz nuttx-56078d9f356c73497be755f6a912b7d2da6c66e8.tar.bz2 nuttx-56078d9f356c73497be755f6a912b7d2da6c66e8.zip | |
Couple of fixes for the latest STM32 additions / modifications. These are simple fixes dealing with conditional compile based on CONFIG items not being set. From Ken Pettit
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_lowputc.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_serial.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_lowputc.c b/nuttx/arch/arm/src/stm32/stm32_lowputc.c index ba113bb49..8ace1d6e2 100644 --- a/nuttx/arch/arm/src/stm32/stm32_lowputc.c +++ b/nuttx/arch/arm/src/stm32/stm32_lowputc.c @@ -572,9 +572,11 @@ void stm32_lowsetup(void) uint32_t cr; #endif +#if defined(CONFIG_HAVE_CONSOLE) /* Enable USART APB1/2 clock */ modifyreg32(STM32_CONSOLE_APBREG, 0, STM32_CONSOLE_APBEN); +#endif /* Enable the console USART and configure GPIO pins needed for rx/tx. * diff --git a/nuttx/arch/arm/src/stm32/stm32_serial.c b/nuttx/arch/arm/src/stm32/stm32_serial.c index d5333de90..b37865402 100644 --- a/nuttx/arch/arm/src/stm32/stm32_serial.c +++ b/nuttx/arch/arm/src/stm32/stm32_serial.c @@ -390,8 +390,6 @@ static const struct uart_ops_s g_uart_ops = .rxavailable = up_rxavailable, #ifdef CONFIG_SERIAL_IFLOWCONTROL .rxflowcontrol = up_rxflowcontrol, -#else - .rxflowcontrol = NULL, #endif .send = up_send, .txint = up_txint, |