1 files changed, 71 insertions, 99 deletions

diff --git a/firmware/drivers/i2c-pp5020.c b/firmware/drivers/i2c-pp5020.c
index 6f8d9a91d5..ec6bcef0cd 100644
--- a/firmware/drivers/i2c-pp5020.c
+++ b/firmware/drivers/i2c-pp5020.c
@@ -23,18 +23,8 @@
 #include "system.h"
 #include "i2c-pp5020.h"
 
-#define I2C_DEVICE_1    ((volatile unsigned char *)0)
-#define I2C_DEVICE_2    ((volatile unsigned char *)0)
-
 /* Local functions definitions */
 
-#if 0
-static int i2c_write_byte(int device, unsigned char data);
-static int i2c_gen_start(int device);
-static void i2c_gen_stop(int device);
-static volatile unsigned char *i2c_get_addr(int device);
-#endif
-
 #define IPOD_I2C_BASE   0x7000c000
 #define IPOD_I2C_CTRL   (IPOD_I2C_BASE+0x00)
 #define IPOD_I2C_ADDR   (IPOD_I2C_BASE+0x04)
@@ -52,142 +42,124 @@ static volatile unsigned char *i2c_get_addr(int device);
 
 #define POLL_TIMEOUT (HZ)
 
-static int
-ipod_i2c_wait_not_busy(void)
+static int ipod_i2c_wait_not_busy(void)
 {
-#if 0
     unsigned long timeout;
-    timeout = jiffies + POLL_TIMEOUT;
-    while (time_before(jiffies, timeout)) {
+    timeout = current_tick + POLL_TIMEOUT;
+    while (TIME_BEFORE(current_tick, timeout)) {
          if (!(inb(IPOD_I2C_STATUS) & IPOD_I2C_BUSY)) {
             return 0;
          }
          yield();
     }
 
-    return -ETIMEDOUT;
-#endif
-    return 0;
+    return -1;
 }
 
 
 /* Public functions */
 
-void i2c_init(void)
+int ipod_i2c_read_byte(unsigned int addr, unsigned int *data)
 {
-  /* From ipodlinux */
+    if (ipod_i2c_wait_not_busy() < 0)
+    {
+        return -1;
+    }
 
-   outl(inl(0x6000600c) | 0x1000, 0x6000600c);     /* enable 12 */
-   outl(inl(0x60006004) | 0x1000, 0x60006004);     /* start reset 12 */
-   outl(inl(0x60006004) & ~0x1000, 0x60006004);    /* end reset 12 */
+    /* clear top 15 bits, left shift 1, or in 0x1 for a read */
+    outb(((addr << 17) >> 16) | 0x1, IPOD_I2C_ADDR);
 
-   outl(0x0, 0x600060a4);
-   outl(0x80 | (0 << 8), 0x600060a4);
+    outb(inb(IPOD_I2C_CTRL) | 0x20, IPOD_I2C_CTRL);
 
-   //i2c_readbyte(0x8, 0);
-}
+    outb(inb(IPOD_I2C_CTRL) | IPOD_I2C_SEND, IPOD_I2C_CTRL);
 
-void i2c_close(void)
-{
+    if (ipod_i2c_wait_not_busy() < 0)
+    {
+        return -1;
+    }
 
+    if (data)
+    {
+        *data = inb(IPOD_I2C_DATA0);
+    }
+
+    return 0;
 }
 
-/**
- * Writes bytes to the selected device.
- *
- * Returns number of bytes successfully send or -1 if START failed
- */
-int i2c_write(int device, unsigned char *buf, int count)
+int ipod_i2c_send_bytes(unsigned int addr, unsigned int len, unsigned char *data)
 {
-  /* From ipodlinux */
-        int data_addr;
-        int i;
-
-        if (count < 1 || count > 4) {
-                return -2;
-        }
+    int data_addr;
+    unsigned int i;
 
-        if (ipod_i2c_wait_not_busy() < 0) {
-           return -1;
-        }
-
-        // clear top 15 bits, left shift 1
-        outb((device << 17) >> 16, IPOD_I2C_ADDR);
+    if (len < 1 || len > 4)
+    {
+        return -1;
+    }
 
-        outb(inb(IPOD_I2C_CTRL) & ~0x20, IPOD_I2C_CTRL);
+    if (ipod_i2c_wait_not_busy() < 0)
+    {
+        return -2;
+    }
 
-        data_addr = IPOD_I2C_DATA0;
-        for ( i = 0; i < count; i++ ) {
-                outb(*buf++, data_addr);
+    /* clear top 15 bits, left shift 1 */
+    outb((addr << 17) >> 16, IPOD_I2C_ADDR);
 
-                data_addr += 4;
-        }
+    outb(inb(IPOD_I2C_CTRL) & ~0x20, IPOD_I2C_CTRL);
 
-        outb((inb(IPOD_I2C_CTRL) & ~0x26) | ((count-1) << 1), IPOD_I2C_CTRL);
+    data_addr = IPOD_I2C_DATA0;
+    for ( i = 0; i < len; i++ )
+    {
+        outb(*data++, data_addr);
+        data_addr += 4;
+    }
 
-        outb(inb(IPOD_I2C_CTRL) | IPOD_I2C_SEND, IPOD_I2C_CTRL);
+    outb((inb(IPOD_I2C_CTRL) & ~0x26) | ((len-1) << 1), IPOD_I2C_CTRL);
 
-        return 0x0;
+    outb(inb(IPOD_I2C_CTRL) | IPOD_I2C_SEND, IPOD_I2C_CTRL);
 
-    return count;
+    return 0x0;
 }
 
-#if 0
-/* Write a byte to the interface, returns 0 on success, -1 otherwise. */
-static int i2c_write_byte(int device, unsigned char data)
+int ipod_i2c_send_byte(unsigned int addr, int data0)
 {
-    if (ipod_i2c_wait_not_busy() < 0) {
-        return -2;
-    }
+    unsigned char data[1];
 
-    // clear top 15 bits, left shift 1
-    outb((device << 17) >> 16, IPOD_I2C_ADDR);
+    data[0] = data0;
 
-    outb(inb(IPOD_I2C_CTRL) & ~0x20, IPOD_I2C_CTRL);
+    return ipod_i2c_send_bytes(addr, 1, data);
+}
 
-    outb(data, IPOD_I2C_DATA0);
 
-    outb((inb(IPOD_I2C_CTRL) & ~0x26), IPOD_I2C_CTRL);
+int i2c_readbyte(unsigned int dev_addr, int addr)
+{
+    int data;
 
-    outb(inb(IPOD_I2C_CTRL) | IPOD_I2C_SEND, IPOD_I2C_CTRL);
+    ipod_i2c_send_byte(dev_addr, addr);
+    ipod_i2c_read_byte(dev_addr, &data);
 
-    return 0;
+    return data;
 }
 
-
-/* Returns 0 on success, -1 on failure */
-int i2c_gen_start(int device)
+int ipod_i2c_send(unsigned int addr, int data0, int data1)
 {
-    volatile unsigned char *regs = i2c_get_addr(device);
-    long count = 0;
+        unsigned char data[2];
 
-    /* Wait for bus to become free */
-    while ((regs[O_MBSR] & IBB) && (count < MAX_LOOP))
-    {
-        yield();
-        count++;
-    }
-
-    if (count >= MAX_LOOP)
-        return -1;
-
-    regs[O_MBCR] |= MSTA | MTX;         /* Generate START */
+        data[0] = data0;
+        data[1] = data1;
 
-    return 0;
-}  
+        return ipod_i2c_send_bytes(addr, 2, data);
+}
 
-void i2c_gen_stop(int device)
+void i2c_init(void)
 {
-    volatile unsigned char *regs = i2c_get_addr(device);
-    regs[O_MBCR] &= ~MSTA;          /* Clear MSTA to generate STOP */
-}
+   /* From ipodlinux */
 
-#endif
+   outl(inl(0x6000600c) | 0x1000, 0x6000600c);     /* enable 12 */
+   outl(inl(0x60006004) | 0x1000, 0x60006004);     /* start reset 12 */
+   outl(inl(0x60006004) & ~0x1000, 0x60006004);    /* end reset 12 */
 
-volatile unsigned char *i2c_get_addr(int device)
-{
-    if (device == 1)
-        return I2C_DEVICE_1;
+   outl(0x0, 0x600060a4);
+   outl(0x80 | (0 << 8), 0x600060a4);
 
-    return I2C_DEVICE_2;
+   i2c_readbyte(0x8, 0);
 }