Changed default_read prototype

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

2 files changed, 31 insertions, 5 deletions

diff --git a/firmware/drivers/mas.c b/firmware/drivers/mas.c
index 97017e8db5..38344ecc23 100644
--- a/firmware/drivers/mas.c
+++ b/firmware/drivers/mas.c
@@ -20,9 +20,34 @@
 #include "debug.h"
 #include "mas.h"
 
-int mas_default_read(unsigned long *buf)
+int mas_default_read(unsigned short *buf)
 {
-    return mas_devread(buf, 1);
+    unsigned char *dest = (unsigned char *)buf;
+    int ret = 0;
+    
+    i2c_start();
+    i2c_outb(MAS_DEV_WRITE);
+    if (i2c_getack()) {
+        i2c_outb(MAS_DATA_READ);
+        if (i2c_getack()) {
+            i2c_start();
+            i2c_outb(MAS_DEV_READ);
+            if (i2c_getack()) {
+                    dest[0] = i2c_inb(0);
+                    dest[1] = i2c_inb(1);
+            }
+            else
+                ret = -3;
+        }
+        else
+            ret = -2;
+    }
+    else
+        ret = -1;
+    
+    i2c_stop();
+
+    return ret;
 }
 
 int mas_run(unsigned short address)
@@ -126,7 +151,7 @@ int mas_readreg(int reg)
     return buf[0] | buf[1] << 8 | buf[3] << 16;
 }
 
-int mas_writereg(int reg, unsigned short val)
+int mas_writereg(int reg, unsigned int val)
 {
     int i;
     unsigned char buf[16];
diff --git a/firmware/drivers/mas.h b/firmware/drivers/mas.h
index aca71bd35f..a538bbcbf0 100644
--- a/firmware/drivers/mas.h
+++ b/firmware/drivers/mas.h
@@ -45,12 +45,13 @@
 #define MAS_REG_KBASS           0x6b
 #define MAS_REG_KTREBLE         0x6f
 
-int mas_default_read(unsigned long *buf);
+int mas_default_read(unsigned short *buf);
 int mas_run(unsigned short address);
 int mas_readmem(int bank, int addr, unsigned long* dest, int len);
 int mas_writemem(int bank, int addr, unsigned long* src, int len);
 int mas_devread(unsigned long *buf, int len);
 int mas_readreg(int reg);
-int mas_writereg(int reg, unsigned short val);
+int mas_writereg(int reg, unsigned int val);
+int dac_volume(unsigned int volume);
 
 #endif