Merge branch 'feature/add_di_api' into 'master'

Feature/add di api Closes IDFGH-11785 See merge request espressif/esp-idf!32872
2025-12-07 09:02:08 +00:00 · 2024-09-06 17:11:19 +08:00
parent 386420067a be1c677bdd
commit ca05aa5cd2
28 changed files with 931 additions and 442 deletions
--- a/examples/bluetooth/bluedroid/classic_bt/bt_l2cap_client/main/main.c
+++ b/examples/bluetooth/bluedroid/classic_bt/bt_l2cap_client/main/main.c
@@ -331,7 +331,7 @@ static void esp_sdp_cb(esp_sdp_cb_event_t event, esp_sdp_cb_param_t *param)

 static void esp_hdl_sdp_cb_evt(uint16_t event, void *p_param)
 {
-    esp_bluetooth_sdp_record_t record = {0};
+    esp_bluetooth_sdp_raw_record_t record = {0};
    esp_sdp_cb_param_t *sdp_param = (esp_sdp_cb_param_t *)p_param;
    char bda_str[18] = {0};

@@ -340,14 +340,16 @@ static void esp_hdl_sdp_cb_evt(uint16_t event, void *p_param)
        ESP_LOGI(SDP_TAG, "ESP_SDP_INIT_EVT: status:%d", sdp_param->init.status);
        if (sdp_param->init.status == ESP_SDP_SUCCESS) {
            record.hdr.type = ESP_SDP_TYPE_RAW;
-            record.hdr.uuid.len = sizeof(UUID_UNKNOWN);
-            memcpy(record.hdr.uuid.uuid.uuid128, UUID_UNKNOWN, sizeof(UUID_UNKNOWN));
            record.hdr.service_name_length = strlen(sdp_service_name) + 1;
            record.hdr.service_name = sdp_service_name;
            record.hdr.rfcomm_channel_number = BT_UNUSED_RFCOMM;
            record.hdr.l2cap_psm = BT_L2CAP_DYNMIC_PSM;
            record.hdr.profile_version = BT_UNKONWN_PROFILE_VERSION;
-            esp_sdp_create_record(&record);
+            record.uuid.len = sizeof(UUID_UNKNOWN);
+            memcpy(record.uuid.uuid.uuid128, UUID_UNKNOWN, sizeof(UUID_UNKNOWN));
+            record.user1_ptr = NULL;
+            record.user1_ptr_len = 0;
+            esp_sdp_create_record((esp_bluetooth_sdp_record_t *)&record);
        }
        break;
    case ESP_SDP_DEINIT_EVT:
--- a/examples/bluetooth/bluedroid/classic_bt/bt_l2cap_client/sdkconfig.defaults
+++ b/examples/bluetooth/bluedroid/classic_bt/bt_l2cap_client/sdkconfig.defaults
@@ -7,3 +7,4 @@ CONFIG_BTDM_CTRL_MODE_BTDM=n
 CONFIG_BT_BLUEDROID_ENABLED=y
 CONFIG_BT_CLASSIC_ENABLED=y
 CONFIG_BT_L2CAP_ENABLED=y
+CONFIG_BT_SDP_COMMON_ENABLED=y
--- a/examples/bluetooth/bluedroid/classic_bt/bt_l2cap_server/main/main.c
+++ b/examples/bluetooth/bluedroid/classic_bt/bt_l2cap_server/main/main.c
@@ -242,7 +242,7 @@ static void esp_sdp_cb(esp_sdp_cb_event_t event, esp_sdp_cb_param_t *param)

 static void esp_hdl_sdp_cb_evt(uint16_t event, void *p_param)
 {
-    esp_bluetooth_sdp_record_t record = {0};
+    esp_bluetooth_sdp_raw_record_t record = {0};
    esp_sdp_cb_param_t *sdp_param = (esp_sdp_cb_param_t *)p_param;

    switch (event) {
@@ -250,14 +250,16 @@ static void esp_hdl_sdp_cb_evt(uint16_t event, void *p_param)
        ESP_LOGI(SDP_TAG, "ESP_SDP_INIT_EVT: status:%d", sdp_param->init.status);
        if (sdp_param->init.status == ESP_SDP_SUCCESS) {
            record.hdr.type = ESP_SDP_TYPE_RAW;
-            record.hdr.uuid.len = sizeof(UUID_UNKNOWN);
-            memcpy(record.hdr.uuid.uuid.uuid128, UUID_UNKNOWN, sizeof(UUID_UNKNOWN));
            record.hdr.service_name_length = strlen(sdp_service_name) + 1;
            record.hdr.service_name = sdp_service_name;
            record.hdr.rfcomm_channel_number = BT_UNUSED_RFCOMM;
            record.hdr.l2cap_psm = BT_L2CAP_DYNMIC_PSM;
            record.hdr.profile_version = BT_UNKONWN_PROFILE_VERSION;
-            esp_sdp_create_record(&record);
+            record.uuid.len = sizeof(UUID_UNKNOWN);
+            memcpy(record.uuid.uuid.uuid128, UUID_UNKNOWN, sizeof(UUID_UNKNOWN));
+            record.user1_ptr = NULL;
+            record.user1_ptr_len = 0;
+            esp_sdp_create_record((esp_bluetooth_sdp_record_t *)&record);
        }
        break;
    case ESP_SDP_DEINIT_EVT:
--- a/examples/bluetooth/bluedroid/classic_bt/bt_l2cap_server/sdkconfig.defaults
+++ b/examples/bluetooth/bluedroid/classic_bt/bt_l2cap_server/sdkconfig.defaults
@@ -7,3 +7,4 @@ CONFIG_BTDM_CTRL_MODE_BTDM=n
 CONFIG_BT_BLUEDROID_ENABLED=y
 CONFIG_BT_CLASSIC_ENABLED=y
 CONFIG_BT_L2CAP_ENABLED=y
+CONFIG_BT_SDP_COMMON_ENABLED=y
--- a/examples/bluetooth/esp_hid_device/main/esp_hid_device_main.c
+++ b/examples/bluetooth/esp_hid_device/main/esp_hid_device_main.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
 *
 * SPDX-License-Identifier: Unlicense OR CC0-1.0
 */
@@ -32,6 +32,9 @@
 #endif
 #include "esp_bt_main.h"
 #include "esp_bt_device.h"
+#if CONFIG_BT_SDP_COMMON_ENABLED
+#include "esp_sdp_api.h"
+#endif /* CONFIG_BT_SDP_COMMON_ENABLED */
 #endif

 #include "esp_hidd.h"
@@ -847,6 +850,47 @@ static void bt_hidd_event_callback(void *handler_args, esp_event_base_t base, in
    }
    return;
 }
+
+#if CONFIG_BT_SDP_COMMON_ENABLED
+static void esp_sdp_cb(esp_sdp_cb_event_t event, esp_sdp_cb_param_t *param)
+{
+    switch (event) {
+    case ESP_SDP_INIT_EVT:
+        ESP_LOGI(TAG, "ESP_SDP_INIT_EVT: status:%d", param->init.status);
+        if (param->init.status == ESP_SDP_SUCCESS) {
+            esp_bluetooth_sdp_dip_record_t dip_record = {
+                .hdr =
+                    {
+                        .type = ESP_SDP_TYPE_DIP_SERVER,
+                    },
+                .vendor           = bt_hid_config.vendor_id,
+                .vendor_id_source = ESP_SDP_VENDOR_ID_SRC_BT,
+                .product          = bt_hid_config.product_id,
+                .version          = bt_hid_config.version,
+                .primary_record   = true,
+            };
+            esp_sdp_create_record((esp_bluetooth_sdp_record_t *)&dip_record);
+        }
+        break;
+    case ESP_SDP_DEINIT_EVT:
+        ESP_LOGI(TAG, "ESP_SDP_DEINIT_EVT: status:%d", param->deinit.status);
+        break;
+    case ESP_SDP_SEARCH_COMP_EVT:
+        ESP_LOGI(TAG, "ESP_SDP_SEARCH_COMP_EVT: status:%d", param->search.status);
+        break;
+    case ESP_SDP_CREATE_RECORD_COMP_EVT:
+        ESP_LOGI(TAG, "ESP_SDP_CREATE_RECORD_COMP_EVT: status:%d, handle:0x%x", param->create_record.status,
+                 param->create_record.record_handle);
+        break;
+    case ESP_SDP_REMOVE_RECORD_COMP_EVT:
+        ESP_LOGI(TAG, "ESP_SDP_REMOVE_RECORD_COMP_EVT: status:%d", param->remove_record.status);
+        break;
+    default:
+        break;
+    }
+}
+#endif /* CONFIG_BT_SDP_COMMON_ENABLED */
+
 #endif

 #if CONFIG_BT_NIMBLE_ENABLED
@@ -911,7 +955,11 @@ void app_main(void)
    ESP_LOGI(TAG, "setting bt device");
    ESP_ERROR_CHECK(
        esp_hidd_dev_init(&bt_hid_config, ESP_HID_TRANSPORT_BT, bt_hidd_event_callback, &s_bt_hid_param.hid_dev));
-#endif
+#if CONFIG_BT_SDP_COMMON_ENABLED
+    ESP_ERROR_CHECK(esp_sdp_register_callback(esp_sdp_cb));
+    ESP_ERROR_CHECK(esp_sdp_init());
+#endif /* CONFIG_BT_SDP_COMMON_ENABLED */
+#endif /* CONFIG_BT_HID_DEVICE_ENABLED */
 #if CONFIG_BT_NIMBLE_ENABLED
    /* XXX Need to have template for store */
    ble_store_config_init();
--- a/examples/bluetooth/esp_hid_device/sdkconfig.defaults
+++ b/examples/bluetooth/esp_hid_device/sdkconfig.defaults
@@ -5,5 +5,6 @@ CONFIG_BT_CLASSIC_ENABLED=y
 CONFIG_BT_BLE_ENABLED=y
 CONFIG_BT_HID_ENABLED=y
 CONFIG_BT_HID_DEVICE_ENABLED=y
+CONFIG_BT_SDP_COMMON_ENABLED=y
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
 CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y