Merge pull request #56 from forGGe/exti_manager_rel

EXTI manager for stm32f4xx platform
theCore-embedded · May 24, 2016 · 572964b · 572964b
2 parents 771c94c + 125e289
commit 572964b
Show file tree

Hide file tree

Showing 10 changed files with 597 additions and 39 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,7 +38,7 @@ set(CMAKE_CXX_FLAGS
 # Linker definitions is propagated by the platform.
 include(${CORE_DIR}/platform/common/linker.cmake)
 
-# The top-level library target, essesnce of this project.
+# The top-level library target, essence of this project.
 add_library(${PROJECT_NAME} INTERFACE)
 target_link_libraries(${PROJECT_NAME} INTERFACE startup)
 target_link_libraries(${PROJECT_NAME} INTERFACE ${PLATFORM_NAME})

diff --git a/kernel/freertos/CMakeLists.txt b/kernel/freertos/CMakeLists.txt
@@ -63,3 +63,5 @@ target_include_directories(freertos PUBLIC
 	${CONFIG_FREERTOS_HEADERS_PATH}/
 	${SRC_DIR}portable/${PORT_DIR}/
 )
+
+target_link_libraries(freertos PRIVATE emc)
diff --git a/lib/containers/CMakeLists.txt b/lib/containers/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_library(containers INTERFACE)
-target_include_directories(containers INTERFACE export utils)
+target_include_directories(containers INTERFACE export)
+target_link_libraries(containers INTERFACE utils)
 add_unit_host_test(NAME list
 	SOURCES tests/list_unit.cpp
 	INC_DIRS export

diff --git a/lib/emc/memset.c b/lib/emc/memset.c
@@ -3,6 +3,7 @@
 
 #include <stdint.h>
 
+__attribute__((used))
 void * LIBC_FUNCTION(memset) (void *s, int c, size_t n)
 {
     uint8_t *dest = (uint8_t *) s;

diff --git a/platform/stm32f4xx/CMakeLists.txt b/platform/stm32f4xx/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(stm32f4xx STATIC platform.cpp irq_manager.cpp)
+add_library(stm32f4xx STATIC platform.cpp irq_manager.cpp exti_manager.cpp)
 add_library(stm32f4xx_utils STATIC utils.c)
 
 target_include_directories(stm32f4xx PUBLIC export)
@@ -9,13 +9,15 @@ add_subdirectory(SPL)
 add_subdirectory(CMSIS)
 
 # TODO: clarify essential libraries
-target_link_libraries(stm32f4xx spl)
-target_link_libraries(stm32f4xx common_spi)
-target_link_libraries(stm32f4xx common_pin)
-target_link_libraries(stm32f4xx common_usart)
-target_link_libraries(stm32f4xx common_i2c)
-target_link_libraries(stm32f4xx common_bus)
-target_link_libraries(stm32f4xx types)
+target_link_libraries(stm32f4xx PUBLIC spl)
+target_link_libraries(stm32f4xx PUBLIC common_spi)
+target_link_libraries(stm32f4xx PUBLIC common_pin)
+target_link_libraries(stm32f4xx PUBLIC common_usart)
+target_link_libraries(stm32f4xx PUBLIC common_i2c)
+target_link_libraries(stm32f4xx PUBLIC common_bus)
+target_link_libraries(stm32f4xx PUBLIC types)
+target_link_libraries(stm32f4xx PUBLIC containers)
+target_link_libraries(stm32f4xx PUBLIC emc) # For memset
 
 add_cppcheck(stm32f4xx)