From 485f61041f862806cd0d3ad2f0686b16e39d70df Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Tue, 23 Mar 2021 16:15:31 +0100
Subject: [PATCH] integrating fsfw_hal

---
 CMakeLists.txt                              | 6 ++++++
 bsp_rpi/gpio/CMakeLists.txt                 | 1 -
 fsfw_hal                                    | 2 +-
 linux/CMakeLists.txt                        | 2 +-
 linux/{ => archive}/gpio/CMakeLists.txt     | 0
 linux/{ => archive}/gpio/GpioCookie.cpp     | 0
 linux/{ => archive}/gpio/GpioCookie.h       | 0
 linux/{ => archive}/gpio/GpioIF.h           | 0
 linux/{ => archive}/gpio/LinuxLibgpioIF.cpp | 0
 linux/{ => archive}/gpio/LinuxLibgpioIF.h   | 0
 linux/{ => archive}/gpio/gpioDefinitions.h  | 0
 {bsp_rpi/gpio => misc/archive}/GPIORPi.cpp  | 0
 {bsp_rpi/gpio => misc/archive}/GPIORPi.h    | 0
 13 files changed, 8 insertions(+), 3 deletions(-)
 rename linux/{ => archive}/gpio/CMakeLists.txt (100%)
 rename linux/{ => archive}/gpio/GpioCookie.cpp (100%)
 rename linux/{ => archive}/gpio/GpioCookie.h (100%)
 rename linux/{ => archive}/gpio/GpioIF.h (100%)
 rename linux/{ => archive}/gpio/LinuxLibgpioIF.cpp (100%)
 rename linux/{ => archive}/gpio/LinuxLibgpioIF.h (100%)
 rename linux/{ => archive}/gpio/gpioDefinitions.h (100%)
 rename {bsp_rpi/gpio => misc/archive}/GPIORPi.cpp (100%)
 rename {bsp_rpi/gpio => misc/archive}/GPIORPi.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53689123..61b99287 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,7 @@ set(TARGET_NAME ${CMAKE_PROJECT_NAME})
 set(LIB_FSFW_NAME fsfw)
 set(LIB_ETL_NAME etl)
 set(LIB_CSP_NAME libcsp)
+set(LIB_FSFW_HAL_NAME fsfw_hal)
 set(LIB_LWGPS_NAME lwgps)
 set(THIRD_PARTY_FOLDER thirdparty)
 
@@ -50,6 +51,7 @@ set(TEST_PATH test/testtasks)
 set(LINUX_PATH linux)
 set(COMMON_PATH common)
 
+set(FSFW_HAL_LIB_PATH fsfw_hal)
 set(CSP_LIB_PATH ${THIRD_PARTY_FOLDER}/libcsp)
 set(ETL_LIB_PATH ${THIRD_PARTY_FOLDER}/etl)
 set(LWGPS_LIB_PATH ${THIRD_PARTY_FOLDER}/lwgps)
@@ -68,10 +70,12 @@ if(TGT_BSP)
         set(FSFW_CONFIG_PATH "fsfwconfig")
         set(ADD_LINUX_FILES TRUE)
         set(ADD_CSP_LIB TRUE)
+        set(FSFW_HAL_ADD_LINUX ON)
     endif()
    
     if(${TGT_BSP} MATCHES "arm/raspberrypi") 
         add_definitions(-DRASPBERRY_PI)
+        set(FSFW_HAL_ADD_RASPBERRY_PI ON)
     endif()
     
     if(${TGT_BSP} MATCHES "arm/q7s")
@@ -113,6 +117,7 @@ add_subdirectory(${BSP_PATH})
 add_subdirectory(${FSFW_PATH})
 add_subdirectory(${MISSION_PATH})
 add_subdirectory(${TEST_PATH})
+add_subdirectory(${FSFW_HAL_LIB_PATH})
 add_subdirectory(${COMMON_PATH})
 
 ################################################################################
@@ -126,6 +131,7 @@ target_link_libraries(${TARGET_NAME} PRIVATE
 	${LIB_FSFW_NAME} 
 	${LIB_OS_NAME} 
 	${LIB_LWGPS_NAME}
+	${LIB_FSFW_HAL_NAME}
 )
 
 if(ADD_ETL_LIB)
diff --git a/bsp_rpi/gpio/CMakeLists.txt b/bsp_rpi/gpio/CMakeLists.txt
index 85bd6aa6..b816684d 100644
--- a/bsp_rpi/gpio/CMakeLists.txt
+++ b/bsp_rpi/gpio/CMakeLists.txt
@@ -1,5 +1,4 @@
 target_sources(${TARGET_NAME} PUBLIC
-	GPIORPi.cpp
 )
 
 
diff --git a/fsfw_hal b/fsfw_hal
index 45eb9cbe..547c788c 160000
--- a/fsfw_hal
+++ b/fsfw_hal
@@ -1 +1 @@
-Subproject commit 45eb9cbe2bc7e7e11aca7a6262098251f358ec8d
+Subproject commit 547c788c818069abb9eaea12a0c997376641f9aa
diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt
index 77bea0ef..13748f41 100644
--- a/linux/CMakeLists.txt
+++ b/linux/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_subdirectory(gpio)
+# add_subdirectory(gpio)
 add_subdirectory(i2c)
 add_subdirectory(csp)
 add_subdirectory(spi)
diff --git a/linux/gpio/CMakeLists.txt b/linux/archive/gpio/CMakeLists.txt
similarity index 100%
rename from linux/gpio/CMakeLists.txt
rename to linux/archive/gpio/CMakeLists.txt
diff --git a/linux/gpio/GpioCookie.cpp b/linux/archive/gpio/GpioCookie.cpp
similarity index 100%
rename from linux/gpio/GpioCookie.cpp
rename to linux/archive/gpio/GpioCookie.cpp
diff --git a/linux/gpio/GpioCookie.h b/linux/archive/gpio/GpioCookie.h
similarity index 100%
rename from linux/gpio/GpioCookie.h
rename to linux/archive/gpio/GpioCookie.h
diff --git a/linux/gpio/GpioIF.h b/linux/archive/gpio/GpioIF.h
similarity index 100%
rename from linux/gpio/GpioIF.h
rename to linux/archive/gpio/GpioIF.h
diff --git a/linux/gpio/LinuxLibgpioIF.cpp b/linux/archive/gpio/LinuxLibgpioIF.cpp
similarity index 100%
rename from linux/gpio/LinuxLibgpioIF.cpp
rename to linux/archive/gpio/LinuxLibgpioIF.cpp
diff --git a/linux/gpio/LinuxLibgpioIF.h b/linux/archive/gpio/LinuxLibgpioIF.h
similarity index 100%
rename from linux/gpio/LinuxLibgpioIF.h
rename to linux/archive/gpio/LinuxLibgpioIF.h
diff --git a/linux/gpio/gpioDefinitions.h b/linux/archive/gpio/gpioDefinitions.h
similarity index 100%
rename from linux/gpio/gpioDefinitions.h
rename to linux/archive/gpio/gpioDefinitions.h
diff --git a/bsp_rpi/gpio/GPIORPi.cpp b/misc/archive/GPIORPi.cpp
similarity index 100%
rename from bsp_rpi/gpio/GPIORPi.cpp
rename to misc/archive/GPIORPi.cpp
diff --git a/bsp_rpi/gpio/GPIORPi.h b/misc/archive/GPIORPi.h
similarity index 100%
rename from bsp_rpi/gpio/GPIORPi.h
rename to misc/archive/GPIORPi.h