Patch #5347 by Rani Hod - Adds FM radio and recording features to the iAudio X5.

Also includes a rewrite of the Coldfire I2C driver to include both read and write.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10272 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 12 insertions, 14 deletions

diff --git a/firmware/drivers/uda1380.c b/firmware/drivers/uda1380.c
index ef19dcf1c5..241a117385 100644
--- a/firmware/drivers/uda1380.c
+++ b/firmware/drivers/uda1380.c
@@ -76,14 +76,13 @@ unsigned short uda1380_defaults[2*NUM_DEFAULT_REGS] =
 /* Returns 0 if register was written or -1 if write failed */
 int uda1380_write_reg(unsigned char reg, unsigned short value)
 {
-    unsigned char data[4];
+    unsigned char data[3];
 
-    data[0] = UDA1380_ADDR;
-    data[1] = reg;
-    data[2] = value >> 8;
-    data[3] = value & 0xff;
+    data[0] = reg;
+    data[1] = value >> 8;
+    data[2] = value & 0xff;
 
-    if (i2c_write(1, data, 4) != 4)
+    if (i2c_write(I2C_IFACE_0, UDA1380_ADDR, data, 3) != 3)
     {
         DEBUGF("uda1380 error reg=0x%x", reg);
         return -1;
@@ -322,21 +321,20 @@ void uda1380_set_recvol(int left, int right, int type)
             {
                 /* for this order we can combine both registers,
                     making the glitch even smaller */
-                unsigned char data[6];
+                unsigned char data[5];
                 unsigned short value_dec;
                 unsigned short value_pga;
                 value_dec = DEC_VOLL(left) | DEC_VOLR(right);
                 value_pga = (uda1380_regs[REG_PGA] & ~PGA_GAIN_MASK)
                                 | PGA_GAINL(left_ag) | PGA_GAINR(right_ag);
 
-                data[0] = UDA1380_ADDR;
-                data[1] = REG_DEC_VOL;
-                data[2] = value_dec >> 8;
-                data[3] = value_dec & 0xff;
-                data[4] = value_pga >> 8;
-                data[5] = value_pga & 0xff;
+                data[0] = REG_DEC_VOL;
+                data[1] = value_dec >> 8;
+                data[2] = value_dec & 0xff;
+                data[3] = value_pga >> 8;
+                data[4] = value_pga & 0xff;
 
-                if (i2c_write(1, data, 6) != 6)
+                if (i2c_write(I2C_IFACE_0, UDA1380_ADDR, data, 5) != 5)
                 {
                     DEBUGF("uda1380 error reg=combi rec gain");
                 }