From c62cdbebcb521975043f1782692667faaf5a8aca Mon Sep 17 00:00:00 2001 From: IRS Cleanroom Laptop Date: Thu, 1 Apr 2021 16:20:10 +0200 Subject: [PATCH] wiretapping defines added --- CMakeLists.txt | 9 ++++----- linux/gpio/LinuxLibgpioIF.h | 2 +- linux/spi/SpiComIF.cpp | 8 ++++++++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 90e1bd7..72dc17b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,11 +20,6 @@ if(NOT LIB_FSFW_NAME) message(ERROR "LIB_FSFW_NAME needs to be set as a linkable target") endif() -target_include_directories(${LIB_FSFW_HAL_NAME} PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} -) - - add_subdirectory(common) if(FSFW_HAL_ADD_LINUX) @@ -39,6 +34,10 @@ target_link_libraries(${LIB_FSFW_HAL_NAME} PRIVATE ${LIB_FSFW_NAME} ) +target_include_directories(${LIB_FSFW_HAL_NAME} PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} +) + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if(NOT DEFINED FSFW_WARNING_FLAGS) set(FSFW_WARNING_FLAGS diff --git a/linux/gpio/LinuxLibgpioIF.h b/linux/gpio/LinuxLibgpioIF.h index be24692..7238056 100644 --- a/linux/gpio/LinuxLibgpioIF.h +++ b/linux/gpio/LinuxLibgpioIF.h @@ -1,7 +1,7 @@ #ifndef LINUX_GPIO_LINUXLIBGPIOIF_H_ #define LINUX_GPIO_LINUXLIBGPIOIF_H_ -#include +#include "../../common/gpio/GpioIF.h" #include #include diff --git a/linux/spi/SpiComIF.cpp b/linux/spi/SpiComIF.cpp index a2bc865..e0a55a5 100644 --- a/linux/spi/SpiComIF.cpp +++ b/linux/spi/SpiComIF.cpp @@ -16,6 +16,14 @@ #include #include +#ifndef SPI_SEND_WIRETAPPING +#define SPI_SEND_WIRETAPPING 0 +#endif + +#ifndef SPI_RECV_WIRETAPPING +#define SPI_RECV_WIRETAPPING 0 +#endif + SpiComIF::SpiComIF(object_id_t objectId, GpioIF* gpioComIF): SystemObject(objectId), gpioComIF(gpioComIF) { if(gpioComIF == nullptr) {