summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2008-03-18 22:48:26 +0000
committerJens Arnold <amiconn@rockbox.org>2008-03-18 22:48:26 +0000
commiteb0a7a3318c35298a5ad777e5ebe10ec7ec2bc63 (patch)
treefcc0ba4e23dbbe81e5207b5c1ec03d76b02bdf8b
parent6deb9f31ffdd48e9d7ce0bd3515fc75658b8fa9b (diff)
downloadrockbox-eb0a7a3318c35298a5ad777e5ebe10ec7ec2bc63.tar.gz
rockbox-eb0a7a3318c35298a5ad777e5ebe10ec7ec2bc63.zip
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.h2
-rw-r--r--firmware/target/coldfire/i2c-coldfire.c6
-rw-r--r--firmware/target/coldfire/iaudio/m3/adc-m3.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/firmware/export/i2c-coldfire.h b/firmware/export/i2c-coldfire.h
index 544a3169cf..1fbf621467 100644
--- a/firmware/export/i2c-coldfire.h
+++ b/firmware/export/i2c-coldfire.h
@@ -57,7 +57,7 @@ void i2c_adjust_prescale(int multiplier);
57#define IBB (1 << 5) /* Bus Busy */ 57#define IBB (1 << 5) /* Bus Busy */
58#define IAL (1 << 4) /* Arbitration Lost */ 58#define IAL (1 << 4) /* Arbitration Lost */
59#define SRW (1 << 2) /* Slave R/W */ 59#define SRW (1 << 2) /* Slave R/W */
60#define IFF (1 << 1) /* I2C Interrupt */ 60#define IIF (1 << 1) /* I2C Interrupt */
61#define RXAK (1 << 0) /* No Ack bit */ 61#define RXAK (1 << 0) /* No Ack bit */
62 62
63/* MBCR - Control register */ 63/* MBCR - Control register */
diff --git a/firmware/target/coldfire/i2c-coldfire.c b/firmware/target/coldfire/i2c-coldfire.c
index 83d8db4048..d0c369d1cc 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)
195int i2c_wait_for_slave(volatile unsigned char *iface) 195int i2c_wait_for_slave(volatile unsigned char *iface)
196{ 196{
197 int j = MAX_LOOP; 197 int j = MAX_LOOP;
198 while (--j && ! (iface[O_MBSR] & IFF)) 198 while (--j && ! (iface[O_MBSR] & IIF))
199 ; 199 ;
200 if (!j) 200 if (!j)
201 { 201 {
202 logf("i2c: IFF not set (iface=%08lX)", (uintptr_t)iface); 202 logf("i2c: IIF not set (iface=%08lX)", (uintptr_t)iface);
203 i2c_stop(iface); 203 i2c_stop(iface);
204 return -2; 204 return -2;
205 } 205 }
206 206
207 /* Clear interrupt flag */ 207 /* Clear interrupt flag */
208 iface[O_MBSR] &= ~IFF; 208 iface[O_MBSR] &= ~IIF;
209 209
210 return 0; 210 return 0;
211} 211}
diff --git a/firmware/target/coldfire/iaudio/m3/adc-m3.c b/firmware/target/coldfire/iaudio/m3/adc-m3.c
index 1f17b1e3f1..5997f2419a 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)
49{ 49{
50 static int bytenum = 0; 50 static int bytenum = 0;
51 51
52 MBSR2 &= ~IFF; /* Clear interrupt flag */ 52 MBSR2 &= ~IIF; /* Clear interrupt flag */
53 53
54 if (MBSR2 & IAL) /* Arbitration lost - shouldn't never happen */ 54 if (MBSR2 & IAL) /* Arbitration lost - shouldn't never happen */
55 { 55 {