alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

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

See merge request espressif/esp-idf!13577
This commit is contained in:
Island 2021-05-19 09:50:27 +00:00
commit 532d0a72c3
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/bt/host/nimble/esp-hci/src/esp_nimble_hci.c
View File

@ -210,7 +210,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) 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) int ble_hci_trans_reset(void)

2
components/bt/host/nimble/nimble

@ -1 +1 @@
Subproject commit 6cf591f60e7a476e4a154e3d3d25888afc89cda2 Subproject commit be9b2bd9dacdbd631c034be056293ea70911e902

2
examples/bluetooth/nimble/bleprph/main/main.c
View File

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