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

MFp4: Add timeout to eeprom access for lame eeprom that go awol

Browse Source
This commit is contained in:
imp 2006-12-20 18:19:52 +00:00
parent d08a8bf72b
commit 863d7fa984
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/boot/arm/at91/libat91/eeprom.c
View File

@ -82,11 +82,12 @@ InitEEPROM(void)
* This function does not utilize the page read mode to simplify the code.
* .KB_C_FN_DEFINITION_END
*/
void
int
ReadEEPROM(unsigned ee_off, char *data_addr, unsigned size)
{
const AT91PS_TWI twiPtr = AT91C_BASE_TWI;
unsigned int status;
unsigned int count;
status = twiPtr->TWI_SR;
status = twiPtr->TWI_RHR;
@ -104,10 +105,12 @@ ReadEEPROM(unsigned ee_off, char *data_addr, unsigned size)
status = twiPtr->TWI_SR;
while (size-- > 1){
// Wait RHR Holding register is full
while (!(twiPtr->TWI_SR & AT91C_TWI_RXRDY))
count = 1000000;
while (!(twiPtr->TWI_SR & AT91C_TWI_RXRDY) && --count > 0)
continue;
if (count <= 0)
return -1;
// Read byte
*(data_addr++) = twiPtr->TWI_RHR;
@ -123,6 +126,7 @@ ReadEEPROM(unsigned ee_off, char *data_addr, unsigned size)
// Read last byte
*data_addr = twiPtr->TWI_RHR;
return 0;
}

2
sys/boot/arm/at91/libat91/lib.h
View File

@ -34,7 +34,7 @@ void printf(const char *fmt,...);
/* The following function write eeprom at ee_addr using data */
/* from data_add for size bytes. */
void ReadEEPROM(unsigned eeoff, char *data_addr, unsigned size);
int ReadEEPROM(unsigned eeoff, char *data_addr, unsigned size);
void WriteEEPROM(unsigned eeoff, char *data_addr, unsigned size);
void InitEEPROM(void);