summaryrefslogtreecommitdiff
path: root/nuttx
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-01-22 17:14:10 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-01-22 17:14:10 -0600
commitc93357aac60d33c652d79ea0e201aeb5621a8d7b (patch)
treeeaa84660b5e9ae645abc4b1f7e4671539db0ed10 /nuttx
parent9e4b90444e61cfb30b59712704b439d3ad5933c5 (diff)
downloadnuttx-c93357aac60d33c652d79ea0e201aeb5621a8d7b.tar.gz
nuttx-c93357aac60d33c652d79ea0e201aeb5621a8d7b.tar.bz2
nuttx-c93357aac60d33c652d79ea0e201aeb5621a8d7b.zip
configs/viewtool-stm32f107/netnsh: Increase the number of pre-allocated watchdog timers.
Diffstat (limited to 'nuttx')
-rw-r--r--nuttx/configs/viewtool-stm32f107/netnsh/defconfig10
-rw-r--r--nuttx/sched/sig_timedwait.c4
2 files changed, 12 insertions, 2 deletions
diff --git a/nuttx/configs/viewtool-stm32f107/netnsh/defconfig b/nuttx/configs/viewtool-stm32f107/netnsh/defconfig
index a0a9dd200..8b7717967 100644
--- a/nuttx/configs/viewtool-stm32f107/netnsh/defconfig
+++ b/nuttx/configs/viewtool-stm32f107/netnsh/defconfig
@@ -418,7 +418,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
#
@@ -536,7 +536,6 @@ CONFIG_NET=y
# CONFIG_NET_NOINTS is not set
CONFIG_NET_MULTIBUFFER=y
# CONFIG_NET_PROMISCUOUS is not set
-# CONFIG_NET_IPv6 is not set
CONFIG_NSOCKET_DESCRIPTORS=10
CONFIG_NET_NACTIVESOCKETS=16
CONFIG_NET_SOCKOPTS=y
@@ -853,6 +852,8 @@ CONFIG_NSH_MAXARGUMENTS=6
# CONFIG_NSH_ARGCAT is not set
CONFIG_NSH_NESTDEPTH=3
# CONFIG_NSH_DISABLESCRIPT is not set
+# CONFIG_NSH_DISABLE_ITEF is not set
+# CONFIG_NSH_DISABLE_LOOPS is not set
# CONFIG_NSH_DISABLEBG is not set
CONFIG_NSH_CONSOLE=y
@@ -962,6 +963,11 @@ CONFIG_READLINE_ECHO=y
#
#
+# VI Work-Alike Editor
+#
+# CONFIG_SYSTEM_VI is not set
+
+#
# Stack Monitor
#
diff --git a/nuttx/sched/sig_timedwait.c b/nuttx/sched/sig_timedwait.c
index 3d70f33db..ed523fe37 100644
--- a/nuttx/sched/sig_timedwait.c
+++ b/nuttx/sched/sig_timedwait.c
@@ -283,6 +283,10 @@ int sigtimedwait(FAR const sigset_t *set, FAR struct siginfo *info,
wd_delete(rtcb->waitdog);
rtcb->waitdog = NULL;
}
+
+ /* REVISIT: And do what if there are no watchdog timers? The wait
+ * will fail and we will return something bogus.
+ */
}
/* No timeout, just wait */