mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-20 22:21:41 +00:00
board/w7o/vpd.c: make (mostly) checkpatch clean
Accept 2 warnings "externs should be avoided". Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk
parent
fc86bbf692
commit
1da8dba9b6
1 changed files with 281 additions and 264 deletions
123
board/w7o/vpd.c
123
board/w7o/vpd.c
|
|
@ -22,11 +22,11 @@
|
|||
*/
|
||||
|
||||
#if defined(VXWORKS)
|
||||
# include <stdio.h>
|
||||
# include <string.h>
|
||||
# define CONFIG_SYS_DEF_EEPROM_ADDR 0xa0
|
||||
extern char iicReadByte( char, char );
|
||||
extern ulong_t crc32( unsigned char *, unsigned long );
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#define CONFIG_SYS_DEF_EEPROM_ADDR 0xa0
|
||||
extern char iicReadByte(char, char);
|
||||
extern ulong_t crc32(unsigned char *, unsigned long);
|
||||
#else
|
||||
#include <common.h>
|
||||
#endif
|
||||
|
|
@ -37,8 +37,8 @@ extern ulong_t crc32( unsigned char *, unsigned long );
|
|||
* vpd_reader() - reads VPD data from I2C EEPROMS.
|
||||
* returns pointer to buffer or NULL.
|
||||
*/
|
||||
static unsigned char *
|
||||
vpd_reader(unsigned char *buf, unsigned dev_addr, unsigned off, unsigned count)
|
||||
static unsigned char *vpd_reader(unsigned char *buf, unsigned dev_addr,
|
||||
unsigned off, unsigned count)
|
||||
{
|
||||
unsigned offset = off; /* Calculated offset */
|
||||
|
||||
|
|
@ -54,9 +54,9 @@ vpd_reader(unsigned char *buf, unsigned dev_addr, unsigned off, unsigned count)
|
|||
#if defined(VXWORKS)
|
||||
{
|
||||
int i;
|
||||
for( i = 0; i < count; ++i ) {
|
||||
buf[ i ] = iicReadByte( dev_addr, offset+i );
|
||||
}
|
||||
|
||||
for (i = 0; i < count; ++i)
|
||||
buf[i] = iicReadByte(dev_addr, offset + i);
|
||||
}
|
||||
#else
|
||||
if (eeprom_read(dev_addr, offset, buf, count)) {
|
||||
|
|
@ -67,13 +67,13 @@ vpd_reader(unsigned char *buf, unsigned dev_addr, unsigned off, unsigned count)
|
|||
#endif
|
||||
|
||||
return buf;
|
||||
} /* vpd_reader() */
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* vpd_get_packet() - returns next VPD packet or NULL.
|
||||
*/
|
||||
static vpd_packet_t *vpd_get_packet(vpd_packet_t *vpd_packet)
|
||||
static vpd_packet_t *vpd_get_packet(vpd_packet_t * vpd_packet)
|
||||
{
|
||||
vpd_packet_t *packet = vpd_packet;
|
||||
|
||||
|
|
@ -81,20 +81,21 @@ static vpd_packet_t *vpd_get_packet(vpd_packet_t *vpd_packet)
|
|||
if (packet->identifier == VPD_PID_TERM)
|
||||
return NULL;
|
||||
else
|
||||
packet = (vpd_packet_t *)((char *)packet + packet->size + 2);
|
||||
packet = (vpd_packet_t *) ((char *) packet +
|
||||
packet->size + 2);
|
||||
}
|
||||
|
||||
return packet;
|
||||
} /* vpd_get_packet() */
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* vpd_find_packet() - Locates and returns the specified
|
||||
* VPD packet or NULL on error.
|
||||
*/
|
||||
static vpd_packet_t *vpd_find_packet(vpd_t *vpd, unsigned char ident)
|
||||
static vpd_packet_t *vpd_find_packet(vpd_t * vpd, unsigned char ident)
|
||||
{
|
||||
vpd_packet_t *packet = (vpd_packet_t *)&vpd->packets;
|
||||
vpd_packet_t *packet = (vpd_packet_t *) &vpd->packets;
|
||||
|
||||
/* Guaranteed illegal */
|
||||
if (ident == VPD_PID_GI)
|
||||
|
|
@ -121,44 +122,51 @@ static int vpd_is_valid(unsigned dev_addr, unsigned char *buf)
|
|||
{
|
||||
unsigned num_bytes;
|
||||
vpd_packet_t *packet;
|
||||
vpd_t *vpd = (vpd_t *)buf;
|
||||
vpd_t *vpd = (vpd_t *) buf;
|
||||
unsigned short stored_crc16, calc_crc16 = 0xffff;
|
||||
|
||||
/* Check Eyecatcher */
|
||||
if (strncmp((char *)(vpd->header.eyecatcher), VPD_EYECATCHER, VPD_EYE_SIZE) != 0) {
|
||||
if (strncmp
|
||||
((char *) (vpd->header.eyecatcher), VPD_EYECATCHER,
|
||||
VPD_EYE_SIZE) != 0) {
|
||||
unsigned offset = 0;
|
||||
|
||||
if (dev_addr == CONFIG_SYS_DEF_EEPROM_ADDR)
|
||||
offset += SDRAM_SPD_DATA_SIZE;
|
||||
printf("Error: VPD EEPROM 0x%x corrupt @ 0x%x\n", dev_addr, offset);
|
||||
printf("Error: VPD EEPROM 0x%x corrupt @ 0x%x\n", dev_addr,
|
||||
offset);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Check Length */
|
||||
if (vpd->header.size> VPD_MAX_EEPROM_SIZE) {
|
||||
if (vpd->header.size > VPD_MAX_EEPROM_SIZE) {
|
||||
printf("Error: VPD EEPROM 0x%x contains bad size 0x%x\n",
|
||||
dev_addr, vpd->header.size);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Now find the termination packet */
|
||||
if ((packet = vpd_find_packet(vpd, VPD_PID_TERM)) == NULL) {
|
||||
packet = vpd_find_packet(vpd, VPD_PID_TERM);
|
||||
if (packet == NULL) {
|
||||
printf("Error: VPD EEPROM 0x%x missing termination packet\n",
|
||||
dev_addr);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Calculate data size */
|
||||
num_bytes = (unsigned long)((unsigned char *)packet -
|
||||
(unsigned char *)vpd + sizeof(vpd_packet_t));
|
||||
num_bytes = (unsigned long) ((unsigned char *) packet -
|
||||
(unsigned char *) vpd +
|
||||
sizeof(vpd_packet_t));
|
||||
|
||||
/* Find stored CRC and clear it */
|
||||
if ((packet = vpd_find_packet(vpd, VPD_PID_CRC)) == NULL) {
|
||||
packet = vpd_find_packet(vpd, VPD_PID_CRC);
|
||||
if (packet == NULL) {
|
||||
printf("Error: VPD EEPROM 0x%x missing CRC\n", dev_addr);
|
||||
return 0;
|
||||
}
|
||||
stored_crc16 = *((ushort *)packet->data);
|
||||
*(ushort *)packet->data = 0;
|
||||
stored_crc16 = *((ushort *) packet->data);
|
||||
*(ushort *) packet->data = 0;
|
||||
|
||||
/* OK, lets calculate the CRC and check it */
|
||||
#if defined(VXWORKS)
|
||||
|
|
@ -166,7 +174,8 @@ static int vpd_is_valid(unsigned dev_addr, unsigned char *buf)
|
|||
#else
|
||||
calc_crc16 = (0xffff & crc32(0, buf, num_bytes));
|
||||
#endif
|
||||
*(ushort *)packet->data = stored_crc16; /* Now restore the CRC */
|
||||
/* Now restore the CRC */
|
||||
*(ushort *) packet->data = stored_crc16;
|
||||
if (stored_crc16 != calc_crc16) {
|
||||
printf("Error: VPD EEPROM 0x%x has bad CRC 0x%x\n",
|
||||
dev_addr, stored_crc16);
|
||||
|
|
@ -174,7 +183,7 @@ static int vpd_is_valid(unsigned dev_addr, unsigned char *buf)
|
|||
}
|
||||
|
||||
return 1;
|
||||
} /* vpd_is_valid() */
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -189,7 +198,7 @@ static int size_ok(vpd_packet_t *packet, unsigned long size)
|
|||
return 0;
|
||||
}
|
||||
return 1;
|
||||
} /* size_ok() */
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -204,7 +213,7 @@ static int strlen_ok(vpd_packet_t *packet, unsigned long length)
|
|||
return 0;
|
||||
}
|
||||
return 1;
|
||||
} /* strlen_ok() */
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -216,7 +225,7 @@ static int strlen_ok(vpd_packet_t *packet, unsigned long length)
|
|||
int vpd_get_data(unsigned char dev_addr, VPD *vpdInfo)
|
||||
{
|
||||
unsigned char buf[VPD_EEPROM_SIZE];
|
||||
vpd_t *vpd = (vpd_t *)buf;
|
||||
vpd_t *vpd = (vpd_t *) buf;
|
||||
vpd_packet_t *packet;
|
||||
|
||||
if (vpdInfo == NULL)
|
||||
|
|
@ -231,14 +240,13 @@ int vpd_get_data(unsigned char dev_addr, VPD *vpdInfo)
|
|||
* broadcast addresses, and would never be
|
||||
* permantely stored.
|
||||
*/
|
||||
memset((void *)vpdInfo, 0, sizeof(VPD));
|
||||
memset((void *)&vpdInfo->ethAddrs, 0xff, sizeof(vpdInfo->ethAddrs));
|
||||
memset((void *) vpdInfo, 0, sizeof(VPD));
|
||||
memset((void *) &vpdInfo->ethAddrs, 0xff, sizeof(vpdInfo->ethAddrs));
|
||||
vpdInfo->_devAddr = dev_addr;
|
||||
|
||||
/* Read the minimum size first */
|
||||
if (vpd_reader(buf, dev_addr, 0, VPD_EEPROM_SIZE) == NULL) {
|
||||
if (vpd_reader(buf, dev_addr, 0, VPD_EEPROM_SIZE) == NULL)
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Check validity of VPD data */
|
||||
if (!vpd_is_valid(dev_addr, buf)) {
|
||||
|
|
@ -250,7 +258,7 @@ int vpd_get_data(unsigned char dev_addr, VPD *vpdInfo)
|
|||
* Walk all the packets and populate
|
||||
* the VPD info structure.
|
||||
*/
|
||||
packet = (vpd_packet_t *)&vpd->packets;
|
||||
packet = (vpd_packet_t *) &vpd->packets;
|
||||
do {
|
||||
switch (packet->identifier) {
|
||||
case VPD_PID_GI:
|
||||
|
|
@ -259,7 +267,8 @@ int vpd_get_data(unsigned char dev_addr, VPD *vpdInfo)
|
|||
case VPD_PID_PID:
|
||||
if (strlen_ok(packet, MAX_PROD_ID)) {
|
||||
strncpy(vpdInfo->productId,
|
||||
(char *)(packet->data), packet->size);
|
||||
(char *) (packet->data),
|
||||
packet->size);
|
||||
}
|
||||
break;
|
||||
case VPD_PID_REV:
|
||||
|
|
@ -269,7 +278,7 @@ int vpd_get_data(unsigned char dev_addr, VPD *vpdInfo)
|
|||
case VPD_PID_SN:
|
||||
if (size_ok(packet, sizeof(unsigned long))) {
|
||||
vpdInfo->serialNum =
|
||||
*(unsigned long *)packet->data;
|
||||
*(unsigned long *) packet->data;
|
||||
}
|
||||
break;
|
||||
case VPD_PID_MANID:
|
||||
|
|
@ -279,16 +288,18 @@ int vpd_get_data(unsigned char dev_addr, VPD *vpdInfo)
|
|||
case VPD_PID_PCO:
|
||||
if (size_ok(packet, sizeof(unsigned long))) {
|
||||
vpdInfo->configOpt =
|
||||
*(unsigned long *)packet->data;
|
||||
*(unsigned long *) packet->data;
|
||||
}
|
||||
break;
|
||||
case VPD_PID_SYSCLK:
|
||||
if (size_ok(packet, sizeof(unsigned long)))
|
||||
vpdInfo->sysClk = *(unsigned long *)packet->data;
|
||||
vpdInfo->sysClk =
|
||||
*(unsigned long *) packet->data;
|
||||
break;
|
||||
case VPD_PID_SERCLK:
|
||||
if (size_ok(packet, sizeof(unsigned long)))
|
||||
vpdInfo->serClk = *(unsigned long *)packet->data;
|
||||
vpdInfo->serClk =
|
||||
*(unsigned long *) packet->data;
|
||||
break;
|
||||
case VPD_PID_FLASH:
|
||||
if (size_ok(packet, 9)) { /* XXX - hardcoded,
|
||||
|
|
@ -301,11 +312,11 @@ int vpd_get_data(unsigned char dev_addr, VPD *vpdInfo)
|
|||
break;
|
||||
case VPD_PID_POTS:
|
||||
if (size_ok(packet, sizeof(char)))
|
||||
vpdInfo->numPOTS = (unsigned)*packet->data;
|
||||
vpdInfo->numPOTS = (unsigned) *packet->data;
|
||||
break;
|
||||
case VPD_PID_DS1:
|
||||
if (size_ok(packet, sizeof(char)))
|
||||
vpdInfo->numDS1 = (unsigned)*packet->data;
|
||||
vpdInfo->numDS1 = (unsigned) *packet->data;
|
||||
case VPD_PID_GAL:
|
||||
case VPD_PID_CRC:
|
||||
case VPD_PID_TERM:
|
||||
|
|
@ -318,7 +329,7 @@ int vpd_get_data(unsigned char dev_addr, VPD *vpdInfo)
|
|||
} while ((packet = vpd_get_packet(packet)));
|
||||
|
||||
return 0;
|
||||
} /* end get_vpd_data() */
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -326,8 +337,8 @@ int vpd_get_data(unsigned char dev_addr, VPD *vpdInfo)
|
|||
*/
|
||||
int vpd_init(unsigned char dev_addr)
|
||||
{
|
||||
return (0);
|
||||
} /* vpd_init() */
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -358,16 +369,18 @@ void vpd_print(VPD *vpdInfo)
|
|||
printf(dfmt, sp, "Serial Number", vpdInfo->serialNum);
|
||||
|
||||
if (vpdInfo->manuID)
|
||||
printf(dfmt, sp, "Manufacture ID", (long)vpdInfo->manuID);
|
||||
printf(dfmt, sp, "Manufacture ID", (long) vpdInfo->manuID);
|
||||
|
||||
if (vpdInfo->configOpt)
|
||||
printf(hfmt, sp, "Configuration", vpdInfo->configOpt);
|
||||
|
||||
if (vpdInfo->sysClk)
|
||||
printf(dhfmt, sp, "System Clock", vpdInfo->sysClk, vpdInfo->sysClk);
|
||||
printf(dhfmt, sp, "System Clock", vpdInfo->sysClk,
|
||||
vpdInfo->sysClk);
|
||||
|
||||
if (vpdInfo->serClk)
|
||||
printf(dhfmt, sp, "Serial Clock", vpdInfo->serClk, vpdInfo->serClk);
|
||||
printf(dhfmt, sp, "Serial Clock", vpdInfo->serClk,
|
||||
vpdInfo->serClk);
|
||||
|
||||
if (vpdInfo->numPOTS)
|
||||
printf(dfmt, sp, "Number of POTS lines", vpdInfo->numPOTS);
|
||||
|
|
@ -378,17 +391,20 @@ void vpd_print(VPD *vpdInfo)
|
|||
/* Print Ethernet Addresses */
|
||||
if (vpdInfo->ethAddrs[0][0] != 0xff) {
|
||||
int i, j;
|
||||
|
||||
printf("%4sEtherNet Address(es): ", sp);
|
||||
for (i = 0; i < MAX_ETH_ADDRS; i++) {
|
||||
if (vpdInfo->ethAddrs[i][0] != 0xff) {
|
||||
for (j = 0; j < 6; j++) {
|
||||
printf("%02X", vpdInfo->ethAddrs[i][j]);
|
||||
printf("%02X",
|
||||
vpdInfo->ethAddrs[i][j]);
|
||||
if (((j + 1) % 6) != 0)
|
||||
printf(":");
|
||||
else
|
||||
printf(" ");
|
||||
}
|
||||
if (((i + 1) % 3) == 0) printf("\n%24s: ", sp);
|
||||
if (((i + 1) % 3) == 0)
|
||||
printf("\n%24s: ", sp);
|
||||
}
|
||||
}
|
||||
printf("\n");
|
||||
|
|
@ -402,6 +418,7 @@ void vpd_print(VPD *vpdInfo)
|
|||
printf(dsfmt, sp, "Num. Devices", vpdInfo->flashCfg.numDevs);
|
||||
printf(dsfmt, sp, "Num. Columns", vpdInfo->flashCfg.numCols);
|
||||
printf(dsfmt, sp, "Column Width", vpdInfo->flashCfg.colWidth);
|
||||
printf(dsfmt, sp, "WE Data Width", vpdInfo->flashCfg.weDataWidth);
|
||||
printf(dsfmt, sp, "WE Data Width",
|
||||
vpdInfo->flashCfg.weDataWidth);
|
||||
}
|
||||
} /* vpd_print() */
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue