From daf6d347fc6eb2077e7a9450a5774cc7dc7fb1ab Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 25 Apr 2014 11:59:17 -0600
Subject: [PATCH] Updates to ZNeo configurations + misc cosmetic changes to
 comments

---
 arch/z16/src/z16f/z16f_serial.c       | 4 +++-
 configs/16z/nsh/defconfig             | 4 ++--
 configs/z16f2800100zcog/nsh/defconfig | 2 +-
 include/wdog.h                        | 3 ++-
 sched/sig_timedwait.c                 | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/arch/z16/src/z16f/z16f_serial.c b/arch/z16/src/z16f/z16f_serial.c
index 4f8642e485..58b847ae81 100644
--- a/arch/z16/src/z16f/z16f_serial.c
+++ b/arch/z16/src/z16f/z16f_serial.c
@@ -508,6 +508,7 @@ static int z16f_rxinterrupt(int irq, void *context)
 
       uart_recvchars(dev);
     }
+
   return OK;
 }
 
@@ -563,7 +564,8 @@ static int z16f_txinterrupt(int irq, void *context)
  * Name: z16f_ioctl
  *
  * Description:
- *   All ioctl calls will be routed through this method
+ *   All ioctl that are not handled by the upper half serial driver will be
+ *   routed through this method
  *
  ****************************************************************************/
 
diff --git a/configs/16z/nsh/defconfig b/configs/16z/nsh/defconfig
index 3c5090ebb8..2f59084654 100644
--- a/configs/16z/nsh/defconfig
+++ b/configs/16z/nsh/defconfig
@@ -135,7 +135,7 @@ CONFIG_ENDIAN_BIG=y
 #
 # Board Settings
 #
-CONFIG_BOARD_LOOPSPERMSEC=1250
+CONFIG_BOARD_LOOPSPERMSEC=2203
 # CONFIG_ARCH_CALIBRATION is not set
 
 #
@@ -201,7 +201,7 @@ CONFIG_START_YEAR=2014
 CONFIG_START_MONTH=1
 CONFIG_START_DAY=1
 CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=4
+CONFIG_PREALLOC_WDOGS=16
 CONFIG_PREALLOC_TIMERS=4
 
 #
diff --git a/configs/z16f2800100zcog/nsh/defconfig b/configs/z16f2800100zcog/nsh/defconfig
index f065544d7b..8a3612e817 100644
--- a/configs/z16f2800100zcog/nsh/defconfig
+++ b/configs/z16f2800100zcog/nsh/defconfig
@@ -217,7 +217,7 @@ CONFIG_NAME_MAX=32
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
 CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=4
+CONFIG_PREALLOC_WDOGS=16
 CONFIG_PREALLOC_TIMERS=4
 
 #
diff --git a/include/wdog.h b/include/wdog.h
index 21f1b82636..0aa3584163 100644
--- a/include/wdog.h
+++ b/include/wdog.h
@@ -90,7 +90,8 @@ typedef FAR struct wdog_s *WDOG_ID;
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/sched/sig_timedwait.c b/sched/sig_timedwait.c
index 3091ee384d..7241343377 100644
--- a/sched/sig_timedwait.c
+++ b/sched/sig_timedwait.c
@@ -270,7 +270,7 @@ int sigtimedwait(FAR const sigset_t *set, FAR struct siginfo *info,
                */
 
               wdparm_t wdparm;
-              wdparm.pvarg = (FAR void*)rtcb;
+              wdparm.pvarg = (FAR void *)rtcb;
 
               /* Start the watchdog */