From d167f91eb8e94239eafe5de3f8c95923abeb7a2c Mon Sep 17 00:00:00 2001 From: Jukka Laitinen Date: Wed, 7 Oct 2020 10:55:47 +0300 Subject: [PATCH] logger/watchdog: Disable watchdog for NuttX protected/kernel builds It accesses kernel internal structures directly; this needs to be worked out with some proper userspace-kernel interface Signed-off-by: Jukka Laitinen --- src/modules/logger/watchdog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/logger/watchdog.cpp b/src/modules/logger/watchdog.cpp index 32e4f76fce..124753809c 100644 --- a/src/modules/logger/watchdog.cpp +++ b/src/modules/logger/watchdog.cpp @@ -49,7 +49,7 @@ namespace logger bool watchdog_update(watchdog_data_t &watchdog_data) { -#ifdef __PX4_NUTTX +#if defined(__PX4_NUTTX) && defined(CONFIG_BUILD_FLAT) if (system_load.initialized && watchdog_data.logger_main_task_index >= 0 && watchdog_data.logger_writer_task_index >= 0) { @@ -133,7 +133,7 @@ bool watchdog_update(watchdog_data_t &watchdog_data) void watchdog_initialize(const pid_t pid_logger_main, const pthread_t writer_thread, watchdog_data_t &watchdog_data) { -#ifdef __PX4_NUTTX +#if defined(__PX4_NUTTX) && defined(CONFIG_BUILD_FLAT) // The pthread_t ID is equal to the PID on NuttX const pthread_t pid_logger_writer = writer_thread;