From 687cbcbcb50854c9de9cbb01a7c2036e7f24738a Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 21 Aug 2014 11:16:55 -0600 Subject: [PATCH] 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. --- configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch | 6 +++--- .../tools/zneo-zdsii-5_0_1-variadic-func-fix.patch | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch b/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch index d1eb29ba6f0..3dc9c87c59d 100644 --- a/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch +++ b/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/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch b/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch index d1eb29ba6f0..3dc9c87c59d 100644 --- a/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch +++ b/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. */