fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-24 10:53:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ioctl' into hott

Browse Source
This commit is contained in:
Simon Wilks
2013-01-24 23:57:54 +01:00
parent 0669d2aee0 b9009390d7
commit 23f0be6b02
5 changed files with 245 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nuttx/configs/px4fmu/nsh/defconfig
+3
View File
@@ -226,6 +226,8 @@ CONFIG_AT24XX_MTD_BLOCKSIZE=256
# CONFIG_SERIAL_CONSOLE_REINIT - re-initializes the console serial port
# immediately after creating the /dev/console device. This is required
# if the console serial port has RX DMA enabled.
# CONFIG_STM32_USART_SINGLEWIRE - Serial driver supports single wire mode. If
# this is not defined, then this mode cannot be enabled.
#
# CONFIG_USARTn_SERIAL_CONSOLE - selects the USARTn for the
# console and ttys0 (default is the USART1).
@@ -240,6 +242,7 @@ CONFIG_AT24XX_MTD_BLOCKSIZE=256
#
CONFIG_SERIAL_TERMIOS=y
CONFIG_SERIAL_CONSOLE_REINIT=y
CONFIG_STM32_USART_SINGLEWIRE=y
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
nuttx/include/nuttx/serial/tioctl.h
+1 -1
View File
@@ -177,7 +177,7 @@
#define TIOCSSINGLEWIRE _TIOC(0x002c) /* Set single-wire mode */
#define TIOCGSINGLEWIRE _TIOC(0x002d) /* Get single-wire mode */
# define SER_SINGLEWIRE_ENABLED (1 << 0) /* Enable/disable single-wire support */
# define SER_SINGLEWIRE_ENABLED (1 << 0) /* Enable/disble single-wire support */
/* Debugging */