summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--misc/tools/README.txt4
-rw-r--r--misc/tools/kconfig-frontends-3.3.0-1-libintl.patch3
-rwxr-xr-xmisc/tools/kconfig-macos.diff22
-rw-r--r--nuttx/drivers/serial/Kconfig21
-rw-r--r--nuttx/drivers/watchdog.c13
5 files changed, 37 insertions, 26 deletions
diff --git a/misc/tools/README.txt b/misc/tools/README.txt
index 09a14c73f3..ebda8b160a 100644
--- a/misc/tools/README.txt
+++ b/misc/tools/README.txt
@@ -41,4 +41,6 @@ kconfig-frontends-3.3.0-1-libintl.patch
make
make install
- \ No newline at end of file
+kconfig-macos.path
+
+ This is a patch to make the kconfig-frontends build on Mac OS X.
diff --git a/misc/tools/kconfig-frontends-3.3.0-1-libintl.patch b/misc/tools/kconfig-frontends-3.3.0-1-libintl.patch
index 28b4b052ac..3fe3f81630 100644
--- a/misc/tools/kconfig-frontends-3.3.0-1-libintl.patch
+++ b/misc/tools/kconfig-frontends-3.3.0-1-libintl.patch
@@ -13,12 +13,11 @@ diff -ru kconfig-frontends-3.3.0-1.orig//frontends/nconf/nconf.c kconfig-fronten
diff -ru kconfig-frontends-3.3.0-1.orig//frontends/nconf/nconf.h kconfig-frontends-3.3.0-1/frontends/nconf/nconf.h
--- kconfig-frontends-3.3.0-1.orig//frontends/nconf/nconf.h 2012-03-20 16:07:45.000000000 -0600
+++ kconfig-frontends-3.3.0-1/frontends/nconf/nconf.h 2012-04-05 15:13:36.189960800 -0600
-@@ -15,7 +15,7 @@
+@@ -15,7 +15,6 @@
#include <string.h>
#include <unistd.h>
#include <locale.h>
-#include <curses.h>
-+#include <ncurses/curses.h>
#include <menu.h>
#include <panel.h>
#include <form.h>
diff --git a/misc/tools/kconfig-macos.diff b/misc/tools/kconfig-macos.diff
new file mode 100755
index 0000000000..10e21bb859
--- /dev/null
+++ b/misc/tools/kconfig-macos.diff
@@ -0,0 +1,22 @@
+diff -ru orig/kconfig-frontends-3.3.0-1/libs/parser/yconf.c kconfig-frontends-3.3.0-1/libs/parser/yconf.c
+--- orig/kconfig-frontends-3.3.0-1/libs/parser/yconf.c 2012-04-13 23:37:32.000000000 -0700
++++ kconfig-frontends-3.3.0-1/libs/parser/yconf.c 2012-04-13 23:38:36.000000000 -0700
+@@ -87,6 +87,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdbool.h>
++#include <stddef.h>
+
+ #include "lkc.h"
+
+diff -ru orig/kconfig-frontends-3.3.0-1/libs/parser/yconf.y kconfig-frontends-3.3.0-1/libs/parser/yconf.y
+--- orig/kconfig-frontends-3.3.0-1/libs/parser/yconf.y 2012-03-20 15:07:45.000000000 -0700
++++ kconfig-frontends-3.3.0-1/libs/parser/yconf.y 2012-04-13 23:38:22.000000000 -0700
+@@ -10,6 +10,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdbool.h>
++#include <stddef.h>
+
+ #include "lkc.h"
+
diff --git a/nuttx/drivers/serial/Kconfig b/nuttx/drivers/serial/Kconfig
index 3d4c7d3d6e..b8867bd3f7 100644
--- a/nuttx/drivers/serial/Kconfig
+++ b/nuttx/drivers/serial/Kconfig
@@ -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---
diff --git a/nuttx/drivers/watchdog.c b/nuttx/drivers/watchdog.c
index 52436ac56f..2f2f22ce63 100644
--- a/nuttx/drivers/watchdog.c
+++ b/nuttx/drivers/watchdog.c
@@ -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
};