upstream

components/bt/common/ble_log/Kconfig.in

@@ -7,6 +7,8 @@ config BLE_LOG_ENABLED
 if BLE_LOG_ENABLED
     config BLE_LOG_TASK_STACK_SIZE
         int "Stack size for BLE Log Task"
+        default 1024 if IDF_TARGET_ARCH_RISCV
+        default 2048 if IDF_TARGET_ARCH_XTENSA
         default 1024
         help
             Stack size for BLE Log Task

components/bt/common/ble_log/ble_log_spi_out.c

@@ -41,7 +41,14 @@
 #define SPI_OUT_LOG_STR_BUF_SIZE                (100)
 #define SPI_OUT_MALLOC(size)                    heap_caps_malloc(size, MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT)
 #define SPI_OUT_TASK_PRIORITY                   (ESP_TASK_PRIO_MAX - 1)
+
+#if CONFIG_IDF_TARGET_ARCH_RISCV
 #define SPI_OUT_TASK_STACK_SIZE                 (1024)
+#elif CONFIG_IDF_TARGET_ARCH_XTENSA
+#define SPI_OUT_TASK_STACK_SIZE                 (2048)
+#else
+static_assert(false, "BLE Log SPI Out: Unsupported target architecture");
+#endif /* CONFIG_IDF_TARGET_ARCH_RISCV */
 
 #if SPI_OUT_TS_SYNC_ENABLED
 #define SPI_OUT_TS_SYNC_TIMEOUT_MS              (1000)

components/bt/common/btc/core/btc_alarm.c

@@ -12,7 +12,7 @@ void btc_alarm_handler(btc_msg_t *msg)
 {
     btc_alarm_args_t *arg = (btc_alarm_args_t *)msg->arg;
 
-    BTC_TRACE_DEBUG("%s act %d\n", __FUNCTION__, msg->act);
+    BTC_TRACE_DEBUG("%s act %d", __func__, msg->act);
 
     if (arg->cb) {
         arg->cb(arg->cb_data);

components/bt/common/include/bt_common.h

@@ -238,6 +238,7 @@ typedef uint64_t UINT64;
 typedef bool BOOLEAN;
 /* Maximum UUID size - 16 bytes, and structure to hold any type of UUID. */
 #define MAX_UUID_SIZE              16
+#define MAX_UUID_NUM               32
 
 typedef struct {
 #define LEN_UUID_16     2

components/bt/common/osi/allocator.c

@@ -241,8 +241,5 @@ void *osi_calloc_func(size_t size)
 
 void osi_free_func(void *ptr)
 {
-#if HEAP_MEMORY_DEBUG
-    osi_mem_dbg_clean(ptr, __func__, __LINE__);
-#endif
-    free(ptr);
+    osi_free(ptr);
 }

components/bt/controller/esp32c6/Kconfig.in

@@ -977,3 +977,11 @@ menu "Scheduling Priority Level Config"
         default 2 if BT_LE_SYNC_SCHED_PRIO_HIGH_LEVEL
         default 1
 endmenu
+
+config BT_LE_CTRL_SLV_FAST_RX_CONN_DATA_EN
+    bool "Enable Peripheral fast PDU reception during latency"
+    default n
+    help
+        When this option is enabled, the Controller continues receiving PDUs
+        In the next connection event instead of entering latency
+        After a data packet is received.

components/bt/controller/esp32c6/bt.c

@@ -170,7 +170,7 @@ extern void esp_unregister_npl_funcs (void);
 extern void npl_freertos_mempool_deinit(void);
 extern uint32_t r_os_cputime_get32(void);
 extern uint32_t r_os_cputime_ticks_to_usecs(uint32_t ticks);
-extern void r_ble_lll_rfmgmt_set_sleep_cb(void *s_cb, void *w_cb, void *s_arg,
+extern void r_ble_lll_sleep_set_sleep_cb(void *s_cb, void *w_cb, void *s_arg,
                                           void *w_arg, uint32_t us_to_enabled);
 extern void r_ble_rtc_wake_up_state_clr(void);
 extern int os_msys_init(void);
@@ -851,10 +851,10 @@ esp_err_t controller_sleep_init(void)
 #ifdef CONFIG_BT_LE_SLEEP_ENABLE
     ESP_LOGW(NIMBLE_PORT_LOG_TAG, "BLE modem sleep is enabled");
 #if CONFIG_FREERTOS_USE_TICKLESS_IDLE
-    r_ble_lll_rfmgmt_set_sleep_cb(controller_sleep_cb, controller_wakeup_cb, 0, 0,
+    r_ble_lll_sleep_set_sleep_cb(controller_sleep_cb, controller_wakeup_cb, 0, 0,
                                 BLE_RTC_DELAY_US_LIGHT_SLEEP);
 #else
-    r_ble_lll_rfmgmt_set_sleep_cb(controller_sleep_cb, controller_wakeup_cb, 0, 0,
+    r_ble_lll_sleep_set_sleep_cb(controller_sleep_cb, controller_wakeup_cb, 0, 0,
                                 BLE_RTC_DELAY_US_MODEM_SLEEP);
 #endif /* FREERTOS_USE_TICKLESS_IDLE */
 #endif // CONFIG_BT_LE_SLEEP_ENABLE

components/bt/controller/esp32c6/esp_bt_cfg.h

@@ -212,6 +212,12 @@ extern "C" {
 #define DEFAULT_BT_LE_CTRL_FAST_CONN_DATA_TX_EN (0)
 #endif
 
+#if defined(CONFIG_BT_LE_CTRL_SLV_FAST_RX_CONN_DATA_EN)
+#define DEFAULT_BT_LE_CTRL_SLV_FAST_RX_CONN_DATA_EN (CONFIG_BT_LE_CTRL_SLV_FAST_RX_CONN_DATA_EN)
+#else
+#define DEFAULT_BT_LE_CTRL_SLV_FAST_RX_CONN_DATA_EN (0)
+#endif
+
 #ifdef CONFIG_BT_LE_HCI_INTERFACE_USE_UART
 #define HCI_UART_EN CONFIG_BT_LE_HCI_INTERFACE_USE_UART
 #else

components/bt/controller/esp32h2/Kconfig.in

@@ -981,3 +981,11 @@ menu "Scheduling Priority Level Config"
         default 2 if BT_LE_SYNC_SCHED_PRIO_HIGH_LEVEL
         default 1
 endmenu
+
+config BT_LE_CTRL_SLV_FAST_RX_CONN_DATA_EN
+    bool "Enable Peripheral fast PDU reception during latency"
+    default n
+    help
+        When this option is enabled, the Controller continues receiving PDUs
+        In the next connection event instead of entering latency
+        After a data packet is received.

components/bt/controller/esp32h2/bt.c

@@ -159,7 +159,7 @@ extern void esp_unregister_npl_funcs (void);
 extern void npl_freertos_mempool_deinit(void);
 extern uint32_t r_os_cputime_get32(void);
 extern uint32_t r_os_cputime_ticks_to_usecs(uint32_t ticks);
-extern void r_ble_lll_rfmgmt_set_sleep_cb(void *s_cb, void *w_cb, void *s_arg,
+extern void r_ble_lll_sleep_set_sleep_cb(void *s_cb, void *w_cb, void *s_arg,
                                           void *w_arg, uint32_t us_to_enabled);
 extern void r_ble_rtc_wake_up_state_clr(void);
 extern int os_msys_init(void);
@@ -816,10 +816,10 @@ esp_err_t controller_sleep_init(void)
 #ifdef CONFIG_BT_LE_SLEEP_ENABLE
     ESP_LOGW(NIMBLE_PORT_LOG_TAG, "BLE modem sleep is enabled");
 #if CONFIG_FREERTOS_USE_TICKLESS_IDLE
-    r_ble_lll_rfmgmt_set_sleep_cb(controller_sleep_cb, controller_wakeup_cb, 0, 0,
+    r_ble_lll_sleep_set_sleep_cb(controller_sleep_cb, controller_wakeup_cb, 0, 0,
                                 BLE_RTC_DELAY_US_LIGHT_SLEEP);
 #else
-    r_ble_lll_rfmgmt_set_sleep_cb(controller_sleep_cb, controller_wakeup_cb, 0, 0,
+    r_ble_lll_sleep_set_sleep_cb(controller_sleep_cb, controller_wakeup_cb, 0, 0,
                                 BLE_RTC_DELAY_US_MODEM_SLEEP);
 #endif /* FREERTOS_USE_TICKLESS_IDLE */
 #endif // CONFIG_BT_LE_SLEEP_ENABLE

components/bt/controller/esp32h2/esp_bt_cfg.h

@@ -209,6 +209,12 @@ extern "C" {
 #define DEFAULT_BT_LE_CTRL_FAST_CONN_DATA_TX_EN (0)
 #endif
 
+#if defined(CONFIG_BT_LE_CTRL_SLV_FAST_RX_CONN_DATA_EN)
+#define DEFAULT_BT_LE_CTRL_SLV_FAST_RX_CONN_DATA_EN (CONFIG_BT_LE_CTRL_SLV_FAST_RX_CONN_DATA_EN)
+#else
+#define DEFAULT_BT_LE_CTRL_SLV_FAST_RX_CONN_DATA_EN (0)
+#endif
+
 #ifdef CONFIG_BT_LE_HCI_INTERFACE_USE_UART
 #define HCI_UART_EN CONFIG_BT_LE_HCI_INTERFACE_USE_UART
 #else

components/bt/host/bluedroid/api/esp_hidd_api.c

@@ -133,7 +133,7 @@ esp_err_t esp_bt_hid_device_send_report(esp_hidd_report_type_t type, uint8_t id,
     args.send_report.data = data;
 
     bt_status_t stat = btc_transfer_context(&msg, &args, sizeof(btc_hidd_args_t),
-                                                btc_hd_arg_deep_copy, btc_hd_cb_arg_deep_free);
+                                                btc_hd_arg_deep_copy, btc_hd_call_arg_deep_free);
     return (stat == BT_STATUS_SUCCESS) ? ESP_OK : ESP_FAIL;
 }
 

components/bt/host/bluedroid/api/esp_hidh_api.c

@@ -117,7 +117,7 @@ esp_err_t esp_bt_hid_host_set_info(esp_bd_addr_t bd_addr, esp_hidh_hid_info_t *h
     arg.set_info.hid_info = hid_info;
 
     bt_status_t stat = btc_transfer_context(&msg, &arg, sizeof(btc_hidh_args_t),
-                                                btc_hh_arg_deep_copy, btc_hh_cb_arg_deep_free);
+                                                btc_hh_arg_deep_copy, btc_hh_call_arg_deep_free);
     return (stat == BT_STATUS_SUCCESS) ? ESP_OK : ESP_FAIL;
 }
 
@@ -224,7 +224,7 @@ esp_err_t esp_bt_hid_host_set_report(esp_bd_addr_t bd_addr, esp_hidh_report_type
     arg.set_report.report = report;
 
     bt_status_t stat = btc_transfer_context(&msg, &arg, sizeof(btc_hidh_args_t),
-                                                btc_hh_arg_deep_copy, btc_hh_cb_arg_deep_free);
+                                                btc_hh_arg_deep_copy, btc_hh_call_arg_deep_free);
     return (stat == BT_STATUS_SUCCESS) ? ESP_OK : ESP_FAIL;
 }
 
@@ -243,7 +243,7 @@ esp_err_t esp_bt_hid_host_send_data(esp_bd_addr_t bd_addr, uint8_t *data, size_t
     arg.send_data.data = data;
 
     bt_status_t stat = btc_transfer_context(&msg, &arg, sizeof(btc_hidh_args_t),
-                                                btc_hh_arg_deep_copy, btc_hh_cb_arg_deep_free);
+                                                btc_hh_arg_deep_copy, btc_hh_call_arg_deep_free);
     return (stat == BT_STATUS_SUCCESS) ? ESP_OK : ESP_FAIL;
 }
 

components/bt/host/bluedroid/api/esp_spp_api.c

@@ -145,22 +145,34 @@ esp_err_t esp_spp_disconnect(uint32_t handle)
 
 esp_err_t esp_spp_start_srv(esp_spp_sec_t sec_mask,
                             esp_spp_role_t role, uint8_t local_scn, const char *name)
+{
+    esp_spp_start_srv_cfg_t cfg = {0};
+
+    cfg.local_scn = local_scn;
+    cfg.sec_mask = sec_mask;
+    cfg.role = role;
+    cfg.create_spp_record = true;
+    cfg.name = name;
+    return esp_spp_start_srv_with_cfg(&cfg);
+}
+
+esp_err_t esp_spp_start_srv_with_cfg(const esp_spp_start_srv_cfg_t *cfg)
 {
     btc_msg_t msg;
     btc_spp_args_t arg;
     ESP_BLUEDROID_STATUS_CHECK(ESP_BLUEDROID_STATUS_ENABLED);
 
-    if (name == NULL || strlen(name) > ESP_SPP_SERVER_NAME_MAX) {
+    if (cfg == NULL || cfg->name == NULL || strlen(cfg->name) > ESP_SPP_SERVER_NAME_MAX) {
         LOG_ERROR("Invalid server name!\n");
         return ESP_ERR_INVALID_ARG;
     }
 
-    if (sec_mask != ESP_SPP_SEC_NONE &&
-        sec_mask != ESP_SPP_SEC_AUTHENTICATE &&
-        sec_mask != (ESP_SPP_SEC_AUTHENTICATE | ESP_SPP_SEC_ENCRYPT) &&
-        sec_mask != ESP_SPP_SEC_IN_16_DIGITS &&
-        sec_mask != (ESP_SPP_SEC_IN_16_DIGITS | ESP_SPP_SEC_AUTHENTICATE) &&
-        sec_mask != (ESP_SPP_SEC_IN_16_DIGITS | ESP_SPP_SEC_AUTHENTICATE | ESP_SPP_SEC_ENCRYPT)) {
+    if (cfg->sec_mask != ESP_SPP_SEC_NONE &&
+        cfg->sec_mask != ESP_SPP_SEC_AUTHENTICATE &&
+        cfg->sec_mask != (ESP_SPP_SEC_AUTHENTICATE | ESP_SPP_SEC_ENCRYPT) &&
+        cfg->sec_mask != ESP_SPP_SEC_IN_16_DIGITS &&
+        cfg->sec_mask != (ESP_SPP_SEC_IN_16_DIGITS | ESP_SPP_SEC_AUTHENTICATE) &&
+        cfg->sec_mask != (ESP_SPP_SEC_IN_16_DIGITS | ESP_SPP_SEC_AUTHENTICATE | ESP_SPP_SEC_ENCRYPT)) {
         LOG_WARN("Suggest to use ESP_SPP_SEC_NONE, ESP_SPP_SEC_AUTHENTICATE,"
                  "(ESP_SPP_SEC_AUTHENTICATE | ESP_SPP_SEC_ENCRYPT),"
                  "ESP_SPP_SEC_IN_16_DIGITS, (ESP_SPP_SEC_IN_16_DIGITS | ESP_SPP_SEC_AUTHENTICATE), or"
@@ -171,11 +183,12 @@ esp_err_t esp_spp_start_srv(esp_spp_sec_t sec_mask,
     msg.pid = BTC_PID_SPP;
     msg.act = BTC_SPP_ACT_START_SRV;
 
-    arg.start_srv.sec_mask = sec_mask;
-    arg.start_srv.role = role;
-    arg.start_srv.local_scn = local_scn;
+    arg.start_srv.sec_mask = cfg->sec_mask;
+    arg.start_srv.role = cfg->role;
+    arg.start_srv.local_scn = cfg->local_scn;
+    arg.start_srv.create_spp_record = cfg->create_spp_record;
     arg.start_srv.max_session = ESP_SPP_MAX_SESSION;
-    strcpy(arg.start_srv.name, name);
+    strcpy(arg.start_srv.name, cfg->name);
 
     return (btc_transfer_context(&msg, &arg, sizeof(btc_spp_args_t), NULL, NULL) == BT_STATUS_SUCCESS ? ESP_OK : ESP_FAIL);
 }

components/bt/host/bluedroid/api/include/api/esp_spp_api.h

@@ -74,14 +74,25 @@ typedef enum {
 } esp_spp_mode_t;
 
 /**
- * @brief SPP configuration parameters
+ * @brief SPP initialization configuration parameters.
  */
 typedef struct {
     esp_spp_mode_t mode;                  /*!< Choose the mode of SPP, ESP_SPP_MODE_CB or ESP_SPP_MODE_VFS. */
     bool enable_l2cap_ertm;               /*!< Enable/disable Logical Link Control and Adaptation Layer Protocol enhanced retransmission mode. */
     uint16_t tx_buffer_size;              /*!< Tx buffer size for a new SPP channel. A smaller setting can save memory, but may incur a decrease in throughput. Only for ESP_SPP_MODE_VFS mode. */
 } esp_spp_cfg_t;
 
+/**
+ * @brief SPP start server configuration parameters.
+ */
+typedef struct {
+    uint8_t local_scn;                     /*!< The specific channel you want to get. If channel is 0, means get any channel. */
+    bool create_spp_record;                /*!< Specifies whether to create the SPP record */
+    esp_spp_sec_t sec_mask;                /*!< Security Setting Mask. Suggest to use ESP_SPP_SEC_NONE, ESP_SPP_SEC_AUTHORIZE or ESP_SPP_SEC_AUTHENTICATE only */
+    esp_spp_role_t role;                   /*!< Master or slave. */
+    const char *name;                      /*!< Server's name. */
+} esp_spp_start_srv_cfg_t;
+
 /**
  * @brief SPP callback function events
  */
@@ -368,6 +379,19 @@ esp_err_t esp_spp_disconnect(uint32_t handle);
  */
 esp_err_t esp_spp_start_srv(esp_spp_sec_t sec_mask, esp_spp_role_t role, uint8_t local_scn, const char *name);
 
+/**
+ * @brief       This function is similar to `esp_spp_start_srv`.
+ *              The only difference is that it adds a parameter to specify whether to create the SPP record.
+ * @note        If the SPP record is not created, it is suggested to use it together with the SDP API.
+ *
+ * @param[in]   cfg:          Configuration parameters for starting the server.
+ *
+ * @return
+ *              - ESP_OK: success
+ *              - other: failed
+ */
+esp_err_t esp_spp_start_srv_with_cfg(const esp_spp_start_srv_cfg_t *cfg);
+
 /**
  * @brief       This function stops all SPP servers.
  *              The operation will close all active SPP connection first, then the callback function will be called

components/bt/host/bluedroid/bta/dm/bta_dm_act.c

@@ -2056,7 +2056,7 @@ void bta_dm_sdp_result (tBTA_DM_MSG *p_data)
 #endif
 
     UINT32 num_uuids = 0;
-    UINT8  uuid_list[32][MAX_UUID_SIZE]; // assuming a max of 32 services
+    UINT8  uuid_list[MAX_UUID_NUM][MAX_UUID_SIZE]; // assuming a max of MAX_UUID_NUM services
 
     if ((p_data->sdp_event.sdp_result == SDP_SUCCESS)
             || (p_data->sdp_event.sdp_result == SDP_NO_RECS_MATCH)
@@ -2119,8 +2119,12 @@ void bta_dm_sdp_result (tBTA_DM_MSG *p_data)
                             (tBTA_SERVICE_MASK)(BTA_SERVICE_ID_TO_SERVICE_MASK(bta_dm_search_cb.service_index - 1));
                         tmp_svc = bta_service_id_to_uuid_lkup_tbl[bta_dm_search_cb.service_index - 1];
                         /* Add to the list of UUIDs */
-                        sdpu_uuid16_to_uuid128(tmp_svc, uuid_list[num_uuids]);
-                        num_uuids++;
+                        if (num_uuids < MAX_UUID_NUM) {
+                            sdpu_uuid16_to_uuid128(tmp_svc, uuid_list[num_uuids]);
+                            num_uuids++;
+                        } else {
+                            APPL_TRACE_WARNING("only process the first %d records\n", MAX_UUID_NUM);
+                        }
                     }
                 }
             }
@@ -2154,8 +2158,13 @@ void bta_dm_sdp_result (tBTA_DM_MSG *p_data)
                 p_sdp_rec = SDP_FindServiceInDb_128bit(bta_dm_search_cb.p_sdp_db, p_sdp_rec);
                 if (p_sdp_rec) {
                     if (SDP_FindServiceUUIDInRec_128bit(p_sdp_rec, &temp_uuid)) {
-                        memcpy(uuid_list[num_uuids], temp_uuid.uu.uuid128, MAX_UUID_SIZE);
-                        num_uuids++;
+                        if (num_uuids < MAX_UUID_NUM) {
+                            memcpy(uuid_list[num_uuids], temp_uuid.uu.uuid128, MAX_UUID_SIZE);
+                            num_uuids++;
+                        } else {
+                            APPL_TRACE_WARNING("only process the first %d records\n", MAX_UUID_NUM);
+                            break;
+                        }
                     }
                 }
             } while (p_sdp_rec);