mirror of
https://github.com/espressif/esp-idf.git
synced 2025-08-04 13:14:32 +02:00
Merge branch 'bugfix/fix_compilation_issue_blufi' into 'master'
Blufi: Corrected macro used in memcpy to copy address See merge request espressif/esp-idf!20929
This commit is contained in:
@@ -492,7 +492,7 @@ int esp_blufi_handle_gap_events(struct ble_gap_event *event, void *arg)
|
|||||||
|
|
||||||
rc = ble_gap_conn_find(event->connect.conn_handle, &desc);
|
rc = ble_gap_conn_find(event->connect.conn_handle, &desc);
|
||||||
assert(rc == 0);
|
assert(rc == 0);
|
||||||
memcpy(param.connect.remote_bda, desc.peer_id_addr.val, sizeof(esp_bd_addr_t));
|
memcpy(param.connect.remote_bda, desc.peer_id_addr.val, ESP_BLUFI_BD_ADDR_LEN);
|
||||||
|
|
||||||
param.connect.conn_id = event->connect.conn_handle;
|
param.connect.conn_id = event->connect.conn_handle;
|
||||||
btc_transfer_context(&msg, ¶m, sizeof(esp_blufi_cb_param_t), NULL);
|
btc_transfer_context(&msg, ¶m, sizeof(esp_blufi_cb_param_t), NULL);
|
||||||
@@ -509,7 +509,7 @@ int esp_blufi_handle_gap_events(struct ble_gap_event *event, void *arg)
|
|||||||
|
|
||||||
memcpy(blufi_env.remote_bda,
|
memcpy(blufi_env.remote_bda,
|
||||||
event->disconnect.conn.peer_id_addr.val,
|
event->disconnect.conn.peer_id_addr.val,
|
||||||
sizeof(esp_bd_addr_t));
|
ESP_BLUFI_BD_ADDR_LEN);
|
||||||
|
|
||||||
if (blufi_env.aggr_buf != NULL) {
|
if (blufi_env.aggr_buf != NULL) {
|
||||||
osi_free(blufi_env.aggr_buf);
|
osi_free(blufi_env.aggr_buf);
|
||||||
@@ -521,7 +521,7 @@ int esp_blufi_handle_gap_events(struct ble_gap_event *event, void *arg)
|
|||||||
msg.act = ESP_BLUFI_EVENT_BLE_DISCONNECT;
|
msg.act = ESP_BLUFI_EVENT_BLE_DISCONNECT;
|
||||||
memcpy(param.disconnect.remote_bda,
|
memcpy(param.disconnect.remote_bda,
|
||||||
event->disconnect.conn.peer_id_addr.val,
|
event->disconnect.conn.peer_id_addr.val,
|
||||||
sizeof(esp_bd_addr_t));
|
ESP_BLUFI_BD_ADDR_LEN);
|
||||||
btc_transfer_context(&msg, ¶m, sizeof(esp_blufi_cb_param_t), NULL);
|
btc_transfer_context(&msg, ¶m, sizeof(esp_blufi_cb_param_t), NULL);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user