diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-01-19 10:37:14 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-01-19 10:37:14 -0600 |
| commit | cab1ffb52e219faa226e9d82ef3687a17797cba5 (patch) | |
| tree | 872aefb56260644d3a19e58ec48e7e8539cc92ad | |
| parent | 7541c150625509c6fe3188fe12c8fdf4c5a4d5c1 (diff) | |
| parent | bbb76ff75298bbd20ea2270fe77c846dbf196a9c (diff) | |
| download | nuttx-cab1ffb52e219faa226e9d82ef3687a17797cba5.tar.gz nuttx-cab1ffb52e219faa226e9d82ef3687a17797cba5.tar.bz2 nuttx-cab1ffb52e219faa226e9d82ef3687a17797cba5.zip | |
Merge remote-tracking branch 'origin/master' into ipv6
| -rwxr-xr-x | nuttx/ChangeLog | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_serial.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index a666e4e5a..3fc694686 100755 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -9465,4 +9465,8 @@ * arch/arm/src/tiva/tm4c_ethernet.c: When calling into the stack from the worker thread, it is necessary to have the stack locked (2015-01-18). + * nuttx/arch/arm/src/stm32/stm32_serial.c: fix declaration and + definition of up_receive() and up_dma_receive() to match fields of + uart_ops_s from nuttx/include/nuttx/serial/serial.h. From Freddie + Chopin (2015-01-19). diff --git a/nuttx/arch/arm/src/stm32/stm32_serial.c b/nuttx/arch/arm/src/stm32/stm32_serial.c index d0f80f7ce..19a1cf01b 100644 --- a/nuttx/arch/arm/src/stm32/stm32_serial.c +++ b/nuttx/arch/arm/src/stm32/stm32_serial.c @@ -322,7 +322,7 @@ static void up_detach(struct uart_dev_s *dev); static int up_interrupt_common(struct up_dev_s *dev); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); #ifndef SERIAL_HAVE_ONLY_DMA -static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); static bool up_rxavailable(struct uart_dev_s *dev); #endif @@ -337,7 +337,7 @@ static bool up_txready(struct uart_dev_s *dev); #ifdef SERIAL_HAVE_DMA static int up_dma_setup(struct uart_dev_s *dev); static void up_dma_shutdown(struct uart_dev_s *dev); -static int up_dma_receive(struct uart_dev_s *dev, uint32_t *status); +static int up_dma_receive(struct uart_dev_s *dev, unsigned int *status); static void up_dma_rxint(struct uart_dev_s *dev, bool enable); static bool up_dma_rxavailable(struct uart_dev_s *dev); @@ -2047,7 +2047,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) ****************************************************************************/ #ifndef SERIAL_HAVE_ONLY_DMA -static int up_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { struct up_dev_s *priv = (struct up_dev_s *)dev->priv; uint32_t rdr; @@ -2234,7 +2234,7 @@ static bool up_rxflowcontrol(struct uart_dev_s *dev, ****************************************************************************/ #ifdef SERIAL_HAVE_DMA -static int up_dma_receive(struct uart_dev_s *dev, uint32_t *status) +static int up_dma_receive(struct uart_dev_s *dev, unsigned int *status) { struct up_dev_s *priv = (struct up_dev_s *)dev->priv; int c = 0; |