diff --git a/components/bt/controller/esp32c2/ble.c b/components/bt/controller/esp32c2/ble.c index dd6db35eed..6dfb56e288 100644 --- a/components/bt/controller/esp32c2/ble.c +++ b/components/bt/controller/esp32c2/ble.c @@ -13,6 +13,7 @@ */ #if (CONFIG_BT_NIMBLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED) void scan_stack_enableAdvFlowCtrlVsCmd(bool en); +void scan_stack_enableSpecifyScanChanVsCmd(bool en); void adv_stack_enableClearLegacyAdvVsCmd(bool en); void chanSel_stack_enableSetCsaVsCmd(bool en); void hci_stack_enableSetVsEvtMaskVsCmd(bool en); @@ -36,6 +37,8 @@ void ble_stack_enableVsCmds(bool en) scan_stack_enableAdvFlowCtrlVsCmd(en); #endif // DEFAULT_BT_LE_ROLE_OBSERVER + scan_stack_enableSpecifyScanChanVsCmd(en); + chanSel_stack_enableSetCsaVsCmd(en); hci_stack_enableSetVsEvtMaskVsCmd(en); } diff --git a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib index d5486911e7..ff958fab2f 160000 --- a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib +++ b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib @@ -1 +1 @@ -Subproject commit d5486911e736aa829b834321f0587d75ab292b05 +Subproject commit ff958fab2f693e4b5974375cce525945fd238c4f diff --git a/components/bt/controller/lib_esp32c6/esp32c6-bt-lib b/components/bt/controller/lib_esp32c6/esp32c6-bt-lib index f912ebc985..3655fcdaad 160000 --- a/components/bt/controller/lib_esp32c6/esp32c6-bt-lib +++ b/components/bt/controller/lib_esp32c6/esp32c6-bt-lib @@ -1 +1 @@ -Subproject commit f912ebc985b1e1f3155432fc2a74a0adfa0bdade +Subproject commit 3655fcdaadb66bb4cd4d497c2dbd4e6e2a4cc696 diff --git a/components/bt/controller/lib_esp32h2/esp32h2-bt-lib b/components/bt/controller/lib_esp32h2/esp32h2-bt-lib index 98192fac64..a2ba40fae2 160000 --- a/components/bt/controller/lib_esp32h2/esp32h2-bt-lib +++ b/components/bt/controller/lib_esp32h2/esp32h2-bt-lib @@ -1 +1 @@ -Subproject commit 98192fac643e31b1c039bac663bbcc5deb82314b +Subproject commit a2ba40fae2462488f65efca042e5cecd9e018c7e diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld index fcd8a40927..cb34663aa9 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld @@ -329,7 +329,7 @@ r_ble_ll_generate_dh_key_v1 = 0x40000f70; r_ble_ll_generate_dh_key_v2 = 0x40000f74; r_ble_ll_generic_data_init = 0x40000f78; r_ble_ll_get_addr_type = 0x40000f7c; -r_ble_ll_get_chan_to_scan = 0x40000f80; +//r_ble_ll_get_chan_to_scan = 0x40000f80; r_ble_ll_get_our_devaddr = 0x40000f84; r_ble_ll_get_tx_pwr_compensation = 0x40000f88; r_ble_ll_hci_acl_rx = 0x40000f8c; @@ -497,7 +497,7 @@ r_ble_ll_scan_get_addr_from_ext_adv = 0x40001214; r_ble_ll_scan_get_cur_sm = 0x40001218; r_ble_ll_scan_get_ext_adv_report = 0x4000121c; r_ble_ll_scan_get_local_rpa = 0x40001220; -r_ble_ll_scan_get_next_adv_prim_chan = 0x40001224; +//r_ble_ll_scan_get_next_adv_prim_chan = 0x40001224; r_ble_ll_scan_get_peer_rpa = 0x40001228; r_ble_ll_scan_have_rxd_scan_rsp = 0x4000122c; r_ble_ll_scan_init = 0x40001230; @@ -809,7 +809,7 @@ r_ble_lll_scan_rx_isr_on_legacy = 0x400016f8; //r_ble_lll_scan_rx_pkt_isr = 0x400016fc; r_ble_lll_scan_sched_next_aux = 0x40001700; r_ble_lll_scan_sched_remove = 0x40001704; -r_ble_lll_scan_start = 0x40001708; +//r_ble_lll_scan_start = 0x40001708; //r_ble_lll_scan_start_rx = 0x4000170c; r_ble_lll_scan_stop = 0x40001710; r_ble_lll_scan_targeta_is_matched = 0x40001714; diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld index 99e23119b4..1ba085564c 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld @@ -403,7 +403,7 @@ r_ble_ll_scan_get_addr_from_ext_adv = 0x40001214; r_ble_ll_scan_get_cur_sm = 0x40001218; r_ble_ll_scan_get_ext_adv_report = 0x4000121c; r_ble_ll_scan_get_local_rpa = 0x40001220; -r_ble_ll_scan_get_next_adv_prim_chan = 0x40001224; +//r_ble_ll_scan_get_next_adv_prim_chan = 0x40001224; r_ble_ll_scan_get_peer_rpa = 0x40001228; r_ble_ll_scan_have_rxd_scan_rsp = 0x4000122c; r_ble_ll_scan_initiator_start = 0x40001234; @@ -638,7 +638,7 @@ r_ble_lll_scan_process_adv_in_isr = 0x400016e4; //r_ble_lll_scan_req_backoff = 0x400016ec; r_ble_lll_scan_sched_next_aux = 0x40001700; r_ble_lll_scan_sched_remove = 0x40001704; -r_ble_lll_scan_start = 0x40001708; +//r_ble_lll_scan_start = 0x40001708; //r_ble_lll_scan_start_rx = 0x4000170c; r_ble_lll_scan_timer_cb = 0x40001718; r_ble_lll_sched_adv_new = 0x4000171c;