d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bge_eeprom_getbyte() to return 1 when timeout happens.

Browse Source 
Previously it always returned 0 which means success regardless of
EEPROM status.

While here, add a check whether EEPROM read is successful.

Submitted by:   jkim
This commit is contained in:
Pyun YongHyeon 2005-12-22 02:03:57 +00:00
parent 57b183e13c
commit f6789fba46
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=153629
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/bge/if_bge.c
View File

@ -519,7 +519,7 @@ bge_eeprom_getbyte(sc, addr, dest)
if (i == BGE_TIMEOUT) {
printf("bge%d: eeprom read timed out\n", sc->bge_unit);
return(0);
return(1);
}
/* Get result. */
@ -2197,8 +2197,13 @@ bge_attach(dev)
if (bge_readmem_ind(sc, BGE_SOFTWARE_GENCOMM_SIG) == BGE_MAGIC_NUMBER)
hwcfg = bge_readmem_ind(sc, BGE_SOFTWARE_GENCOMM_NICCFG);
else {
bge_read_eeprom(sc, (caddr_t)&hwcfg,
BGE_EE_HWCFG_OFFSET, sizeof(hwcfg));
if (bge_read_eeprom(sc, (caddr_t)&hwcfg, BGE_EE_HWCFG_OFFSET,
sizeof(hwcfg))) {
printf("bge%d: failed to read EEPROM\n", unit);
bge_release_resources(sc);
error = ENXIO;
goto fail;
}
hwcfg = ntohl(hwcfg);
}