From bebcffc95b241b0456dff3ac05da5c17d2e412db Mon Sep 17 00:00:00 2001 From: Adam Dobrowolski Date: Mon, 4 May 2020 17:55:14 +0200 Subject: [PATCH] Fix cd: removed weaks --- module-bsp/CMakeLists.txt | 2 -- module-bsp/board/linux/watchdog/watchdog.cpp | 15 +++++++++++++++ module-bsp/bsp/watchdog/watchdog_weak.cpp | 9 --------- module-bsp/targets/Target_Linux.cmake | 4 +++- 4 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 module-bsp/board/linux/watchdog/watchdog.cpp diff --git a/module-bsp/CMakeLists.txt b/module-bsp/CMakeLists.txt index 60a276fd7..16cf366e8 100644 --- a/module-bsp/CMakeLists.txt +++ b/module-bsp/CMakeLists.txt @@ -8,8 +8,6 @@ set(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/bsp/harness/bsp_harness.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/bsp/audio/bsp_audio.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/bsp/lpm/bsp_lpm.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/bsp/watchdog/watchdog_weak.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/drivers/pll/DriverPLL.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/drivers/dmamux/DriverDMAMux.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/drivers/dma/DriverDMA.cpp" diff --git a/module-bsp/board/linux/watchdog/watchdog.cpp b/module-bsp/board/linux/watchdog/watchdog.cpp new file mode 100644 index 000000000..160b2605b --- /dev/null +++ b/module-bsp/board/linux/watchdog/watchdog.cpp @@ -0,0 +1,15 @@ +#include + +namespace bsp::watchdog +{ + __attribute__((weak)) void init() + {} + __attribute__((weak)) void system_reset() + {} + __attribute__((weak)) void pet() + {} + __attribute__((weak)) std::string reset_cause() + { + return {}; + } +} // namespace bsp::watchdog diff --git a/module-bsp/bsp/watchdog/watchdog_weak.cpp b/module-bsp/bsp/watchdog/watchdog_weak.cpp index abef3dad6..e69de29bb 100644 --- a/module-bsp/bsp/watchdog/watchdog_weak.cpp +++ b/module-bsp/bsp/watchdog/watchdog_weak.cpp @@ -1,9 +0,0 @@ -#include "watchdog.hpp" - -namespace bsp::watchdog -{ - __attribute__((weak)) void init() {} - __attribute__((weak)) void system_reset() {} - __attribute__((weak)) void pet() {} - __attribute__((weak)) std::string reset_cause() { return {}; } -} diff --git a/module-bsp/targets/Target_Linux.cmake b/module-bsp/targets/Target_Linux.cmake index 49040553e..ed0f20bcd 100644 --- a/module-bsp/targets/Target_Linux.cmake +++ b/module-bsp/targets/Target_Linux.cmake @@ -21,9 +21,11 @@ set(BOARD_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/board/linux/usb_cdc/usb_cdc.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/board/linux/vibrator/vibrator.cpp" - + "${CMAKE_CURRENT_SOURCE_DIR}/board/linux/magnetometer/magnetometer.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/board/linux/watchdog/watchdog.cpp" + CACHE INTERNAL "") set(BOARD_DIR_INCLUDES