diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-04-25 12:02:08 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-04-25 12:02:08 -0600 |
| commit | 31eedb090b8625f715ab2b6a43fb5a98c6049b74 (patch) | |
| tree | c1fc7051283580fb4901874b6286a1be4a1e8af2 /nuttx/configs/z16f2800100zcog | |
| parent | 2e4784a86204f678599cc58d4e55e429bae762df (diff) | |
| download | nuttx-31eedb090b8625f715ab2b6a43fb5a98c6049b74.tar.gz nuttx-31eedb090b8625f715ab2b6a43fb5a98c6049b74.tar.bz2 nuttx-31eedb090b8625f715ab2b6a43fb5a98c6049b74.zip | |
Zneo: Updated patch. Found another compiler failure
Diffstat (limited to 'nuttx/configs/z16f2800100zcog')
| -rw-r--r-- | nuttx/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch | 28 |
1 files changed, 28 insertions, 0 deletions
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 b22efeb86..895cb47ed 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,3 +157,31 @@ 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 +index 0aa3584..ac4a36a 100644 +--- a/nuttx/include/wdog.h ++++ b/nuttx/include/wdog.h +@@ -74,7 +74,23 @@ typedef union wdparm_u wdparm_t; + * watchdog function expires. Up to four parameters may be passed. + */ + ++#if 0 + typedef CODE void (*wdentry_t)(int argc, uint32_t arg1, ...); ++#elif CONFIG_MAX_WDOGPARMS < 1 ++typedef CODE void (*wdentry_t)(int argc); ++#elif CONFIG_MAX_WDOGPARMS < 2 ++typedef CODE void (*wdentry_t)(int argc, uint32_t arg1); ++#elif CONFIG_MAX_WDOGPARMS < 3 ++typedef CODE void (*wdentry_t)(int argc, uint32_t arg1, uint32_t arg2); ++#elif CONFIG_MAX_WDOGPARMS < 4 ++typedef CODE void (*wdentry_t)(int argc, uint32_t arg1, uint32_t arg2, ++ uint32_t arg3); ++#elif CONFIG_MAX_WDOGPARMS < 5 ++typedef CODE void (*wdentry_t)(int argc, uint32_t arg1, uint32_t arg2, ++ uint32_t arg3, uint32_t arg4); ++#else ++# error Ooops. CONFIG_MAX_WDOGPARMS > 4 ++#endif + + /* Watchdog 'handle' */ + |