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

Removed a potential I2C deadlock

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2879 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2002-11-24 11:47:24 +00:00
parent c833a816d8
commit 63f0b5ec3a
1 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

34
firmware/drivers/mas.c
View file

@ -380,32 +380,34 @@ int mas_codec_readreg(int reg)
/* send read command */ /* send read command */
if (i2c_write(MAS_DEV_WRITE,buf,3)) if (i2c_write(MAS_DEV_WRITE,buf,3))
{ {
return -1; ret = -1;
} }
else
i2c_start(); {
i2c_outb(MAS_DEV_WRITE); i2c_start();
if (i2c_getack()) { i2c_outb(MAS_DEV_WRITE);
i2c_outb(MAS_CODEC_READ);
if (i2c_getack()) { if (i2c_getack()) {
i2c_start(); i2c_outb(MAS_CODEC_READ);
i2c_outb(MAS_DEV_READ);
if (i2c_getack()) { if (i2c_getack()) {
tmp[0] = i2c_inb(0); i2c_start();
tmp[1] = i2c_inb(1); /* NAK the last byte */ i2c_outb(MAS_DEV_READ);
ret = (tmp[0] << 8) | tmp[1]; if (i2c_getack()) {
tmp[0] = i2c_inb(0);
tmp[1] = i2c_inb(1); /* NAK the last byte */
ret = (tmp[0] << 8) | tmp[1];
}
else
ret = -4;
} }
else else
ret = -3; ret = -3;
} }
else else
ret = -2; ret = -2;
}
else
ret = -1;
i2c_stop();
i2c_stop();
}
i2c_end(); i2c_end();
return ret; return ret;
} }