stm32wba : ble-802.15.4 concurrent mode integration

lib/stm32wba/CMakeLists.txt

@@ -85,52 +85,55 @@ if(CONFIG_BT_STM32WBA)
   target_link_libraries(app PUBLIC stm32wba_ble_lib)
 endif()
 
-# Selecting the proper version of link layer lib
-if(CONFIG_BT_STM32WBA)
+# Distinguish STM32WBA6x from STM32WBA5x lines
+if(CONFIG_SOC_STM32WBA65XX)
+  set(libname_prefix "WBA6_")
+elseif(CONFIG_SOC_STM32WBA55XX OR CONFIG_SOC_STM32WBA52XX)
+  set(libname_prefix "")
+else()
+  message(FATAL_ERROR "Unsupported SoC: ${CONFIG_SOC}")
+endif()
+
+# Selecting the proper version of link layer lib and its associated configuration header file
+if(CONFIG_BT_STM32WBA AND CONFIG_IEEE802154_STM32WBA)
+  message(STATUS "Wireless stack enabled in concurrent mode (BLE+IEEE 802.15.4)")
   if(BLE_LIB_TYPE STREQUAL "BLE_LIB_BASIC")
-      zephyr_include_directories(STM32_WPAN/link_layer/ll_cmd_lib/config/ble_basic)
+    set(LL_LIB_CFG_DIR concurrent/ble_15_4)
+    set(LL_LIB LinkLayer_BLE_Basic_15_4_lib_Zephyr.a)
   elseif(BLE_LIB_TYPE STREQUAL "BLE_LIB_FULL")
-      zephyr_include_directories(STM32_WPAN/link_layer/ll_cmd_lib/config/ble_full)
-  endif()
-  # Checking all the soc variants and not simply relying on board name
-  if(CONFIG_SOC_STM32WBA65XX)
-    message(STATUS "STM32WBA6 link layer lib selected")
-    if (BLE_LIB_TYPE STREQUAL "BLE_LIB_BASIC")
-      set(LL_LIB "WBA6_LinkLayer_BLE_Basic_lib.a")
-    elseif (BLE_LIB_TYPE STREQUAL "BLE_LIB_FULL")
-      set(LL_LIB "WBA6_LinkLayer_BLE_Full_lib.a")
-    endif()
+    set(LL_LIB_CFG_DIR concurrent/ble_full_15_4)
+    set(LL_LIB LinkLayer_BLE_Full_15_4_lib_Zephyr.a)
   endif()
-
-  if(CONFIG_SOC_STM32WBA55XX OR CONFIG_SOC_STM32WBA52XX)
-    message(STATUS "STM32WBA5 link layer lib selected")
-    if (BLE_LIB_TYPE STREQUAL "BLE_LIB_BASIC")
-      set(LL_LIB "LinkLayer_BLE_Basic_lib.a")
-    elseif (BLE_LIB_TYPE STREQUAL "BLE_LIB_FULL")
-      set(LL_LIB "LinkLayer_BLE_Full_lib.a")
-    endif()
+elseif(CONFIG_BT_STM32WBA)
+  message(STATUS "Wireless stack enabled in BLE mode")
+  if(BLE_LIB_TYPE STREQUAL "BLE_LIB_BASIC")
+    set(LL_LIB_CFG_DIR ble_basic)
+    set(LL_LIB LinkLayer_BLE_Basic_lib.a)
+  elseif(BLE_LIB_TYPE STREQUAL "BLE_LIB_FULL")
+    set(LL_LIB_CFG_DIR ble_full)
+    set(LL_LIB LinkLayer_BLE_Full_lib.a)
   endif()
 elseif(CONFIG_IEEE802154_STM32WBA)
+  message(STATUS "Wireless stack enabled in IEEE 802.15.4 mode")
   if(CONFIG_SOC_STM32WBA65XX)
     if(CONFIG_OPENTHREAD)
-      message(STATUS "WBA6_LinkLayer_Thread_lib_Zephyr.a lib selected")
-      set(LL_LIB "WBA6_LinkLayer_Thread_lib_Zephyr.a")
+      set(LL_LIB_CFG_DIR thread)
+      set(LL_LIB LinkLayer_Thread_lib_Zephyr.a)
     else()
-      message(STATUS "WBA6_LinkLayer15_4_Zephyr.a lib selected")
-      set(LL_LIB "WBA6_LinkLayer15_4_Zephyr.a")
+      set(LL_LIB_CFG_DIR ieee_15_4_basic)
+      set(LL_LIB LinkLayer15_4_Zephyr.a)
     endif()
   endif()
 endif()
 
-if(CONFIG_BT_STM32WBA OR CONFIG_IEEE802154_STM32WBA)
+if(LL_LIB)
+  zephyr_include_directories(STM32_WPAN/link_layer/ll_cmd_lib/config/${LL_LIB_CFG_DIR})
   add_library(stm32wba_ll_lib STATIC IMPORTED GLOBAL)
   set(STM32WBA_LL_LIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/STM32_WPAN/link_layer/ll_cmd_lib)
-  set_target_properties(stm32wba_ll_lib PROPERTIES IMPORTED_LOCATION ${STM32WBA_LIB_DIR}/${LL_LIB})
+  set_target_properties(stm32wba_ll_lib PROPERTIES IMPORTED_LOCATION ${STM32WBA_LIB_DIR}/${libname_prefix}${LL_LIB})
   set_target_properties(stm32wba_ll_lib PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${STM32WBA_LL_LIB_INCLUDE_DIR})
   target_link_libraries(app PUBLIC stm32wba_ll_lib)
 endif()
 
 add_subdirectory(STM32_WPAN)
-
-add_subdirectory_ifdef(CONFIG_BT_STM32WBA ble)
-add_subdirectory_ifdef(CONFIG_IEEE802154_STM32WBA IEEE802154)
+add_subdirectory(RF_Integration)