mirror of
https://github.com/espressif/esp-idf.git
synced 2025-07-30 10:47:19 +02:00
Merge branch 'bugfix/fix_duplicate_exception_vsc_v5.0' into 'release/v5.0'
fix(nimble): Fix the parameters in duplicate exception list vsc command(v5.0) See merge request espressif/esp-idf!27559
This commit is contained in:
@ -1949,10 +1949,6 @@ int bt_mesh_update_exceptional_list(uint8_t sub_code, uint32_t type, void *info)
|
|||||||
uint8_t value[6] = {0};
|
uint8_t value[6] = {0};
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
|
|
||||||
#if MYNEWT_VAL(BLE_HCI_VS)
|
|
||||||
struct ble_hci_vs_duplicate_exception_list_cp cmd;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if ((sub_code > BLE_MESH_EXCEP_LIST_SUB_CODE_CLEAN) ||
|
if ((sub_code > BLE_MESH_EXCEP_LIST_SUB_CODE_CLEAN) ||
|
||||||
(sub_code < BLE_MESH_EXCEP_LIST_SUB_CODE_CLEAN &&
|
(sub_code < BLE_MESH_EXCEP_LIST_SUB_CODE_CLEAN &&
|
||||||
type > BLE_MESH_EXCEP_LIST_TYPE_MESH_PROXY_ADV) ||
|
type > BLE_MESH_EXCEP_LIST_TYPE_MESH_PROXY_ADV) ||
|
||||||
@ -1973,12 +1969,7 @@ int bt_mesh_update_exceptional_list(uint8_t sub_code, uint32_t type, void *info)
|
|||||||
BT_DBG("%s exceptional list, type 0x%08x", sub_code ? "Remove" : "Add", type);
|
BT_DBG("%s exceptional list, type 0x%08x", sub_code ? "Remove" : "Add", type);
|
||||||
|
|
||||||
#if MYNEWT_VAL(BLE_HCI_VS)
|
#if MYNEWT_VAL(BLE_HCI_VS)
|
||||||
cmd.operation = sub_code;
|
rc = ble_gap_duplicate_exception_list(sub_code, type, value, NULL);
|
||||||
cmd.type = htole32(type);
|
|
||||||
memcpy(&cmd.device_info, value, 6);
|
|
||||||
|
|
||||||
rc = ble_hs_hci_send_vs_cmd(BLE_HCI_OCF_VS_DUPLICATE_EXCEPTION_LIST,
|
|
||||||
&cmd, sizeof(cmd), NULL, 0);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return rc;
|
return rc;
|
||||||
|
Submodule components/bt/host/nimble/nimble updated: 8114a62475...b81e89bbbe
Reference in New Issue
Block a user