diff --git a/arch/posix/include/posix_soc_if.h b/arch/posix/include/posix_soc_if.h index 26d2152a9a4..1e90693dc93 100644 --- a/arch/posix/include/posix_soc_if.h +++ b/arch/posix/include/posix_soc_if.h @@ -14,14 +14,12 @@ * or all its boards */ +#include "posix_trace.h" + #ifdef __cplusplus extern "C" { #endif -void posix_print_error_and_exit(const char *format, ...); -void posix_print_warning(const char *format, ...); -void posix_print_trace(const char *format, ...); - void posix_halt_cpu(void); void posix_atomic_halt_cpu(unsigned int imask); diff --git a/arch/posix/include/posix_trace.h b/arch/posix/include/posix_trace.h new file mode 100644 index 00000000000..1a71a1e7abf --- /dev/null +++ b/arch/posix/include/posix_trace.h @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2018 Oticon A/S + * + * SPDX-License-Identifier: Apache-2.0 + */ +#ifndef _POSIX_TRACE_H +#define _POSIX_TRACE_H + +#ifdef __cplusplus +extern "C" { +#endif + +void posix_print_error_and_exit(const char *format, ...); +void posix_print_warning(const char *format, ...); +void posix_print_trace(const char *format, ...); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/boards/posix/native_posix/cmdline.c b/boards/posix/native_posix/cmdline.c index 3f40a3a974b..fdfcf71dd3c 100644 --- a/boards/posix/native_posix/cmdline.c +++ b/boards/posix/native_posix/cmdline.c @@ -13,6 +13,7 @@ #include "timer_model.h" #include "cmdline.h" #include "toolchain.h" +#include "posix_trace.h" static int s_argc, test_argc; static char **s_argv, **test_argv; diff --git a/boards/posix/native_posix/cmdline_common.c b/boards/posix/native_posix/cmdline_common.c index 5af4aaa2a10..551f986d3cd 100644 --- a/boards/posix/native_posix/cmdline_common.c +++ b/boards/posix/native_posix/cmdline_common.c @@ -10,7 +10,8 @@ #include #include #include -#include "posix_soc_if.h" +#include "posix_trace.h" +#include "posix_board_if.h" #include "zephyr/types.h" #include "cmdline_common.h" diff --git a/boards/posix/native_posix/cmdline_common.h b/boards/posix/native_posix/cmdline_common.h index d8b715b5df5..7d16ce8b09b 100644 --- a/boards/posix/native_posix/cmdline_common.h +++ b/boards/posix/native_posix/cmdline_common.h @@ -74,6 +74,9 @@ int cmd_is_option(const char *arg, const char *option, int with_value); int cmd_is_help_option(const char *arg); void cmd_read_option_value(const char *str, void *dest, const char type, const char *option); +void cmd_args_set_defaults(struct args_struct_t args_struct[]); +bool cmd_parse_one_arg(char *argv, struct args_struct_t args_struct[]); +void cmd_print_switches_help(struct args_struct_t args_struct[]); #ifdef __cplusplus } diff --git a/boards/posix/native_posix/native_rtc.c b/boards/posix/native_posix/native_rtc.c index 970b5384b4c..5259a030fa0 100644 --- a/boards/posix/native_posix/native_rtc.c +++ b/boards/posix/native_posix/native_rtc.c @@ -11,6 +11,7 @@ #include "native_rtc.h" #include "hw_models_top.h" #include "timer_model.h" +#include "posix_trace.h" /** * Return the (simulation) time in microseconds diff --git a/boards/posix/native_posix/timer_model.c b/boards/posix/native_posix/timer_model.c index b44524a8dba..c1c579e7fed 100644 --- a/boards/posix/native_posix/timer_model.c +++ b/boards/posix/native_posix/timer_model.c @@ -26,7 +26,7 @@ #include "irq_ctrl.h" #include "board_soc.h" #include "zephyr/types.h" -#include "posix_soc_if.h" +#include "posix_trace.h" #include "misc/util.h" #include "cmdline.h" #include "soc.h" diff --git a/drivers/console/native_posix_console.c b/drivers/console/native_posix_console.c index 1786e4baafd..6ed8344b0aa 100644 --- a/drivers/console/native_posix_console.c +++ b/drivers/console/native_posix_console.c @@ -9,6 +9,7 @@ #include "init.h" #include "kernel.h" #include "console/console.h" +#include "posix_board_if.h" #include #include #include diff --git a/drivers/entropy/fake_entropy_native_posix.c b/drivers/entropy/fake_entropy_native_posix.c index 7c64ebb3b0e..b41a7444f80 100644 --- a/drivers/entropy/fake_entropy_native_posix.c +++ b/drivers/entropy/fake_entropy_native_posix.c @@ -17,7 +17,7 @@ #include "misc/util.h" #include #include -#include "posix_soc_if.h" +#include "posix_trace.h" #include "soc.h" #include "cmdline.h" /* native_posix command line options header */ diff --git a/drivers/timer/native_posix_timer.c b/drivers/timer/native_posix_timer.c index 1d8fa7536ec..bc70222abaa 100644 --- a/drivers/timer/native_posix_timer.c +++ b/drivers/timer/native_posix_timer.c @@ -18,7 +18,7 @@ #include "sys_clock.h" #include "timer_model.h" #include "soc.h" -#include "posix_soc_if.h" +#include "posix_trace.h" static u64_t tick_period; /* System tick period in number of hw cycles */ static s64_t silent_ticks;