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

Merged in raiden00/nuttx_h7 (pull request #904)

Browse Source 
stm32g0: Fix error when SINGLEWIRE or SERIALBRK_BSDCOMPAT defined (it reflects changes in STM32H7)

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
raiden00pl 2019-06-16 17:34:09 +00:00 committed by Gregory Nutt
parent 817652c2ed
commit cad6325589
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm/src/stm32f0l0g0/stm32_serial_v2.c
View File

@ -1106,11 +1106,14 @@ static int up_interrupt(int irq, void *context, FAR void *arg)
static int up_ioctl(struct file *filep, int cmd, unsigned long arg) static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
{ {
#if defined(CONFIG_SERIAL_TERMIOS) || defined(CONFIG_SERIAL_TIOCSERGSTRUCT) \ #if defined(CONFIG_SERIAL_TERMIOS) || defined(CONFIG_SERIAL_TIOCSERGSTRUCT) \
|| defined(CONFIG_STM32F0L0G0_USART_SINGLEWIRE) \
|| defined(CONFIG_STM32F0L0G0_SERIALBRK_BSDCOMPAT) || defined(CONFIG_STM32F0L0G0_SERIALBRK_BSDCOMPAT)
struct inode *inode = filep->f_inode; struct inode *inode = filep->f_inode;
struct uart_dev_s *dev = inode->i_private; struct uart_dev_s *dev = inode->i_private;
#endif #endif
#if defined(CONFIG_SERIAL_TERMIOS) || defined(CONFIG_STM32F0L0G0_SERIALBRK_BSDCOMPAT) #if defined(CONFIG_SERIAL_TERMIOS) \
|| defined(CONFIG_STM32F0L0G0_USART_SINGLEWIRE) \
|| defined(CONFIG_STM32F0L0G0_SERIALBRK_BSDCOMPAT)
struct up_dev_s *priv = (struct up_dev_s *)dev->priv; struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
#endif #endif
int ret = OK; int ret = OK;
@ -1325,21 +1328,12 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
flags = enter_critical_section(); flags = enter_critical_section();
cr1 = up_serialin(priv, STM32_USART_CR1_OFFSET); cr1 = up_serialin(priv, STM32_USART_CR1_OFFSET);
up_serialout(priv, STM32_USART_CR1_OFFSET, cr1 | USART_CR1_SBK); up_serialout(priv, STM32_USART_RQR_OFFSET, cr1 | USART_RQR_SBKRQ);
leave_critical_section(flags); leave_critical_section(flags);
} }
break; break;
case TIOCCBRK: /* No BSD compatibility: May turn off break too soon */ case TIOCCBRK: /* No BSD compatibility: HW does not support stopping a break */
{
uint32_t cr1;
irqstate_t flags;
flags = enter_critical_section();
cr1 = up_serialin(priv, STM32_USART_CR1_OFFSET);
up_serialout(priv, STM32_USART_CR1_OFFSET, cr1 & ~USART_CR1_SBK);
leave_critical_section(flags);
}
break; break;
# endif # endif
#endif #endif