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

Kconfig updates

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4606 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2012-04-14 13:31:14 +00:00
parent 8105db36c1
commit e828b09381
2 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/serial/Kconfig
+3 -18
View File
@@ -5,7 +5,7 @@
config LOWLEVEL_CONSOLE config LOWLEVEL_CONSOLE
bool "Low-level console support" bool "Low-level console support"
default y default n
depends on ARCH_LOWPUTC depends on ARCH_LOWPUTC
config 16550_UART config 16550_UART
@@ -13,15 +13,11 @@ config 16550_UART
default n default n
if 16550_UART if 16550_UART
menu "16550 UARTs"
config 16550_UART0 config 16550_UART0
bool "16550 UART0" bool "16550 UART0"
default n default n
if 16550_UART0 if 16550_UART0
menu "UART0 configuration"
config 16550_UART0_BASE config 16550_UART0_BASE
hex "16550 UART0 base address" hex "16550 UART0 base address"
@@ -65,7 +61,6 @@ config 16550_UART0_TXBUFSIZE
---help--- ---help---
16550 UART0 Tx buffer size. Default: 256 16550 UART0 Tx buffer size. Default: 256
endmenu
endif endif
config 16550_UART1 config 16550_UART1
@@ -73,8 +68,6 @@ config 16550_UART1
default n default n
if 16550_UART1 if 16550_UART1
menu "UART1 configuration"
config 16550_UART1_BASE config 16550_UART1_BASE
hex "16550 UART1 base address" hex "16550 UART1 base address"
@@ -118,7 +111,6 @@ config 16550_UART1_TXBUFSIZE
---help--- ---help---
16550 UART1 Tx buffer size. Default: 256 16550 UART1 Tx buffer size. Default: 256
endmenu
endif endif
config 16550_UART2 config 16550_UART2
@@ -126,8 +118,6 @@ config 16550_UART2
default n default n
if 16550_UART2 if 16550_UART2
menu "UART2 configuration"
config 16550_UART2_BASE config 16550_UART2_BASE
hex "16550 UART2 base address" hex "16550 UART2 base address"
@@ -171,7 +161,6 @@ config 16550_UART2_TXBUFSIZE
---help--- ---help---
16550 UART2 Tx buffer size. Default: 256 16550 UART2 Tx buffer size. Default: 256
endmenu
endif endif
config 16550_UART3 config 16550_UART3
@@ -179,8 +168,6 @@ config 16550_UART3
default n default n
if 16550_UART3 if 16550_UART3
menu "UART3 configuration"
config 16550_UART3_BASE config 16550_UART3_BASE
hex "16550 UART3 base address" hex "16550 UART3 base address"
@@ -224,7 +211,6 @@ config 16550_UART3_TXBUFSIZE
---help--- ---help---
16550 UART3 Tx buffer size. Default: 256 16550 UART3 Tx buffer size. Default: 256
endmenu
endif endif
choice choice
@@ -279,16 +265,15 @@ config 16550_ADDRWIDTH
---help--- ---help---
The bit width of registers. Options are 8, 16, or 32. Default: 8 The bit width of registers. Options are 8, 16, or 32. Default: 8
endmenu
endif endif
config STANDARD_SERIAL config STANDARD_SERIAL
bool "" bool "Standard serial"
default y if !LOWLEVEL_CONSOLE && !16550_UART default y if !LOWLEVEL_CONSOLE && !16550_UART
if STANDARD_SERIAL if STANDARD_SERIAL
config CONFIG_SERIAL_NPOLLWAITERS config CONFIG_SERIAL_NPOLLWAITERS
int "Low-level console support" int "Number of poll threads"
default 2 default 2
depends on !DISABLE_POLL depends on !DISABLE_POLL
---help--- ---help---
drivers/watchdog.c
+8 -5
View File
@@ -97,9 +97,12 @@ struct watchdog_upperhalf_s
static int wdog_open(FAR struct file *filep); static int wdog_open(FAR struct file *filep);
static int wdog_close(FAR struct file *filep); static int wdog_close(FAR struct file *filep);
static ssize_t wdog_read(FAR struct file *filep, FAR char *buffer, size_t buflen); static ssize_t wdog_read(FAR struct file *filep, FAR char *buffer,
static ssize_t wdog_write(FAR struct file *filep, FAR const char *buffer, size_t buflen); size_t buflen);
static int wdog_ioctl(FAR struct file *filep, int cmd, unsigned long arg); static ssize_t wdog_write(FAR struct file *filep, FAR const char *buffer,
size_t buflen);
static int wdog_ioctl(FAR struct file *filep, int cmd,
unsigned long arg);
/**************************************************************************** /****************************************************************************
* Private Data * Private Data
@@ -111,10 +114,10 @@ static const struct file_operations g_wdogops =
wdog_close, /* close */ wdog_close, /* close */
wdog_read, /* read */ wdog_read, /* read */
wdog_write, /* write */ wdog_write, /* write */
0, /* seek */ 0, /* seek */
wdog_ioctl /* ioctl */ wdog_ioctl /* ioctl */
#ifndef CONFIG_DISABLE_POLL #ifndef CONFIG_DISABLE_POLL
, 0 /* poll */ , 0 /* poll */
#endif #endif
}; };