diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/mas.c | 31 | ||||
-rw-r--r-- | firmware/drivers/mas.h | 5 |
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 @@ | |||
20 | #include "debug.h" | 20 | #include "debug.h" |
21 | #include "mas.h" | 21 | #include "mas.h" |
22 | 22 | ||
23 | int mas_default_read(unsigned long *buf) | 23 | int mas_default_read(unsigned short *buf) |
24 | { | 24 | { |
25 | return mas_devread(buf, 1); | 25 | unsigned char *dest = (unsigned char *)buf; |
26 | int ret = 0; | ||
27 | |||
28 | i2c_start(); | ||
29 | i2c_outb(MAS_DEV_WRITE); | ||
30 | if (i2c_getack()) { | ||
31 | i2c_outb(MAS_DATA_READ); | ||
32 | if (i2c_getack()) { | ||
33 | i2c_start(); | ||
34 | i2c_outb(MAS_DEV_READ); | ||
35 | if (i2c_getack()) { | ||
36 | dest[0] = i2c_inb(0); | ||
37 | dest[1] = i2c_inb(1); | ||
38 | } | ||
39 | else | ||
40 | ret = -3; | ||
41 | } | ||
42 | else | ||
43 | ret = -2; | ||
44 | } | ||
45 | else | ||
46 | ret = -1; | ||
47 | |||
48 | i2c_stop(); | ||
49 | |||
50 | return ret; | ||
26 | } | 51 | } |
27 | 52 | ||
28 | int mas_run(unsigned short address) | 53 | int mas_run(unsigned short address) |
@@ -126,7 +151,7 @@ int mas_readreg(int reg) | |||
126 | return buf[0] | buf[1] << 8 | buf[3] << 16; | 151 | return buf[0] | buf[1] << 8 | buf[3] << 16; |
127 | } | 152 | } |
128 | 153 | ||
129 | int mas_writereg(int reg, unsigned short val) | 154 | int mas_writereg(int reg, unsigned int val) |
130 | { | 155 | { |
131 | int i; | 156 | int i; |
132 | unsigned char buf[16]; | 157 | 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 @@ | |||
45 | #define MAS_REG_KBASS 0x6b | 45 | #define MAS_REG_KBASS 0x6b |
46 | #define MAS_REG_KTREBLE 0x6f | 46 | #define MAS_REG_KTREBLE 0x6f |
47 | 47 | ||
48 | int mas_default_read(unsigned long *buf); | 48 | int mas_default_read(unsigned short *buf); |
49 | int mas_run(unsigned short address); | 49 | int mas_run(unsigned short address); |
50 | int mas_readmem(int bank, int addr, unsigned long* dest, int len); | 50 | int mas_readmem(int bank, int addr, unsigned long* dest, int len); |
51 | int mas_writemem(int bank, int addr, unsigned long* src, int len); | 51 | int mas_writemem(int bank, int addr, unsigned long* src, int len); |
52 | int mas_devread(unsigned long *buf, int len); | 52 | int mas_devread(unsigned long *buf, int len); |
53 | int mas_readreg(int reg); | 53 | int mas_readreg(int reg); |
54 | int mas_writereg(int reg, unsigned short val); | 54 | int mas_writereg(int reg, unsigned int val); |
55 | int dac_volume(unsigned int volume); | ||
55 | 56 | ||
56 | #endif | 57 | #endif |