lupyuen/local-nuttx-update
1
0
Fork 0
forked from nuttx/nuttx-update
Code Pull requests 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
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/serial/Kconfig
View file

@ -5,7 +5,7 @@
config LOWLEVEL_CONSOLE
bool "Low-level console support"
default y
default n
depends on ARCH_LOWPUTC
config 16550_UART
@ -13,15 +13,11 @@ config 16550_UART
default n
if 16550_UART
menu "16550 UARTs"
config 16550_UART0
bool "16550 UART0"
default n
if 16550_UART0
menu "UART0 configuration"
config 16550_UART0_BASE
hex "16550 UART0 base address"
@ -65,7 +61,6 @@ config 16550_UART0_TXBUFSIZE
---help---
16550 UART0 Tx buffer size. Default: 256
endmenu
endif
config 16550_UART1
@ -73,8 +68,6 @@ config 16550_UART1
default n
if 16550_UART1
menu "UART1 configuration"
config 16550_UART1_BASE
hex "16550 UART1 base address"
@ -118,7 +111,6 @@ config 16550_UART1_TXBUFSIZE
---help---
16550 UART1 Tx buffer size. Default: 256
endmenu
endif
config 16550_UART2
@ -126,8 +118,6 @@ config 16550_UART2
default n
if 16550_UART2
menu "UART2 configuration"
config 16550_UART2_BASE
hex "16550 UART2 base address"
@ -171,7 +161,6 @@ config 16550_UART2_TXBUFSIZE
---help---
16550 UART2 Tx buffer size. Default: 256
endmenu
endif
config 16550_UART3
@ -179,8 +168,6 @@ config 16550_UART3
default n
if 16550_UART3
menu "UART3 configuration"
config 16550_UART3_BASE
hex "16550 UART3 base address"
@ -224,7 +211,6 @@ config 16550_UART3_TXBUFSIZE
---help---
16550 UART3 Tx buffer size. Default: 256
endmenu
endif
choice
@ -279,16 +265,15 @@ config 16550_ADDRWIDTH
---help---
The bit width of registers. Options are 8, 16, or 32. Default: 8
endmenu
endif
config STANDARD_SERIAL
bool ""
bool "Standard serial"
default y if !LOWLEVEL_CONSOLE && !16550_UART
if STANDARD_SERIAL
config CONFIG_SERIAL_NPOLLWAITERS
int "Low-level console support"
int "Number of poll threads"
default 2
depends on !DISABLE_POLL
---help---

13
drivers/watchdog.c
View file

@ -97,9 +97,12 @@ struct watchdog_upperhalf_s
static int wdog_open(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_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);
static ssize_t wdog_read(FAR struct file *filep, FAR char *buffer,
size_t buflen);
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
@ -111,10 +114,10 @@ static const struct file_operations g_wdogops =
wdog_close, /* close */
wdog_read, /* read */
wdog_write, /* write */
0, /* seek */
0, /* seek */
wdog_ioctl /* ioctl */
#ifndef CONFIG_DISABLE_POLL
, 0 /* poll */
, 0 /* poll */
#endif
};