devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Slightly better error handling in the iRiver I2C driver

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6607 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2005-06-08 11:47:16 +00:00
parent a9ac3d12ea
commit ead61c1d18
1 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
firmware/drivers/i2c-h100.c
View file

@ -70,19 +70,22 @@ void i2c_close(void)
int i2c_write(int device, unsigned char *buf, int count) int i2c_write(int device, unsigned char *buf, int count)
{ {
int i; int i;
int rc;
if (i2c_gen_start(device) == -1) rc = i2c_gen_start(device);
if (rc < 0)
{ {
DEBUGF("i2c: gen_start failed (d=%d)", device); DEBUGF("i2c: gen_start failed (d=%d)", device);
return -1; return rc*10 - 1;
} }
for (i=0; i<count; i++) for (i=0; i<count; i++)
{ {
if (i2c_write_byte(device, buf[i]) == -1) rc = i2c_write_byte(device, buf[i]);
if (rc < 0)
{ {
DEBUGF("i2c: write failed at (d=%d,i=%d)", device, i); DEBUGF("i2c: write failed at (d=%d,i=%d)", device, i);
return i-1; return rc*10 - 2;
} }
} }
@ -110,23 +113,25 @@ int i2c_write_byte(int device, unsigned char data)
if (count >= MAX_LOOP) if (count >= MAX_LOOP)
return -1; return -1;
count = 0;
/* Wait for interrupt flag */ /* Wait for interrupt flag */
while (!(regs[O_MBSR] & IFF) && count < MAX_LOOP) while (!(regs[O_MBSR] & IFF) && count < MAX_LOOP)
{ {
yield(); yield();
count++; count++;
} }
if (count >= MAX_LOOP) if (count >= MAX_LOOP)
return -1; return -2;
regs[O_MBSR] &= ~IFF; /* Clear interrupt flag */ regs[O_MBSR] &= ~IFF; /* Clear interrupt flag */
if (!(regs[O_MBSR] & ICF)) /* Check that transfer is complete */ if (!(regs[O_MBSR] & ICF)) /* Check that transfer is complete */
return -1; return -3;
if (regs[O_MBSR] & RXAK) /* Check that the byte has been ACKed */ if (regs[O_MBSR] & RXAK) /* Check that the byte has been ACKed */
return -1; return -4;
return 0; return 0;
} }
@ -140,14 +145,17 @@ int i2c_gen_start(int device)
/* Wait for bus to become free */ /* Wait for bus to become free */
while ((regs[O_MBSR] & IBB) && (count < MAX_LOOP)) while ((regs[O_MBSR] & IBB) && (count < MAX_LOOP))
{
yield();
count++; count++;
}
if (count >= MAX_LOOP) if (count >= MAX_LOOP)
return -1; return -1;
regs[O_MBCR] |= MSTA | MTX; /* Generate START */ regs[O_MBCR] |= MSTA | MTX; /* Generate START */
return 0; return 0;
} }
void i2c_gen_stop(int device) void i2c_gen_stop(int device)