diff options
author | Jens Arnold <amiconn@rockbox.org> | 2005-08-29 21:15:27 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2005-08-29 21:15:27 +0000 |
commit | d6c054575b4561b4c657565ecb4ff82565fa6c78 (patch) | |
tree | c05a7f619a2580a8ae3ee29e863f076d1065c398 /firmware/drivers/mas.c | |
parent | 99a0598c284471342fcda1fdcba90d4b666bfbb3 (diff) | |
download | rockbox-d6c054575b4561b4c657565ecb4ff82565fa6c78.tar.gz rockbox-d6c054575b4561b4c657565ecb4ff82565fa6c78.zip |
Renamed CONFIG_HWCODEC and MASNONE to the more appropriate CONFIG_CODEC and SWCODEC, respectively.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7416 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/mas.c')
-rw-r--r-- | firmware/drivers/mas.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/firmware/drivers/mas.c b/firmware/drivers/mas.c index 7c8b55c422..66ba6b6aff 100644 --- a/firmware/drivers/mas.c +++ b/firmware/drivers/mas.c | |||
@@ -132,7 +132,7 @@ int mas_writemem(int bank, int addr, const unsigned long* src, int len) | |||
132 | 132 | ||
133 | j = 0; | 133 | j = 0; |
134 | while(len--) { | 134 | while(len--) { |
135 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) | 135 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
136 | buf[i++] = 0; | 136 | buf[i++] = 0; |
137 | buf[i++] = ptr[j+1]; | 137 | buf[i++] = ptr[j+1]; |
138 | buf[i++] = ptr[j+2]; | 138 | buf[i++] = ptr[j+2]; |
@@ -232,7 +232,7 @@ static int mas_devread(unsigned long *dest, int len) | |||
232 | if (i2c_getack()) { | 232 | if (i2c_getack()) { |
233 | for (i=0;len;i++) { | 233 | for (i=0;len;i++) { |
234 | len--; | 234 | len--; |
235 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) | 235 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
236 | i2c_inb(0); /* Dummy read */ | 236 | i2c_inb(0); /* Dummy read */ |
237 | ptr[i*4+0] = 0; | 237 | ptr[i*4+0] = 0; |
238 | ptr[i*4+1] = i2c_inb(0) & 0x0f; | 238 | ptr[i*4+1] = i2c_inb(0) & 0x0f; |
@@ -270,7 +270,7 @@ void mas_reset(void) | |||
270 | { | 270 | { |
271 | or_b(0x01, &PAIORH); | 271 | or_b(0x01, &PAIORH); |
272 | 272 | ||
273 | #if CONFIG_HWCODEC == MAS3507D | 273 | #if CONFIG_CODEC == MAS3507D |
274 | /* PB5 is "MAS enable". make it GPIO output and high */ | 274 | /* PB5 is "MAS enable". make it GPIO output and high */ |
275 | PBCR2 &= ~0x0c00; | 275 | PBCR2 &= ~0x0c00; |
276 | or_b(0x20, &PBIORL); | 276 | or_b(0x20, &PBIORL); |
@@ -280,7 +280,7 @@ void mas_reset(void) | |||
280 | sleep(HZ/100); | 280 | sleep(HZ/100); |
281 | or_b(0x01, &PADRH); | 281 | or_b(0x01, &PADRH); |
282 | sleep(HZ/5); | 282 | sleep(HZ/5); |
283 | #elif (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) | 283 | #elif (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
284 | if(old_recorder) | 284 | if(old_recorder) |
285 | { | 285 | { |
286 | /* Older recorder models don't invert the POR signal */ | 286 | /* Older recorder models don't invert the POR signal */ |
@@ -299,7 +299,7 @@ void mas_reset(void) | |||
299 | #endif | 299 | #endif |
300 | } | 300 | } |
301 | 301 | ||
302 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) | 302 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
303 | int mas_direct_config_read(unsigned char reg) | 303 | int mas_direct_config_read(unsigned char reg) |
304 | { | 304 | { |
305 | int ret = 0; | 305 | int ret = 0; |