len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-11 22:22:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bit banged TEA5767 i2c driver was broken by -Os because delay loops were optimized away. Last byte was being acked when reading so fix that too. Calling all developers: seek out any C delay loops and make sure they're volatile.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13723 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2007-06-27 00:22:46 +00:00
parent 126d81ecf5
commit 9614612830
1 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
firmware/drivers/fmradio_i2c.c
View file

@ -80,8 +80,7 @@ int fmradio_i2c_read(unsigned char address, unsigned char* buf, int count)
#endif #endif
/* delay loop to achieve 400kHz at 120MHz CPU frequency */ /* delay loop to achieve 400kHz at 120MHz CPU frequency */
#define DELAY do { int _x; for(_x=0;_x<22;_x++);} while(0) #define DELAY do { volatile int _x; for(_x=0;_x<22;_x++);} while (0)
static void fmradio_i2c_start(void) static void fmradio_i2c_start(void)
{ {
@ -207,8 +206,6 @@ static unsigned char fmradio_i2c_inb(void)
SDA_OUTPUT; SDA_OUTPUT;
} }
fmradio_i2c_ack();
return byte; return byte;
} }
@ -248,9 +245,11 @@ int fmradio_i2c_read(int address, unsigned char* buf, int count)
if (fmradio_i2c_getack()) if (fmradio_i2c_getack())
{ {
for (i=0; i<count; i++) for (i=count; i>0; i--)
{ {
buf[i] = fmradio_i2c_inb(); *buf++ = fmradio_i2c_inb();
if (i != 1)
fmradio_i2c_ack();
} }
} }
else else
@ -276,8 +275,7 @@ int fmradio_i2c_read(int address, unsigned char* buf, int count)
#define SCL (PBDR & 0x0002) #define SCL (PBDR & 0x0002)
/* arbitrary delay loop */ /* arbitrary delay loop */
#define DELAY do { int _x; for(_x=0;_x<20;_x++);} while (0) #define DELAY do { volatile int _x; for(_x=0;_x<20;_x++);} while (0)
static void fmradio_i2c_start(void) static void fmradio_i2c_start(void)
{ {
@ -370,7 +368,7 @@ static void fmradio_i2c_outb(unsigned char byte)
SDA_HI; SDA_HI;
} }
static unsigned char fmradio_i2c_inb(int ack) static unsigned char fmradio_i2c_inb(void)
{ {
int i; int i;
unsigned char byte = 0; unsigned char byte = 0;
@ -385,8 +383,6 @@ static unsigned char fmradio_i2c_inb(int ack)
SDA_OUTPUT; SDA_OUTPUT;
} }
fmradio_i2c_ack(ack);
return byte; return byte;
} }
@ -424,8 +420,11 @@ int fmradio_i2c_read(int address, unsigned char* buf, int count)
fmradio_i2c_start(); fmradio_i2c_start();
fmradio_i2c_outb(address | 1); fmradio_i2c_outb(address | 1);
if (fmradio_i2c_getack()) { if (fmradio_i2c_getack()) {
for (i=0; i<count; i++) { for (i=count; i>0; i--)
buf[i] = fmradio_i2c_inb(0); {
*buf++ = fmradio_i2c_inb();
if (i != 1)
fmradio_i2c_ack(ack);
} }
} }
else else