Fix processing of received ESP_HCI_IF (EHM-77)

.gitlab-ci.yml

@@ -10,7 +10,7 @@ before_script:
     - build
   artifacts:
     paths:
-      - "${IDF_PATH}/${IDF_EXAMPLE_PATH}/build*/build_log.txt"
+      - "artifacts_*/"
     when: always
     expire_in: 4 days
   script:
@@ -21,37 +21,86 @@ before_script:
     # Replaces esp_hosted component in example's deps with the one from the current repository
     - export OVERRIDE_PATH=`pwd`
     - cd ${IDF_PATH}/${IDF_EXAMPLE_PATH}
-    - cat ${OVERRIDE_PATH}/.gitlab-ci-override-idf-component.yml >> main/idf_component.yml
+    # Create components directory and link esp_hosted component
+    - mkdir -p components
+    - ln -sf ${OVERRIDE_PATH} components/esp_hosted
+    - echo "Created components directory with esp_hosted link:"
+    - ls -la components/
+    # Override component dependency as backup only if not already present
+    - |
+      if ! grep -q "esp_hosted" main/idf_component.yml 2>/dev/null; then
+        cat ${OVERRIDE_PATH}/.gitlab-ci-override-idf-component.yml >> main/idf_component.yml
+        echo "Added esp_hosted override to idf_component.yml"
+      fi
+    # Add slave target configuration if specified
+    - |
+      if [ ! -z "${IDF_SLAVE_TARGET}" ]; then
+        echo "CONFIG_SLAVE_IDF_TARGET_${IDF_SLAVE_TARGET^^}=y" >> sdkconfig.defaults
+        echo "Added slave target CONFIG_SLAVE_IDF_TARGET_${IDF_SLAVE_TARGET^^}=y to sdkconfig.defaults"
+      fi
     # Build with IDF pedantic flags and IDF build apps script
     - export PEDANTIC_FLAGS="-DIDF_CI_BUILD -Werror -Werror=deprecated-declarations -Werror=unused-variable -Werror=unused-but-set-variable -Werror=unused-function"
     - export EXTRA_CFLAGS="${PEDANTIC_FLAGS} -Wstrict-prototypes"
     - export EXTRA_CXXFLAGS="${PEDANTIC_FLAGS}"
+    # Remove the conflicting extconn config that disables hosted
+    - rm -f sdkconfig.ci.*extconn*
     - idf-build-apps find --config sdkconfig.ci* -vv --target ${IDF_TARGET}
     - idf-build-apps build --config sdkconfig.ci* -vv --target ${IDF_TARGET}
+#    - echo "----------- last sdkconfig.defaults,ci* used (${IDF_TARGET}-${IDF_SLAVE_TARGET}) --------------"
+#    - cat sdkconfig.defaults
+#    - cat sdkconfig.ci*
+#    - echo "----------- last (generated) sdkconfig used (${IDF_TARGET}-${IDF_SLAVE_TARGET}) --------------"
+#    - cat sdkconfig
+#    - echo "----------------------------------------------"
+    # Copy config files back to project directory for artifacts
+    - mkdir -p ${OVERRIDE_PATH}/artifacts_${IDF_TARGET}_${IDF_SLAVE_TARGET}
+    - cp sdkconfig* ${OVERRIDE_PATH}/artifacts_${IDF_TARGET}_${IDF_SLAVE_TARGET}/ 2>/dev/null || echo "No sdkconfig files found"
+    - cp main/idf_component.yml ${OVERRIDE_PATH}/artifacts_${IDF_TARGET}_${IDF_SLAVE_TARGET}/ 2>/dev/null || echo "No component file found"
+    # Clean up the component symlink
+    - unlink components/esp_hosted
+    - echo "Cleaned up esp_hosted component symlink"
     # Rename back, since post scripts expect the original name
     - cd ${OVERRIDE_PATH} && cd .. && mv esp_hosted esp_hosted_mcu
 
 
 build_idf_v5.3:
   extends: .build_template
-  image: espressif/idf:release-v5.3
+  image: espressif/idf:${IDF_VER}
   parallel:
     matrix:
-      - IDF_TARGET: ["esp32p4", "esp32h2", "esp32s3"]
+      - IDF_VER: ["v5.3.1", "v5.3.2", "v5.3.3", "release-v5.3"]
+        IDF_TARGET: ["esp32p4", "esp32h2"]
+        IDF_SLAVE_TARGET: ["esp32c6"]
         IDF_EXAMPLE_PATH: examples/protocols/mqtt/tcp
+        #IDF_EXAMPLE_PATH: [examples/wifi/iperf]
 
 build_idf_v5.4:
   extends: .build_template
-  image: espressif/idf:release-v5.4
+  image: espressif/idf:${IDF_VER}
   parallel:
     matrix:
-      - IDF_TARGET: ["esp32p4", "esp32h2", "esp32s3"]
+      - IDF_VER: ["v5.4", "v5.4.1", "v5.4.2", "release-v5.4"]
+        IDF_TARGET: ["esp32p4", "esp32h2"]
+        IDF_SLAVE_TARGET: ["esp32c6"]
         IDF_EXAMPLE_PATH: examples/protocols/mqtt/tcp
+        #IDF_EXAMPLE_PATH: [examples/wifi/iperf]
 
 build_idf_v5.5:
+  extends: .build_template
+  image: espressif/idf:${IDF_VER}
+  parallel:
+    matrix:
+      - IDF_VER: ["release-v5.5"]
+        IDF_TARGET: ["esp32p4", "esp32h2"]
+        IDF_SLAVE_TARGET: ["esp32c6", "esp32c5", "esp32", "esp32c2", "esp32c3", "esp32s3" ]
+        IDF_EXAMPLE_PATH: [examples/wifi/iperf]
+
+build_idf_master:
   extends: .build_template
   image: espressif/idf:latest
+  allow_failure: true
   parallel:
     matrix:
-      - IDF_TARGET: ["esp32p4", "esp32h2", "esp32s3"]
+      - IDF_TARGET: ["esp32p4", "esp32h2"]
+        IDF_SLAVE_TARGET: ["esp32c6", "esp32c5", "esp32", "esp32c2", "esp32c3", "esp32s3" ]
         IDF_EXAMPLE_PATH: [examples/protocols/mqtt/tcp, examples/wifi/iperf]

CMakeLists.txt

@@ -3,80 +3,82 @@ if(CONFIG_ESP_HOSTED_ENABLED)
 	set(FG_root_dir ".")
 	set(host_dir "${FG_root_dir}/host")
 
-	set(COMPONENT_SRCS "${host_dir}/esp_hosted_host_init.c" "${host_dir}/api/src/esp_wifi_weak.c" "${host_dir}/api/src/esp_hosted_api.c" "${host_dir}/drivers/transport/transport_drv.c" "${host_dir}/drivers/serial/serial_ll_if.c" "${host_dir}/utils/common.c" "${host_dir}/utils/util.c" "${host_dir}/utils/stats.c" "${host_dir}/drivers/serial/serial_drv.c")
+	set(srcs "${host_dir}/esp_hosted_host_init.c" "${host_dir}/api/src/esp_wifi_weak.c" "${host_dir}/api/src/esp_hosted_api.c" "${host_dir}/drivers/transport/transport_drv.c" "${host_dir}/drivers/serial/serial_ll_if.c" "${host_dir}/utils/common.c" "${host_dir}/utils/util.c" "${host_dir}/utils/stats.c" "${host_dir}/drivers/serial/serial_drv.c")
 
 	# only these directories are public. Others are private
-	set(COMPONENT_ADD_PUBLIC_INCLUDEDIRS "${host_dir}" "${host_dir}/api/include")
+	set(pub_include "${host_dir}" "${host_dir}/api/include")
 
-	set(COMPONENT_ADD_INCLUDEDIRS "${host_dir}/drivers/transport" "${host_dir}/drivers/transport/spi" "${host_dir}/drivers/transport/sdio" "${host_dir}/drivers/serial" "${host_dir}/utils")
+	set(priv_include "${host_dir}/drivers/transport" "${host_dir}/drivers/transport/spi" "${host_dir}/drivers/transport/sdio" "${host_dir}/drivers/serial" "${host_dir}/utils" "${host_dir}/api/priv")
 
 	# rpc files - wrap -> slaveif -> core
 	set(rpc_dir "${host_dir}/drivers/rpc")
 	set(rpc_core_dir "${rpc_dir}/core")
 	set(rpc_slaveif_dir "${rpc_dir}/slaveif")
 	set(rpc_wrap_dir "${rpc_dir}/wrap")
-	list(APPEND COMPONENT_SRCS  "${rpc_core_dir}/rpc_core.c" "${rpc_core_dir}/rpc_req.c" "${rpc_core_dir}/rpc_rsp.c" "${rpc_core_dir}/rpc_evt.c"
+	list(APPEND srcs  "${rpc_core_dir}/rpc_core.c" "${rpc_core_dir}/rpc_req.c" "${rpc_core_dir}/rpc_rsp.c" "${rpc_core_dir}/rpc_evt.c"
 		"${rpc_slaveif_dir}/rpc_slave_if.c"
 		"${rpc_wrap_dir}/rpc_wrap.c")
-	list(APPEND COMPONENT_ADD_INCLUDEDIRS "${rpc_core_dir}" "${rpc_slaveif_dir}" "${rpc_wrap_dir}")
+	list(APPEND priv_include "${rpc_core_dir}" "${rpc_slaveif_dir}" "${rpc_wrap_dir}")
 
 	# virtual serial
 	set(virt_serial_dir "${host_dir}/drivers/virtual_serial_if")
-	list(APPEND COMPONENT_SRCS  "${virt_serial_dir}/serial_if.c")
-	list(APPEND COMPONENT_ADD_INCLUDEDIRS "${virt_serial_dir}")
+	list(APPEND srcs  "${virt_serial_dir}/serial_if.c")
+	list(APPEND priv_include "${virt_serial_dir}")
 
 	# mempool
-	list(APPEND COMPONENT_SRCS "${host_dir}/drivers/mempool/mempool.c")
-	list(APPEND COMPONENT_ADD_INCLUDEDIRS "${host_dir}/drivers/mempool" )
+	list(APPEND srcs "${host_dir}/drivers/mempool/mempool.c")
+	list(APPEND priv_include "${host_dir}/drivers/mempool" )
 
 	# slave and host common files
 	set(common_dir "${FG_root_dir}/common")
-	list(APPEND COMPONENT_SRCS "${common_dir}/protobuf-c/protobuf-c/protobuf-c.c" "${common_dir}/proto/esp_hosted_rpc.pb-c.c" )
-	list(APPEND COMPONENT_ADD_INCLUDEDIRS "${common_dir}" "${common_dir}/log" "${common_dir}/rpc" "${common_dir}/transport" "${common_dir}/protobuf-c" "${common_dir}/proto" )
+	list(APPEND srcs "${common_dir}/protobuf-c/protobuf-c/protobuf-c.c" "${common_dir}/proto/esp_hosted_rpc.pb-c.c" )
+	list(APPEND priv_include "${common_dir}" "${common_dir}/log" "${common_dir}/rpc" "${common_dir}/transport" "${common_dir}/protobuf-c" "${common_dir}/proto" )
+
+	# host ESP32 specific files
+	list(APPEND srcs "${host_dir}/port/esp/freertos/src/esp_hosted_ota.c")
 
 	# bt (NimBLE)
 	### TODO config for HCI over UART
-	list(APPEND COMPONENT_ADD_INCLUDEDIRS "${host_dir}/drivers/bt")
+	list(APPEND priv_include "${host_dir}/drivers/bt")
 	if(CONFIG_ESP_HOSTED_NIMBLE_HCI_VHCI OR CONFIG_ESP_HOSTED_BLUEDROID_HCI_VHCI)
-		list(APPEND COMPONENT_SRCS "${host_dir}/drivers/bt/vhci_drv.c")
+		list(APPEND srcs "${host_dir}/drivers/bt/vhci_drv.c")
 	else()
-		list(APPEND COMPONENT_SRCS "${host_dir}/drivers/bt/hci_stub_drv.c")
+		list(APPEND srcs "${host_dir}/drivers/bt/hci_stub_drv.c")
 	endif()
 
 	# transport files
 	if(CONFIG_ESP_HOSTED_SDIO_HOST_INTERFACE)
-		list(APPEND COMPONENT_SRCS "${host_dir}/drivers/transport/sdio/sdio_drv.c")
+		list(APPEND srcs "${host_dir}/drivers/transport/sdio/sdio_drv.c")
 	elseif(CONFIG_ESP_HOSTED_SPI_HD_HOST_INTERFACE)
-		list(APPEND COMPONENT_SRCS "${host_dir}/drivers/transport/spi_hd/spi_hd_drv.c")
+		list(APPEND srcs "${host_dir}/drivers/transport/spi_hd/spi_hd_drv.c")
 	elseif(CONFIG_ESP_HOSTED_SPI_HOST_INTERFACE)
-		list(APPEND COMPONENT_SRCS "${host_dir}/drivers/transport/spi/spi_drv.c")
+		list(APPEND srcs "${host_dir}/drivers/transport/spi/spi_drv.c")
 	elseif(CONFIG_ESP_HOSTED_UART_HOST_INTERFACE)
-		list(APPEND COMPONENT_SRCS "${host_dir}/drivers/transport/uart/uart_drv.c")
+		list(APPEND srcs "${host_dir}/drivers/transport/uart/uart_drv.c")
 	endif()
 
 	# config files
-	list(APPEND COMPONENT_ADD_INCLUDEDIRS "${host_dir}/port/include")
-	list(APPEND COMPONENT_SRCS "${host_dir}/port/src/esp_hosted_config.c" "${host_dir}/port/src/esp_hosted_transport_config.c")
+	list(APPEND priv_include "${host_dir}/port/esp/freertos/include")
+	list(APPEND srcs "${host_dir}/port/esp/freertos/src/esp_hosted_config.c" "${host_dir}/port/esp/freertos/src/esp_hosted_transport_config.c")
 
 	# transport port files
-	list(APPEND COMPONENT_SRCS "${host_dir}/port/src/os_wrapper.c")
+	list(APPEND srcs "${host_dir}/port/esp/freertos/src/os_wrapper.c")
 	if(CONFIG_ESP_HOSTED_SDIO_HOST_INTERFACE)
-		list(APPEND COMPONENT_SRCS "${host_dir}/port/src/sdio_wrapper.c")
+		list(APPEND srcs "${host_dir}/port/esp/freertos/src/sdio_wrapper.c")
 	elseif(CONFIG_ESP_HOSTED_SPI_HD_HOST_INTERFACE)
-		list(APPEND COMPONENT_SRCS "${host_dir}/port/src/spi_hd_wrapper.c")
+		list(APPEND srcs "${host_dir}/port/esp/freertos/src/spi_hd_wrapper.c")
 	elseif(CONFIG_ESP_HOSTED_SPI_HOST_INTERFACE)
-		list(APPEND COMPONENT_SRCS "${host_dir}/port/src/spi_wrapper.c")
+		list(APPEND srcs "${host_dir}/port/esp/freertos/src/spi_wrapper.c")
 	elseif(CONFIG_ESP_HOSTED_UART_HOST_INTERFACE)
-		list(APPEND COMPONENT_SRCS "${host_dir}/port/src/uart_wrapper.c")
+		list(APPEND srcs "${host_dir}/port/esp/freertos/src/uart_wrapper.c")
 	endif()
 
 endif()
 
-idf_component_register(SRCS ${COMPONENT_SRCS}
+idf_component_register(SRCS ${srcs}
 	PRIV_REQUIRES soc esp_event esp_netif esp_timer driver esp_wifi bt esp_http_client
-	EXCLUDE_SRCS ${EXCLUDE_COMPONENT_SRCS}
-	INCLUDE_DIRS ${COMPONENT_ADD_PUBLIC_INCLUDEDIRS}
-	PRIV_INCLUDE_DIRS ${COMPONENT_ADD_INCLUDEDIRS})
+	INCLUDE_DIRS ${pub_include}
+	PRIV_INCLUDE_DIRS ${priv_include})
 
 idf_component_set_property(${COMPONENT_NAME} WHOLE_ARCHIVE TRUE)