summaryrefslogtreecommitdiff
path: root/nuttx/configs
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-08-21 11:16:55 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-08-21 11:16:55 -0600
commit4c36b97235c919e8001e08a6120fc86aae9dff3e (patch)
tree8bb5885dfea494406caec7f4738d7349e50ecce6 /nuttx/configs
parent53780a7956316b463230e20a80a6a9b1e3d05bf1 (diff)
downloadpx4-nuttx-4c36b97235c919e8001e08a6120fc86aae9dff3e.tar.gz
px4-nuttx-4c36b97235c919e8001e08a6120fc86aae9dff3e.tar.bz2
px4-nuttx-4c36b97235c919e8001e08a6120fc86aae9dff3e.zip
wdog.h does not contain any application interface, only internal OS interface. Further, it is non-standard. Move wdog.h from include/ to include/nuttx. For the same reason, move the description of the watchdog timer interfaces from the Users Guide to the Porting Guide.
Diffstat (limited to 'nuttx/configs')
-rw-r--r--nuttx/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch6
-rw-r--r--nuttx/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch6
2 files changed, 6 insertions, 6 deletions
diff --git a/nuttx/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch b/nuttx/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch
index d1eb29ba6..3dc9c87c5 100644
--- a/nuttx/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch
+++ b/nuttx/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch
@@ -157,10 +157,10 @@ index c78362f..207f9b9 100644
+int nsh_output(FAR struct nsh_vtbl_s *vtbl, FAR const char *fmt, ...);
#endif /* __APPS_NSHLIB_NSH_CONSOLE_H */
-diff --git a/nuttx/include/wdog.h b/nuttx/include/wdog.h
+diff --git a/nuttx/include/wdog.h b/nuttx/include/nuttx/wdog.h
index 0aa3584..ac4a36a 100644
---- a/nuttx/include/wdog.h
-+++ b/nuttx/include/wdog.h
+--- a/nuttx/include/nuttx/wdog.h
++++ b/nuttx/include/nuttx/wdog.h
@@ -74,7 +74,23 @@ typedef union wdparm_u wdparm_t;
* watchdog function expires. Up to four parameters may be passed.
*/
diff --git a/nuttx/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch b/nuttx/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch
index d1eb29ba6..3dc9c87c5 100644
--- a/nuttx/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch
+++ b/nuttx/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch
@@ -157,10 +157,10 @@ index c78362f..207f9b9 100644
+int nsh_output(FAR struct nsh_vtbl_s *vtbl, FAR const char *fmt, ...);
#endif /* __APPS_NSHLIB_NSH_CONSOLE_H */
-diff --git a/nuttx/include/wdog.h b/nuttx/include/wdog.h
+diff --git a/nuttx/include/wdog.h b/nuttx/include/nuttx/wdog.h
index 0aa3584..ac4a36a 100644
---- a/nuttx/include/wdog.h
-+++ b/nuttx/include/wdog.h
+--- a/nuttx/include/nuttx/wdog.h
++++ b/nuttx/include/nuttx/wdog.h
@@ -74,7 +74,23 @@ typedef union wdparm_u wdparm_t;
* watchdog function expires. Up to four parameters may be passed.
*/