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

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

Browse Source
This commit is contained in:
Gregory Nutt 2015-01-19 06:42:27 -06:00
parent 8cf9150b15
commit e2aad9c05a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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_interrupt_common(struct up_dev_s *dev);
static int up_ioctl(struct file *filep, int cmd, unsigned long arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg);
#ifndef SERIAL_HAVE_ONLY_DMA #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 void up_rxint(struct uart_dev_s *dev, bool enable);
static bool up_rxavailable(struct uart_dev_s *dev); static bool up_rxavailable(struct uart_dev_s *dev);
#endif #endif
@ -337,7 +337,7 @@ static bool up_txready(struct uart_dev_s *dev);
#ifdef SERIAL_HAVE_DMA #ifdef SERIAL_HAVE_DMA
static int up_dma_setup(struct uart_dev_s *dev); static int up_dma_setup(struct uart_dev_s *dev);
static void up_dma_shutdown(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 void up_dma_rxint(struct uart_dev_s *dev, bool enable);
static bool up_dma_rxavailable(struct uart_dev_s *dev); 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 #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; struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
uint32_t rdr; uint32_t rdr;
@ -2234,7 +2234,7 @@ static bool up_rxflowcontrol(struct uart_dev_s *dev,
****************************************************************************/ ****************************************************************************/
#ifdef SERIAL_HAVE_DMA #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; struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
int c = 0; int c = 0;