Просмотр исходного кода

Merge branch 'nimble/fix_host_flow_ctrl_v4.2' into 'release/v4.2'

NimBLE: Fix host flow control in NimBLE porting layer and host (release/v4.2)

See merge request espressif/esp-idf!13571
Island 4 лет назад
Родитель
Сommit
d9ec7df393

+ 3 - 1
components/bt/host/nimble/esp-hci/src/esp_nimble_hci.c

@@ -211,7 +211,9 @@ void ble_hci_trans_buf_free(uint8_t *buf)
  */
 int ble_hci_trans_set_acl_free_cb(os_mempool_put_fn *cb, void *arg)
 {
-    return BLE_ERR_UNSUPPORTED;
+    ble_hci_acl_pool.mpe_put_cb = cb;
+    ble_hci_acl_pool.mpe_put_arg = arg;
+    return 0;
 }
 
 int ble_hci_trans_reset(void)

+ 1 - 1
components/bt/host/nimble/nimble

@@ -1 +1 @@
-Subproject commit ba72e37ac40c13b66ad49c3178c0dbc9588add61
+Subproject commit d3c563813840f60f355f4d3640ff2328bc6e02ec

+ 1 - 1
examples/bluetooth/nimble/bleprph/main/main.c

@@ -361,11 +361,11 @@ app_main(void)
     ble_hs_cfg.sm_sc = 1;
 #else
     ble_hs_cfg.sm_sc = 0;
+#endif
 #ifdef CONFIG_EXAMPLE_BONDING
     ble_hs_cfg.sm_our_key_dist = 1;
     ble_hs_cfg.sm_their_key_dist = 1;
 #endif
-#endif
 
 
     rc = gatt_svr_init();