espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 19:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

mbuf copy hci data error fix

Browse Source
This commit is contained in:
cjin
2022-08-25 21:16:04 +08:00
parent 143a572b55
commit 3112c8b954
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/bt/controller/esp32c2/bt.c
View File

@@ -305,11 +305,9 @@ void esp_vhci_host_send_packet(uint8_t *data, uint16_t len)
} }
if (*(data) == DATA_TYPE_ACL) { if (*(data) == DATA_TYPE_ACL) {
struct os_mbuf *om = os_msys_get_pkthdr(0, ACL_DATA_MBUF_LEADINGSPCAE); struct os_mbuf *om = os_msys_get_pkthdr(len, ACL_DATA_MBUF_LEADINGSPCAE);
assert(om); assert(om);
memcpy(om->om_data, &data[1], len - 1); os_mbuf_append(om, &data[1], len - 1);
om->om_len = len - 1;
OS_MBUF_PKTHDR(om)->omp_len = len - 1;
ble_hci_trans_hs_acl_tx(om); ble_hci_trans_hs_acl_tx(om);
} }

15
components/bt/host/bluedroid/hci/hci_hal_h4.c
View File

@@ -598,7 +598,7 @@ ble_hs_hci_rx_evt(uint8_t *hci_ev, void *arg)
if(esp_bluedroid_get_status() == ESP_BLUEDROID_STATUS_UNINITIALIZED) { if(esp_bluedroid_get_status() == ESP_BLUEDROID_STATUS_UNINITIALIZED) {
return 0; return 0;
} }
uint8_t len = hci_ev[1] + 3; uint16_t len = hci_ev[1] + 3;
uint8_t *data = (uint8_t *)malloc(len); uint8_t *data = (uint8_t *)malloc(len);
data[0] = 0x04; data[0] = 0x04;
memcpy(&data[1], hci_ev, len - 1); memcpy(&data[1], hci_ev, len - 1);
@@ -608,22 +608,17 @@ ble_hs_hci_rx_evt(uint8_t *hci_ev, void *arg)
return 0; return 0;
} }
static void *trans_om;
void hci_trans_free_mbuf(void)
{
os_mbuf_free_chain(trans_om);
}
int int
ble_hs_rx_data(struct os_mbuf *om, void *arg) ble_hs_rx_data(struct os_mbuf *om, void *arg)
{ {
uint8_t len = om->om_len + 1; uint16_t len = om->om_len + 1;
uint8_t *data = (uint8_t *)malloc(len); uint8_t *data = (uint8_t *)malloc(len);
data[0] = 0x02; data[0] = 0x02;
memcpy(&data[1], om->om_data, len - 1); os_mbuf_copydata(om, 0, len - 1, &data[1]);
host_recv_pkt_cb(data, len); host_recv_pkt_cb(data, len);
trans_om = om;
free(data); free(data);
hci_trans_free_mbuf(); os_mbuf_free_chain(om);
return 0; return 0;
} }