summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-04-25 12:38:56 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-04-25 12:38:56 -0600
commita9dce525bec052901feeeab5d613ff64e0c53c70 (patch)
tree8388637bbaa4ebecff1de677b01ce83f7da95a67
parent31eedb090b8625f715ab2b6a43fb5a98c6049b74 (diff)
downloadnuttx-a9dce525bec052901feeeab5d613ff64e0c53c70.tar.gz
nuttx-a9dce525bec052901feeeab5d613ff64e0c53c70.tar.bz2
nuttx-a9dce525bec052901feeeab5d613ff64e0c53c70.zip
ZNeo: update calibration
-rw-r--r--nuttx/configs/16z/nsh/defconfig2
-rw-r--r--nuttx/sched/sig_timedwait.c8
-rw-r--r--nuttx/sched/wd_internal.h7
3 files changed, 9 insertions, 8 deletions
diff --git a/nuttx/configs/16z/nsh/defconfig b/nuttx/configs/16z/nsh/defconfig
index 2f5908465..d3805a916 100644
--- a/nuttx/configs/16z/nsh/defconfig
+++ b/nuttx/configs/16z/nsh/defconfig
@@ -135,7 +135,7 @@ CONFIG_ENDIAN_BIG=y
#
# Board Settings
#
-CONFIG_BOARD_LOOPSPERMSEC=2203
+CONFIG_BOARD_LOOPSPERMSEC=2811
# CONFIG_ARCH_CALIBRATION is not set
#
diff --git a/nuttx/sched/sig_timedwait.c b/nuttx/sched/sig_timedwait.c
index 724134337..3952e42c2 100644
--- a/nuttx/sched/sig_timedwait.c
+++ b/nuttx/sched/sig_timedwait.c
@@ -79,7 +79,7 @@
****************************************************************************/
/****************************************************************************
- * Private Functionss
+ * Private Functions
****************************************************************************/
/****************************************************************************
@@ -142,8 +142,8 @@ static void sig_timeout(int argc, uint32_t itcb)
* is forever.
*
* If the info argument is non-NULL, the selected signal number is stored
- * in the si_signo member and the cause of the signal is store in the
- * si_code emember. The content of si_value is only meaningful if the
+ * in the si_signo member and the cause of the signal is store din the
+ * si_code member. The content of si_value is only meaningful if the
* signal was generated by sigqueue().
*
* The following values for si_code are defined in signal.h:
@@ -238,7 +238,7 @@ int sigtimedwait(FAR const sigset_t *set, FAR struct siginfo *info,
if (timeout)
{
/* Convert the timespec to system clock ticks, making sure that
- * the resultint delay is greater than or equal to the requested
+ * the resulting delay is greater than or equal to the requested
* time in nanoseconds.
*/
diff --git a/nuttx/sched/wd_internal.h b/nuttx/sched/wd_internal.h
index e63a8bdae..cbbc91cd1 100644
--- a/nuttx/sched/wd_internal.h
+++ b/nuttx/sched/wd_internal.h
@@ -103,13 +103,14 @@ extern sq_queue_t g_wdactivelist;
#ifdef __cplusplus
#define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
#else
#define EXTERN extern
#endif
-EXTERN void weak_function wd_initialize(void);
-EXTERN void weak_function wd_timer(void);
+void weak_function wd_initialize(void);
+void weak_function wd_timer(void);
#undef EXTERN
#ifdef __cplusplus