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

bluedroid: Fix compilation warnings related to aliasing

Browse Source 
Merges PR #518 https://github.com/espressif/esp-idf/pull/518
This commit is contained in:
Angus Gratton 2017-04-21 11:31:40 +10:00 committed by Angus Gratton
parent cdc7396f97
commit 52c378b447
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/bt/bluedroid/btc/profile/esp/blufi/blufi_prf.c
View File

@ -345,7 +345,7 @@ static void btc_blufi_send_notify(uint8_t *pkt, int pkt_len)
static void btc_blufi_recv_handler(uint8_t *data, int len) static void btc_blufi_recv_handler(uint8_t *data, int len)
{ {
struct blufi_hdr *hdr = (struct blufi_hdr *)data; struct blufi_hdr *hdr = (struct blufi_hdr *)data;
uint16_t checksum; uint16_t checksum, checksum_pkt;
int ret; int ret;
if (hdr->seq != blufi_env.recv_seq) { if (hdr->seq != blufi_env.recv_seq) {
@ -369,8 +369,9 @@ static void btc_blufi_recv_handler(uint8_t *data, int len)
if (BLUFI_FC_IS_CHECK(hdr->fc) if (BLUFI_FC_IS_CHECK(hdr->fc)
&& (blufi_env.cbs && blufi_env.cbs->checksum_func)) { && (blufi_env.cbs && blufi_env.cbs->checksum_func)) {
checksum = blufi_env.cbs->checksum_func(hdr->seq, &hdr->seq, hdr->data_len + 2); checksum = blufi_env.cbs->checksum_func(hdr->seq, &hdr->seq, hdr->data_len + 2);
if (memcmp(&checksum, &hdr->data[hdr->data_len], 2) != 0) { checksum_pkt = hdr->data[hdr->data_len] | (((uint16_t) hdr->data[hdr->data_len + 1]) << 8);
LOG_ERROR("%s checksum error %04x, pkt %04x\n", __func__, checksum, *(uint16_t *)&hdr->data[hdr->data_len]); if (checksum != checksum_pkt) {
LOG_ERROR("%s checksum error %04x, pkt %04x\n", __func__, checksum, checksum_pkt);
return; return;
} }
} }
@ -381,7 +382,7 @@ static void btc_blufi_recv_handler(uint8_t *data, int len)
if (BLUFI_FC_IS_FRAG(hdr->fc)) { if (BLUFI_FC_IS_FRAG(hdr->fc)) {
if (blufi_env.offset == 0) { if (blufi_env.offset == 0) {
blufi_env.total_len = *(uint16_t *)(hdr->data); blufi_env.total_len = hdr->data[0] | (((uint16_t) hdr->data[1]) << 8);
blufi_env.aggr_buf = GKI_getbuf(blufi_env.total_len); blufi_env.aggr_buf = GKI_getbuf(blufi_env.total_len);
if (blufi_env.aggr_buf == NULL) { if (blufi_env.aggr_buf == NULL) {
LOG_ERROR("%s no mem, len %d\n", __func__, blufi_env.total_len); LOG_ERROR("%s no mem, len %d\n", __func__, blufi_env.total_len);
@ -420,7 +421,8 @@ void btc_blufi_send_encap(uint8_t type, uint8_t *data, int total_data_len)
} }
hdr->fc = 0x0; hdr->fc = 0x0;
hdr->data_len = blufi_env.frag_size + 2; hdr->data_len = blufi_env.frag_size + 2;
*(uint16_t *)hdr->data = remain_len; hdr->data[0] = remain_len & 0xff;
hdr->data[1] = (remain_len >> 8) & 0xff;
memcpy(hdr->data + 2, &data[total_data_len - remain_len], blufi_env.frag_size); //copy first, easy for check sum memcpy(hdr->data + 2, &data[total_data_len - remain_len], blufi_env.frag_size); //copy first, easy for check sum
hdr->fc |= BLUFI_FC_FRAG; hdr->fc |= BLUFI_FC_FRAG;
} else { } else {

5
components/bt/bluedroid/stack/btu/btu_task.c
View File

@ -223,8 +223,11 @@ static void btu_hci_msg_process(BT_HDR *p_msg)
/* Determine the input message type. */ /* Determine the input message type. */
switch (p_msg->event & BT_EVT_MASK) { switch (p_msg->event & BT_EVT_MASK) {
case BTU_POST_TO_TASK_NO_GOOD_HORRIBLE_HACK: // TODO(zachoverflow): remove this case BTU_POST_TO_TASK_NO_GOOD_HORRIBLE_HACK: // TODO(zachoverflow): remove this
((post_to_task_hack_t *)(&p_msg->data[0]))->callback(p_msg); {
post_to_task_hack_t *ph = (post_to_task_hack_t *) &p_msg->data[0];
ph->callback(p_msg);
break; break;
}
case BT_EVT_TO_BTU_HCI_ACL: case BT_EVT_TO_BTU_HCI_ACL:
/* All Acl Data goes to L2CAP */ /* All Acl Data goes to L2CAP */
l2c_rcv_acl_data (p_msg); l2c_rcv_acl_data (p_msg);