diff options
| author | Harald Welte <laforge@osmocom.org> | 2021-04-06 01:18:01 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@osmocom.org> | 2021-06-01 18:38:25 +0200 |
| commit | 87c5bdf3298e3042a8a9a92404b53e59dc6c36cb (patch) | |
| tree | 33915a1d6b36d67176d77dc929e05eb3bfd83b52 | |
| parent | 76c73aaa99921ec3b1a35cc9bd5ec94e40e50cd9 (diff) | |
assert: Use printf_sync() to ensure printing of assert / paniclaforge/cardem2
Change-Id: Icc202e60445d9be1cdcd61176db5ed1704d583e7
| -rw-r--r-- | firmware/libcommon/include/assert.h | 2 | ||||
| -rw-r--r-- | firmware/libosmocore/source/panic.c | 2 | ||||
| -rw-r--r-- | firmware/test/card_emu_tests.c | 14 |
3 files changed, 16 insertions, 2 deletions
diff --git a/firmware/libcommon/include/assert.h b/firmware/libcommon/include/assert.h index 22bb101..dc6b1b5 100644 --- a/firmware/libcommon/include/assert.h +++ b/firmware/libcommon/include/assert.h @@ -89,7 +89,7 @@ /// \param condition Condition to verify. #define ASSERT(condition) { \ if (!(condition)) { \ - printf("-F- ASSERT: %s %s:%d\n\r", #condition, __BASE_FILE__, __LINE__); \ + printf_sync("-F- ASSERT: %s %s:%d\n\r", #condition, __BASE_FILE__, __LINE__); \ while (1); \ } \ } diff --git a/firmware/libosmocore/source/panic.c b/firmware/libosmocore/source/panic.c index 74243b0..db5c26a 100644 --- a/firmware/libosmocore/source/panic.c +++ b/firmware/libosmocore/source/panic.c @@ -46,7 +46,7 @@ static osmo_panic_handler_t osmo_panic_handler = (void*)0; __attribute__ ((format (printf, 1, 0))) static void osmo_panic_default(const char *fmt, va_list args) { - vfprintf(stderr, fmt, args); + vfprintf_sync(stderr, fmt, args); osmo_generate_backtrace(); assert(0); } diff --git a/firmware/test/card_emu_tests.c b/firmware/test/card_emu_tests.c index 69159a8..5d5bd3e 100644 --- a/firmware/test/card_emu_tests.c +++ b/firmware/test/card_emu_tests.c @@ -13,6 +13,20 @@ #define PHONE_INT 2 #define PHONE_DATAOUT 3 +/* stub for stdio */ +signed int printf_sync(const char *pFormat, ...) +{ + va_list ap; + signed int result; + + va_start(ap, pFormat); + result = vprintf(pFormat, ap); + va_end(ap); + + return result; +} + + /*********************************************************************** * stub functions required by card_emu.c ***********************************************************************/ |