len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-11 06:05:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed default_read prototype

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@606 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2002-05-16 21:12:57 +00:00
parent 2f54401455
commit 0e085999d5
2 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

31
firmware/drivers/mas.c
View file

@ -20,9 +20,34 @@
#include "debug.h" #include "debug.h"
#include "mas.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) int mas_run(unsigned short address)
@ -126,7 +151,7 @@ int mas_readreg(int reg)
return buf[0] | buf[1] << 8 | buf[3] << 16; 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; int i;
unsigned char buf[16]; unsigned char buf[16];

5
firmware/drivers/mas.h
View file

@ -45,12 +45,13 @@
#define MAS_REG_KBASS 0x6b #define MAS_REG_KBASS 0x6b
#define MAS_REG_KTREBLE 0x6f #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_run(unsigned short address);
int mas_readmem(int bank, int addr, unsigned long* dest, int len); 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_writemem(int bank, int addr, unsigned long* src, int len);
int mas_devread(unsigned long *buf, int len); int mas_devread(unsigned long *buf, int len);
int mas_readreg(int reg); 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 #endif