]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
board/evb64260/zuma_pbb_mbox.c: Fix GCC 4.6 build warnings
authorWolfgang Denk <wd@denx.de>
Wed, 9 Nov 2011 09:29:01 +0000 (09:29 +0000)
committerWolfgang Denk <wd@denx.de>
Wed, 16 Nov 2011 20:04:32 +0000 (21:04 +0100)
Fix:
zuma_pbb_mbox.c: In function 'zuma_mbox_dump':
zuma_pbb_mbox.c:115:2: warning: dereferencing type-punned pointer will
break strict-aliasing rules [-Wstrict-aliasing]
zuma_pbb_mbox.c:117:2: warning: dereferencing type-punned pointer will
break strict-aliasing rules [-Wstrict-aliasing]

Signed-off-by: Wolfgang Denk <wd@denx.de>
board/evb64260/zuma_pbb_mbox.c

index 3d7c976a91624156684ab10ceb714f64574842b9..621c64cd820dcb86651c7de377fdeabad81f87d2 100644 (file)
@@ -112,13 +112,24 @@ static int zuma_mbox_do_all_mailbox(void)
 
 static void zuma_mbox_dump(void)
 {
-       printf("ACC MAC=%04x%08x\n", *(unsigned short *) (&zuma_acc_mac),
-              *(unsigned int *) ((char *) &zuma_acc_mac + 2));
-       printf("PRV MAC=%04x%08x\n", *(unsigned short *) (&zuma_prv_mac),
-              *(unsigned int *) ((char *) &zuma_prv_mac + 2));
-       printf("slot:bac=%d:%d\n", (zuma_slot_bac >> 2) & 0xf,
-              zuma_slot_bac & 0x3);
-       printf("BAUD1=%d BAUD2=%d\n", zuma_console_baud, zuma_debug_baud);
+       unsigned short s;
+       unsigned int i;
+
+       memcpy(&s, &zuma_acc_mac,    sizeof(s));
+       memcpy(&i, &zuma_acc_mac[2], sizeof(i));
+       printf("ACC MAC=%04x%08x\n", s, i);
+
+       memcpy(&s, &zuma_prv_mac,    sizeof(s));
+       memcpy(&s, &zuma_prv_mac[2], sizeof(i));
+       printf("PRV MAC=%04x%08x\n", s, i);
+
+       printf("slot:bac=%d:%d\n",
+               (zuma_slot_bac >> 2) & 0xf,
+               zuma_slot_bac & 0x3);
+
+       printf("BAUD1=%d BAUD2=%d\n",
+               zuma_console_baud,
+               zuma_debug_baud);
 }