OSDN -- Develop and Download Open Source Software

Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

external-bluetooth-bluez: Commit

external/bluetooth/bluez


Commit MetaInfo

Revisiond7e9f1e6d8c1c284fd6fba04ec2faaf66f36f79f (tree)
Time2019-03-13 17:02:53
AuthorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

hciattach_rtk: fix cast-align errors

To avoid the errors:

external/bluetooth/bluez/tools/hciattach_rtk.c:798:43: error: cast from 'RT_U8 *' (aka 'unsigned char *') to 'int *' increases required alignment from 1 to 4 [-Werror,-Wcast-align]

RS_DBG("BD Address: %8x%8x", *(int*)&skb->data[1], *(int*)&skb->data[5]);

external/bluetooth/bluez/tools/hciattach_rtk.c:88:58: note: expanded from macro 'RS_DBG'

fprintf(stderr, "%s :" fmt "\n" , LOG_STR, ##arg); \

external/bluetooth/bluez/tools/hciattach_rtk.c:798:65: error: cast from 'RT_U8 *' (aka 'unsigned char *') to 'int *' increases required alignment from 1 to 4 [-Werror,-Wcast-align]

RS_DBG("BD Address: %8x%8x", *(int*)&skb->data[1], *(int*)&skb->data[5]);

external/bluetooth/bluez/tools/hciattach_rtk.c:88:58: note: expanded from macro 'RS_DBG'

fprintf(stderr, "%s :" fmt "\n" , LOG_STR, ##arg); \

external/bluetooth/bluez/tools/hciattach_rtk.c:1380:12: error: cast from 'RT_U8 *' (aka 'unsigned char *') to 'RT_U16 *' (aka 'unsigned short *') increases required alignment from 1 to 2 [-Werror,-Wcast-align]

memcpy((RT_U16*)&cmd[4], &baudrate, 4);
~

external/bluetooth/bluez/tools/hciattach_rtk.c:1653:12: error: cast from 'unsigned char *' to 'RT_U16 *' (aka 'unsigned short *') increases required alignment from 1 to 2 [-Werror,-Wcast-align]

memcpy((RT_U16*)&cmd[3], &baudrate, 4);
~

4 errors generated.

Change Summary

Incremental Difference

--- a/tools/hciattach_rtk.c
+++ b/tools/hciattach_rtk.c
@@ -795,7 +795,10 @@ static void hci_event_cmd_complete(struct sk_buff* skb)
795795 status = skb->data[0];
796796 RS_DBG("Read BD Address with Status:%x", status);
797797 if (!status) {
798- RS_DBG("BD Address: %8x%8x", *(int*)&skb->data[1], *(int*)&skb->data[5]);
798+ int a1, a2;
799+ memcpy(&a1, &skb->data[1], sizeof(int));
800+ memcpy(&a2, &skb->data[5], sizeof(int));
801+ RS_DBG("BD Address: %8x%8x", a1, a2);
799802 }
800803 break;
801804
@@ -1377,9 +1380,9 @@ static int rtk_vendor_change_speed_h4(int fd, RT_U32 baudrate)
13771380
13781381 baudrate = cpu_to_le32(baudrate);
13791382 #ifdef BAUDRATE_4BYTES
1380- memcpy((RT_U16*)&cmd[4], &baudrate, 4);
1383+ memcpy(&cmd[4], &baudrate, 4);
13811384 #else
1382- memcpy((RT_U16*)&cmd[4], &baudrate, 2);
1385+ memcpy(&cmd[4], &baudrate, 2);
13831386 cmd[6] = 0;
13841387 cmd[7] = 0;
13851388 #endif
@@ -1650,9 +1653,9 @@ int rtk_vendor_change_speed_h5(int fd, RT_U32 baudrate)
16501653
16511654 baudrate = cpu_to_le32(baudrate);
16521655 #ifdef BAUDRATE_4BYTES
1653- memcpy((RT_U16*)&cmd[3], &baudrate, 4);
1656+ memcpy(&cmd[3], &baudrate, 4);
16541657 #else
1655- memcpy((RT_U16*)&cmd[3], &baudrate, 2);
1658+ memcpy(&cmd[3], &baudrate, 2);
16561659
16571660 cmd[5] = 0;
16581661 cmd[6] = 0;
Show on old repository browser