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 | |
| parent | 99a0598c284471342fcda1fdcba90d4b666bfbb3 (diff) | |
| download | rockbox-d6c054575b4561b4c657565ecb4ff82565fa6c78.zip rockbox-d6c054575b4561b4c657565ecb4ff82565fa6c78.tar.gz rockbox-d6c054575b4561b4c657565ecb4ff82565fa6c78.tar.bz2 rockbox-d6c054575b4561b4c657565ecb4ff82565fa6c78.tar.xz | |
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')
| -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 7c8b55c..66ba6b6 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) j = 0; while(len--) { -#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) +#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) buf[i++] = 0; buf[i++] = ptr[j+1]; buf[i++] = ptr[j+2]; @@ -232,7 +232,7 @@ static int mas_devread(unsigned long *dest, int len) if (i2c_getack()) { for (i=0;len;i++) { len--; -#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) +#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) i2c_inb(0); /* Dummy read */ ptr[i*4+0] = 0; ptr[i*4+1] = i2c_inb(0) & 0x0f; @@ -270,7 +270,7 @@ void mas_reset(void) { or_b(0x01, &PAIORH); -#if CONFIG_HWCODEC == MAS3507D +#if CONFIG_CODEC == MAS3507D /* PB5 is "MAS enable". make it GPIO output and high */ PBCR2 &= ~0x0c00; or_b(0x20, &PBIORL); @@ -280,7 +280,7 @@ void mas_reset(void) sleep(HZ/100); or_b(0x01, &PADRH); sleep(HZ/5); -#elif (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) +#elif (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) if(old_recorder) { /* Older recorder models don't invert the POR signal */ @@ -299,7 +299,7 @@ void mas_reset(void) #endif } -#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) +#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) int mas_direct_config_read(unsigned char reg) { int ret = 0; |