Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-28 20:08:15 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

CDC/AC: too man right parentheses if IFLOW_CONTROL enabled

Browse Source
This commit is contained in:
Gregory Nutt
2016-02-24 11:54:02 -06:00
parent d0c09771db
commit b6f5ffa9a8
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs
+1 -1
Submodule configs updated: 521652bd7f...b5ee355239
drivers/usbhost/usbhost_cdcacm.c
+4 -4
View File
@@ -249,7 +249,7 @@ struct usbhost_cdcacm_s
bool rxena; /* True: RX "interrupts" enabled */ bool rxena; /* True: RX "interrupts" enabled */
#ifdef CONFIG_SERIAL_IFLOWCONTROL #ifdef CONFIG_SERIAL_IFLOWCONTROL
bool iflow; /* True: Input flow control (RTS) enabled */ bool iflow; /* True: Input flow control (RTS) enabled */
bool rts; /* True: Input flow control is effect */ bool rts; /* True: Input flow control is in effect */
#endif #endif
#ifdef CONFIG_SERIAL_OFLOWCONTROL #ifdef CONFIG_SERIAL_OFLOWCONTROL
bool oflow; /* True: Output flow control (CTS) enabled */ bool oflow; /* True: Output flow control (CTS) enabled */
@@ -2562,7 +2562,7 @@ static void usbhost_rxint(FAR struct uart_dev_s *uartdev, bool enable)
*/ */
#ifdef CONFIG_SERIAL_IFLOWCONTROL #ifdef CONFIG_SERIAL_IFLOWCONTROL
if (priv->rts)) if (priv->rts)
#endif #endif
{ {
ret = work_queue(LPWORK, &priv->rxwork, ret = work_queue(LPWORK, &priv->rxwork,
@@ -2654,7 +2654,7 @@ static bool usbhost_rxflowcontrol(FAR struct uart_dev_s *uartdev,
* RTS. * RTS.
*/ */
priv ->rts = false; priv->rts = false;
/* Cancel any pending RX data reception work */ /* Cancel any pending RX data reception work */
@@ -2668,7 +2668,7 @@ static bool usbhost_rxflowcontrol(FAR struct uart_dev_s *uartdev,
* RTS. * RTS.
*/ */
priv ->rts = true; priv->rts = true;
/* Restart RX data reception work flow unless RX reception is /* Restart RX data reception work flow unless RX reception is
* disabled. * disabled.
fs/fat/Kconfig
+9
View File
@@ -97,6 +97,9 @@ config FAT_FORCE_INDIRECT
N N N User memory can always be used for N N N User memory can always be used for
transfer. transfer.
* CONFIG_DIRECT_RETRY cannot be selected with CONFIG_FORCE_INDIRECT
** CONFIG_DIRECT_RETRY is automatically selected with CONFIG_DMA_MEMORY
config FAT_DMAMEMORY config FAT_DMAMEMORY
bool "DMA memory allocator" bool "DMA memory allocator"
default n default n
@@ -129,6 +132,9 @@ config FAT_DMAMEMORY
N N N User memory can always be used for N N N User memory can always be used for
transfer. transfer.
* CONFIG_DIRECT_RETRY cannot be selected with CONFIG_FORCE_INDIRECT
** CONFIG_DIRECT_RETRY is automatically selected with CONFIG_DMA_MEMORY
config FAT_DIRECT_RETRY config FAT_DIRECT_RETRY
bool "Direct transfer retry" bool "Direct transfer retry"
default y if FAT_DMAMEMORY default y if FAT_DMAMEMORY
@@ -171,4 +177,7 @@ config FAT_DIRECT_RETRY
N N N User memory can always be used for N N N User memory can always be used for
transfer. transfer.
* CONFIG_DIRECT_RETRY cannot be selected with CONFIG_FORCE_INDIRECT
** CONFIG_DIRECT_RETRY is automatically selected with CONFIG_DMA_MEMORY
endif # FAT endif # FAT