esp32c6: add ble support

Brings necessary changes to enable BLE support.

Signed-off-by: Sylvio Alves <[email protected]>

Author: sylvioalves

components/bt/porting/transport/include/esp_hci_driver.h

@@ -37,45 +37,8 @@ typedef struct hci_driver_ops {
     void (*hci_driver_deinit)(void);
 } hci_driver_ops_t;
 
-
 #if CONFIG_BT_LE_HCI_INTERFACE_USE_RAM
 extern hci_driver_ops_t hci_driver_vhci_ops;
 #endif // CONFIG_BT_LE_HCI_INTERFACE_USE_RAM
 
-#if CONFIG_BT_LE_HCI_INTERFACE_USE_UART
-#if CONFIG_BT_LE_UART_HCI_DMA_MODE
-extern hci_driver_ops_t hci_driver_uart_dma_ops;
-/**
- * @brief Reconfigure the UART pins for the HCI driver.
- *
- * This function changes the UART pin configuration for the HCI driver.
- *
- * @param tx_pin   The pin number for the UART TX (transmit) line.
- * @param rx_pin   The pin number for the UART RX (receive) line.
- * @param cts_pin  The pin number for the UART CTS (clear to send) line.
- * @param rts_pin  The pin number for the UART RTS (request to send) line.
- *
- * @return int     Returns 0 on success, or a negative error code on failure.
- */
-int hci_driver_uart_dma_reconfig_pin(int tx_pin, int rx_pin, int cts_pin, int rts_pin);
-#define hci_uart_reconfig_pin               hci_driver_uart_dma_reconfig_pin
-#else
-extern hci_driver_ops_t hci_driver_uart_ops;
-/**
- * @brief Reconfigure the UART pins for the HCI driver.
- *
- * This function changes the UART pin configuration for the HCI driver.
- *
- * @param tx_pin   The pin number for the UART TX (transmit) line.
- * @param rx_pin   The pin number for the UART RX (receive) line.
- * @param cts_pin  The pin number for the UART CTS (clear to send) line.
- * @param rts_pin  The pin number for the UART RTS (request to send) line.
- *
- * @return int     Returns 0 on success, or a negative error code on failure.
- */
-int hci_driver_uart_reconfig_pin(int tx_pin, int rx_pin, int cts_pin, int rts_pin);
-#define hci_uart_reconfig_pin               hci_driver_uart_reconfig_pin
-#endif // CONFIG_BT_LE_UART_HCI_DMA_MODE
-#endif // CONFIG_BT_LE_HCI_INTERFACE_USE_UART
-
 #endif // H_ESP_HCI_DRIVER_

components/bt/porting/transport/src/hci_transport.c

@@ -131,17 +131,6 @@ hci_transport_init(uint8_t hci_transport_mode)
             ops = &hci_driver_vhci_ops;
             break;
 #endif // CONFIG_BT_LE_HCI_INTERFACE_USE_RAM
-#if CONFIG_BT_LE_HCI_INTERFACE_USE_UART
-#if CONFIG_BT_LE_UART_HCI_DMA_MODE
-        case HCI_TRANSPORT_UART_UHCI:
-            ops = &hci_driver_uart_dma_ops;
-            break;
-#else
-        case HCI_TRANSPORT_UART_NO_DMA:
-            ops = &hci_driver_uart_ops;
-            break;
-#endif // CONFIG_BT_LE_UART_HCI_DMA_MODE
-#endif // CONFIG_BT_LE_HCI_INTERFACE_USE_UART
         default:
             assert(0);
     }

zephyr/esp32c6/CMakeLists.txt

@@ -14,8 +14,7 @@ if(CONFIG_SOC_SERIES_ESP32C6)
 
   zephyr_include_directories(
     include
-    ../esp_shared/include
-    ../esp_shared/components/include
+    include/bt
     ../port/include
     ../common/include
 
@@ -112,6 +111,10 @@ if(CONFIG_SOC_SERIES_ESP32C6)
     ../../components/ulp/lp_core/lp_core/include
     ../../components/ulp/lp_core/shared/include
     ../../components/ulp/ulp_common/include
+
+    src/bt/porting/include
+    src/bt/porting/npl/zephyr/include
+    src/bt/porting/transport/include
   )
 
   zephyr_link_libraries(
@@ -232,6 +235,7 @@ if(CONFIG_SOC_SERIES_ESP32C6)
     ../../components/esp_hw_support/adc_share_hw_ctrl.c
     ../../components/esp_hw_support/cpu.c
     ../../components/esp_hw_support/clk_ctrl_os.c
+    ../../components/esp_hw_support/hw_random.c
     ../../components/esp_hw_support/esp_clk.c
     ../../components/esp_hw_support/mac_addr.c
     ../../components/esp_hw_support/modem_clock.c
@@ -436,12 +440,32 @@ if(CONFIG_SOC_SERIES_ESP32C6)
 
   ## BT definitions
   if (CONFIG_BT)
-    zephyr_sources(src/bt/esp_bt_adapter.c)
+
+    zephyr_sources(
+      ../../components/esp_phy/src/btbb_init.c
+      src/bt/esp_bt_adapter.c
+      src/bt/esp_ble_adapter.c
+      src/bt/porting/npl/zephyr/src/npl_os_zephyr.c
+      src/bt/porting/mem/bt_osi_mem.c
+      src/bt/porting/mem/os_msys_init.c
+      src/bt/porting/transport/src/hci_transport.c
+      src/bt/porting/transport/driver/vhci/hci_driver_standard.c
+      )
+
     zephyr_compile_definitions(CONFIG_BT_ENABLED)
+    zephyr_compile_definitions(CONFIG_BT_CONTROLLER_ENABLED)
 
-    zephyr_link_libraries(
+    zephyr_sources_ifdef(
+      CONFIG_BUILD_ONLY_NO_BLOBS
+      ../port/bluetooth/bt_stubs.c
+      ../port/phy/phy_stubs.c
+      )
+
+    zephyr_link_libraries_ifndef(
+      CONFIG_BUILD_ONLY_NO_BLOBS
       ## ble
       btbb
+      ble_app
         -L${CMAKE_CURRENT_SOURCE_DIR}/../blobs/lib/${CONFIG_SOC_SERIES}
       )
 

zephyr/esp32c6/include/bt/ble_priv.h

@@ -0,0 +1,12 @@
+/*
+ * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+int ble_stack_initEnv(void);
+
+void ble_stack_deinitEnv(void);
+
+int ble_stack_enable(void);
+
+void ble_stack_disable(void);