sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into ipv6

Browse Source
This commit is contained in:
Gregory Nutt 2015-01-19 10:37:14 -06:00
commit 54847c118f
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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).

8
arch/arm/src/stm32/stm32_serial.c
View File

@ -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;