From e42cbc31167274d00d69f008dee3f5513b7f0076 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Tue, 29 Dec 2020 14:14:11 +0100
Subject: [PATCH] fsfw points to eive/develop now

---
 CMakeLists.txt                       | 7 +++++++
 bsp_q7s/CMakeLists.txt               | 1 +
 bsp_q7s/comIF/CMakeLists.txt         | 8 ++++++++
 fsfw                                 | 2 +-
 libcsp/include/CMakeLists.txt        | 4 ++++
 libcsp/src/CMakeLists.txt            | 4 +++-
 libcsp/src/arch/CMakeLists.txt       | 3 +++
 libcsp/src/arch/posix/CMakeLists.txt | 2 +-
 mission/devices/CMakeLists.txt       | 1 +
 9 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 bsp_q7s/comIF/CMakeLists.txt
 create mode 100644 libcsp/src/arch/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a27a5cc..7d631d3b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,6 +37,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
 # Set names and variables
 set(TARGET_NAME ${CMAKE_PROJECT_NAME}) 
 set(LIB_FSFW_NAME fsfw)
+set(LIB_CSP_NAME libcsp)
 
 # Set path names
 set(FSFW_PATH fsfw)
@@ -91,6 +92,12 @@ target_link_libraries(${TARGET_NAME} PRIVATE
 	${LIB_OS_NAME} 
 )
 
+if(ADD_CSP_LIB)
+	target_link_libraries(${TARGET_NAME} PRIVATE
+		${LIB_CSP_NAME}
+	)
+endif()
+
 # Add include paths for all sources.
 target_include_directories(${TARGET_NAME} PRIVATE
 	${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/bsp_q7s/CMakeLists.txt b/bsp_q7s/CMakeLists.txt
index 8df43ca7..004a2fcd 100644
--- a/bsp_q7s/CMakeLists.txt
+++ b/bsp_q7s/CMakeLists.txt
@@ -5,6 +5,7 @@ target_sources(${TARGET_NAME} PUBLIC
 )
 
 add_subdirectory(boardconfig)
+add_subdirectory(comIF)
 
 
 
diff --git a/bsp_q7s/comIF/CMakeLists.txt b/bsp_q7s/comIF/CMakeLists.txt
new file mode 100644
index 00000000..1652702c
--- /dev/null
+++ b/bsp_q7s/comIF/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(${TARGET_NAME} PRIVATE
+	cookies/CspCookie.cpp
+	CspComIF.cpp
+)
+
+
+
+
diff --git a/fsfw b/fsfw
index 5b9c0e01..8ef6283b 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 5b9c0e013e35ab1353d402c6fa2cd75866e3afa5
+Subproject commit 8ef6283bf4f5cf5d12131c48365a753825fea637
diff --git a/libcsp/include/CMakeLists.txt b/libcsp/include/CMakeLists.txt
index 94fee196..cc80ebb5 100644
--- a/libcsp/include/CMakeLists.txt
+++ b/libcsp/include/CMakeLists.txt
@@ -4,4 +4,8 @@ target_include_directories(${LIB_CSP_NAME} PRIVATE
 	${CMAKE_CURRENT_SOURCE_DIR}/csp/crypto
 )
 
+target_include_directories(${LIB_CSP_NAME} INTERFACE
+	${CMAKE_CURRENT_SOURCE_DIR}
+)
+
 
diff --git a/libcsp/src/CMakeLists.txt b/libcsp/src/CMakeLists.txt
index 5d1bfbf5..39c67877 100644
--- a/libcsp/src/CMakeLists.txt
+++ b/libcsp/src/CMakeLists.txt
@@ -7,7 +7,7 @@ target_sources(${LIB_CSP_NAME} PRIVATE
 	csp_dedup.c
 	csp_endian.c
 	csp_hex_dump.c
-	csp_pflist.c
+	csp_iflist.c
 	csp_io.c
 	csp_port.c
 	csp_promisc.c
@@ -22,4 +22,6 @@ add_subdirectory(drivers)
 add_subdirectory(crypto)
 add_subdirectory(interfaces)
 add_subdirectory(rtable)
+add_subdirectory(transport)
+add_subdirectory(arch)
 
diff --git a/libcsp/src/arch/CMakeLists.txt b/libcsp/src/arch/CMakeLists.txt
new file mode 100644
index 00000000..aa0e4ca6
--- /dev/null
+++ b/libcsp/src/arch/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_subdirectory(posix)
+
+
diff --git a/libcsp/src/arch/posix/CMakeLists.txt b/libcsp/src/arch/posix/CMakeLists.txt
index 856040bc..6bf13773 100644
--- a/libcsp/src/arch/posix/CMakeLists.txt
+++ b/libcsp/src/arch/posix/CMakeLists.txt
@@ -1,7 +1,7 @@
 target_sources(${LIB_CSP_NAME} PRIVATE
 	csp_malloc.c
 	csp_queue.c
-	csp_sempahore.c
+	csp_semaphore.c
 	csp_system.c
 	csp_thread.c
 	csp_time.c
diff --git a/mission/devices/CMakeLists.txt b/mission/devices/CMakeLists.txt
index f01df0e1..c751800f 100644
--- a/mission/devices/CMakeLists.txt
+++ b/mission/devices/CMakeLists.txt
@@ -3,6 +3,7 @@ target_sources(${TARGET_NAME} PUBLIC
 	GyroL3GD20Handler.cpp
 	MGMHandlerLIS3MDL.cpp
 	MGMHandlerRM3100.cpp
+	GomspaceDeviceHandler.cpp
 )