V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

board/w7o/vpd.c: Fix GCC 4.6 compile warnings 

Fix:
vpd.c: In function 'vpd_is_valid':
vpd.c:168:2: warning: dereferencing type-punned pointer will break
strict-aliasing rules [-Wstrict-aliasing]
vpd.c:169:2: warning: dereferencing type-punned pointer will break
strict-aliasing rules [-Wstrict-aliasing]
vpd.c:178:2: warning: dereferencing type-punned pointer will break
strict-aliasing rules [-Wstrict-aliasing]
vpd.c: In function 'vpd_get_data':
vpd.c:281:6: warning: dereferencing type-punned pointer will break
strict-aliasing rules [-Wstrict-aliasing]
vpd.c:291:6: warning: dereferencing type-punned pointer will break
strict-aliasing rules [-Wstrict-aliasing]
vpd.c:297:6: warning: dereferencing type-punned pointer will break
strict-aliasing rules [-Wstrict-aliasing]
vpd.c:302:6: warning: dereferencing type-punned pointer will break
strict-aliasing rules [-Wstrict-aliasing]

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk 2011-12-07 12:19:28 +00:00
parent 1da8dba9b6
commit 3073abdd6a
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
board/w7o/vpd.c
View File

@ -165,8 +165,8 @@ static int vpd_is_valid(unsigned dev_addr, unsigned char *buf)
printf("Error: VPD EEPROM 0x%x missing CRC\n", dev_addr); printf("Error: VPD EEPROM 0x%x missing CRC\n", dev_addr);
return 0; return 0;
} }
stored_crc16 = *((ushort *) packet->data); memcpy(&stored_crc16, packet->data, sizeof(ushort));
*(ushort *) packet->data = 0; memset(packet->data, 0, sizeof(ushort));
/* OK, lets calculate the CRC and check it */ /* OK, lets calculate the CRC and check it */
#if defined(VXWORKS) #if defined(VXWORKS)
@ -175,7 +175,7 @@ static int vpd_is_valid(unsigned dev_addr, unsigned char *buf)
calc_crc16 = (0xffff & crc32(0, buf, num_bytes)); calc_crc16 = (0xffff & crc32(0, buf, num_bytes));
#endif #endif
/* Now restore the CRC */ /* Now restore the CRC */
*(ushort *) packet->data = stored_crc16; memcpy(packet->data, &stored_crc16, sizeof(ushort));
if (stored_crc16 != calc_crc16) { if (stored_crc16 != calc_crc16) {
printf("Error: VPD EEPROM 0x%x has bad CRC 0x%x\n", printf("Error: VPD EEPROM 0x%x has bad CRC 0x%x\n",
dev_addr, stored_crc16); dev_addr, stored_crc16);
@ -277,8 +277,9 @@ int vpd_get_data(unsigned char dev_addr, VPD *vpdInfo)
break; break;
case VPD_PID_SN: case VPD_PID_SN:
if (size_ok(packet, sizeof(unsigned long))) { if (size_ok(packet, sizeof(unsigned long))) {
vpdInfo->serialNum = memcpy(&vpdInfo->serialNum,
*(unsigned long *) packet->data; packet->data,
sizeof(unsigned long));
} }
break; break;
case VPD_PID_MANID: case VPD_PID_MANID:
@ -287,19 +288,22 @@ int vpd_get_data(unsigned char dev_addr, VPD *vpdInfo)
break; break;
case VPD_PID_PCO: case VPD_PID_PCO:
if (size_ok(packet, sizeof(unsigned long))) { if (size_ok(packet, sizeof(unsigned long))) {
vpdInfo->configOpt = memcpy(&vpdInfo->configOpt,
*(unsigned long *) packet->data; packet->data,
sizeof(unsigned long));
} }
break; break;
case VPD_PID_SYSCLK: case VPD_PID_SYSCLK:
if (size_ok(packet, sizeof(unsigned long))) if (size_ok(packet, sizeof(unsigned long)))
vpdInfo->sysClk = memcpy(&vpdInfo->sysClk,
*(unsigned long *) packet->data; packet->data,
sizeof(unsigned long));
break; break;
case VPD_PID_SERCLK: case VPD_PID_SERCLK:
if (size_ok(packet, sizeof(unsigned long))) if (size_ok(packet, sizeof(unsigned long)))
vpdInfo->serClk = memcpy(&vpdInfo->serClk,
*(unsigned long *) packet->data; packet->data,
sizeof(unsigned long));
break; break;
case VPD_PID_FLASH: case VPD_PID_FLASH:
if (size_ok(packet, 9)) { /* XXX - hardcoded, if (size_ok(packet, 9)) { /* XXX - hardcoded,