diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-12-26 12:41:35 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-12-26 12:41:35 -0600 |
| commit | 351eeaf474338872c4e07c215ab12ca45e0b82bb (patch) | |
| tree | 06f4a3f5d4628d0bc2c78c79a7dccc1c57bbe38a | |
| parent | cc1271ae10f6fc3b784a060b53765a49164cbc4d (diff) | |
| download | nuttx-351eeaf474338872c4e07c215ab12ca45e0b82bb.tar.gz nuttx-351eeaf474338872c4e07c215ab12ca45e0b82bb.tar.bz2 nuttx-351eeaf474338872c4e07c215ab12ca45e0b82bb.zip | |
STM32: Fix some incorrectly placed conditional logic
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_serial.c | 7 | ||||
| -rw-r--r-- | nuttx/drivers/mtd/ramtron.c | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_serial.c b/nuttx/arch/arm/src/stm32/stm32_serial.c index f1c6644f9..8a7ed0964 100644 --- a/nuttx/arch/arm/src/stm32/stm32_serial.c +++ b/nuttx/arch/arm/src/stm32/stm32_serial.c @@ -2610,14 +2610,13 @@ void up_serialinit(void) (void)uart_register("/dev/ttyS0", &uart_devs[CONSOLE_UART - 1]->dev); minor = 1; +#endif +#ifdef SERIAL_HAVE_CONSOLE_DMA /* If we need to re-initialise the console to enable DMA do that here. */ -# ifdef SERIAL_HAVE_CONSOLE_DMA up_dma_setup(&uart_devs[CONSOLE_UART - 1]->dev); -# endif -#endif /* CONFIG_SERIAL_DISABLE_REORDERING not defined */ - +#endif #endif /* CONSOLE_UART > 0 */ /* Register all remaining USARTs */ diff --git a/nuttx/drivers/mtd/ramtron.c b/nuttx/drivers/mtd/ramtron.c index 16e8898a4..3c83ce044 100644 --- a/nuttx/drivers/mtd/ramtron.c +++ b/nuttx/drivers/mtd/ramtron.c @@ -535,7 +535,7 @@ static inline int ramtron_pagewrite(struct ramtron_dev_s *priv, FAR const uint8_ #ifdef RAMTRON_WRITEWAIT /* Wait for write completion now so we can report any errors to the caller. Thus - * the caller will know weather or not if the data is on stable storage + * the caller will know whether or not if the data is on stable storage */ return ramtron_waitwritecomplete(priv); @@ -550,7 +550,7 @@ static inline int ramtron_pagewrite(struct ramtron_dev_s *priv, FAR const uint8_ static int ramtron_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblocks) { - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + fvdbg("startblock: %08lx nblocks: %d\n", (unsigned long)startblock, (int)nblocks); fvdbg("On RAMTRON devices erasing makes no sense, returning as OK\n"); return (int)nblocks; } |