diff --git a/low_level_platform/impl/src/lf_zephyr_clock_counter.c b/low_level_platform/impl/src/lf_zephyr_clock_counter.c index 73138533d..42f3de0e7 100644 --- a/low_level_platform/impl/src/lf_zephyr_clock_counter.c +++ b/low_level_platform/impl/src/lf_zephyr_clock_counter.c @@ -76,8 +76,6 @@ void _lf_initialize_clock() { uint32_t counter_max_ticks = 0; int res; - _lf_initialize_clock_zephyr_common(); - // Verify that we have the device if (!device_is_ready(counter_dev)) { lf_print_error_and_exit("ERROR: counter device not ready.\n"); diff --git a/low_level_platform/impl/src/lf_zephyr_clock_kernel.c b/low_level_platform/impl/src/lf_zephyr_clock_kernel.c index 5f12d172e..9dc343bc5 100644 --- a/low_level_platform/impl/src/lf_zephyr_clock_kernel.c +++ b/low_level_platform/impl/src/lf_zephyr_clock_kernel.c @@ -67,7 +67,6 @@ static volatile bool async_event = false; K_SEM_DEFINE(sleeping_sem, 0, 1) void _lf_initialize_clock() { - _lf_initialize_clock_zephyr_common(); timer_freq = CONFIG_SYS_CLOCK_TICKS_PER_SEC; lf_print("--- Using LF Zephyr Kernel Clock with a frequency of %u Hz", timer_freq); } diff --git a/low_level_platform/impl/src/lf_zephyr_support.c b/low_level_platform/impl/src/lf_zephyr_support.c index d4f67e9d8..74ae9bf90 100644 --- a/low_level_platform/impl/src/lf_zephyr_support.c +++ b/low_level_platform/impl/src/lf_zephyr_support.c @@ -51,12 +51,6 @@ void k_sys_fatal_error_handler(unsigned int reason, const struct arch_esf* esf) lf_print_error_and_exit("Zephyr kernel panic reason=%d", reason); } -void _lf_initialize_clock_zephyr_common() { - // Use the Zephyr implementation of printf. This avoids some wierd memory - // issues that intermittently arise when calling vfprintf. - lf_register_print_function(vfprintfcb, LOG_LEVEL_ERROR); -} - int lf_sleep(interval_t sleep_duration) { k_sleep(K_NSEC(sleep_duration)); return 0; @@ -94,8 +88,12 @@ int lf_enable_interrupts_nested() { // If NUMBER_OF_WORKERS is not specified, or set to 0, then we default to 1. #if !defined(NUMBER_OF_WORKERS) || NUMBER_OF_WORKERS == 0 #undef NUMBER_OF_WORKERS +#if defined(LF_REACTION_GRAPH_BREADTH) +#define NUMBER_OF_WORKERS LF_REACTION_GRAPH_BREADTH +#else #define NUMBER_OF_WORKERS 1 #endif +#endif // If USER_THREADS is not specified, then default to 0. #if !defined(USER_THREADS)