diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2008-03-18 22:48:26 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2008-03-18 22:48:26 +0000 |
| commit | eb0a7a3318c35298a5ad777e5ebe10ec7ec2bc63 (patch) | |
| tree | fcc0ba4e23dbbe81e5207b5c1ec03d76b02bdf8b | |
| parent | 6deb9f31ffdd48e9d7ce0bd3515fc75658b8fa9b (diff) | |
| download | rockbox-eb0a7a3318c35298a5ad777e5ebe10ec7ec2bc63.zip rockbox-eb0a7a3318c35298a5ad777e5ebe10ec7ec2bc63.tar.gz rockbox-eb0a7a3318c35298a5ad777e5ebe10ec7ec2bc63.tar.bz2 rockbox-eb0a7a3318c35298a5ad777e5ebe10ec7ec2bc63.tar.xz | |
Correct the name of a flag. No functional change.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16708 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/export/i2c-coldfire.h | 2 | ||||
| -rw-r--r-- | firmware/target/coldfire/i2c-coldfire.c | 6 | ||||
| -rw-r--r-- | firmware/target/coldfire/iaudio/m3/adc-m3.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/firmware/export/i2c-coldfire.h b/firmware/export/i2c-coldfire.h index 544a316..1fbf621 100644 --- a/firmware/export/i2c-coldfire.h +++ b/firmware/export/i2c-coldfire.h @@ -57,7 +57,7 @@ void i2c_adjust_prescale(int multiplier); #define IBB (1 << 5) /* Bus Busy */ #define IAL (1 << 4) /* Arbitration Lost */ #define SRW (1 << 2) /* Slave R/W */ -#define IFF (1 << 1) /* I2C Interrupt */ +#define IIF (1 << 1) /* I2C Interrupt */ #define RXAK (1 << 0) /* No Ack bit */ /* MBCR - Control register */ diff --git a/firmware/target/coldfire/i2c-coldfire.c b/firmware/target/coldfire/i2c-coldfire.c index 83d8db4..d0c369d 100644 --- a/firmware/target/coldfire/i2c-coldfire.c +++ b/firmware/target/coldfire/i2c-coldfire.c @@ -195,17 +195,17 @@ int i2c_start(volatile unsigned char *iface) int i2c_wait_for_slave(volatile unsigned char *iface) { int j = MAX_LOOP; - while (--j && ! (iface[O_MBSR] & IFF)) + while (--j && ! (iface[O_MBSR] & IIF)) ; if (!j) { - logf("i2c: IFF not set (iface=%08lX)", (uintptr_t)iface); + logf("i2c: IIF not set (iface=%08lX)", (uintptr_t)iface); i2c_stop(iface); return -2; } /* Clear interrupt flag */ - iface[O_MBSR] &= ~IFF; + iface[O_MBSR] &= ~IIF; return 0; } diff --git a/firmware/target/coldfire/iaudio/m3/adc-m3.c b/firmware/target/coldfire/iaudio/m3/adc-m3.c index 1f17b1e..5997f24 100644 --- a/firmware/target/coldfire/iaudio/m3/adc-m3.c +++ b/firmware/target/coldfire/iaudio/m3/adc-m3.c @@ -49,7 +49,7 @@ void IIC2(void) { static int bytenum = 0; - MBSR2 &= ~IFF; /* Clear interrupt flag */ + MBSR2 &= ~IIF; /* Clear interrupt flag */ if (MBSR2 & IAL) /* Arbitration lost - shouldn't never happen */ { |