sysinit; change the function prototype of sysinit_panic_fn to match __assert_func(). Use __assert_func() as the default panic function.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/18ef5db1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/18ef5db1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/18ef5db1 Branch: refs/heads/develop Commit: 18ef5db1581de100c50f9ac22cd28f56fda2b982 Parents: 5c53749 Author: Marko Kiiskila <[email protected]> Authored: Wed Jan 18 13:45:40 2017 -0800 Committer: Marko Kiiskila <[email protected]> Committed: Wed Jan 18 13:45:40 2017 -0800 ---------------------------------------------------------------------- sys/sysinit/include/sysinit/sysinit.h | 5 +++-- sys/sysinit/src/sysinit.c | 9 +-------- 2 files changed, 4 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/18ef5db1/sys/sysinit/include/sysinit/sysinit.h ---------------------------------------------------------------------- diff --git a/sys/sysinit/include/sysinit/sysinit.h b/sys/sysinit/include/sysinit/sysinit.h index 4b250c0..32df52b 100644 --- a/sys/sysinit/include/sysinit/sysinit.h +++ b/sys/sysinit/include/sysinit/sysinit.h @@ -37,13 +37,14 @@ extern uint8_t sysinit_active; void sysinit_start(void); void sysinit_end(void); -typedef void sysinit_panic_fn(const char *file, int line); +typedef void sysinit_panic_fn(const char *file, int line, const char *func, + const char *expr); extern sysinit_panic_fn *sysinit_panic_cb; void sysinit_panic_set(sysinit_panic_fn *panic_fn); -#define SYSINIT_PANIC() sysinit_panic_cb(__FILE__, __LINE__) +#define SYSINIT_PANIC() sysinit_panic_cb(NULL, 0, NULL, NULL) #define SYSINIT_PANIC_ASSERT(rc) do \ { \ http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/18ef5db1/sys/sysinit/src/sysinit.c ---------------------------------------------------------------------- diff --git a/sys/sysinit/src/sysinit.c b/sys/sysinit/src/sysinit.c index 4e560c7..767032f 100644 --- a/sys/sysinit/src/sysinit.c +++ b/sys/sysinit/src/sysinit.c @@ -22,17 +22,10 @@ #include "os/os_fault.h" #include "sysinit/sysinit.h" -static void sysinit_panic_dflt(const char *file, int line); -sysinit_panic_fn *sysinit_panic_cb = sysinit_panic_dflt; +sysinit_panic_fn *sysinit_panic_cb = __assert_func; uint8_t sysinit_active; -static void -sysinit_panic_dflt(const char *file, int line) -{ - __assert_func(file, line, NULL, NULL); -} - /** * Sets the sysinit panic function; i.e., the function which executes when * initialization fails. By default, a panic triggers a failed assertion.
