diff options
| author | Barry Wardell <rockbox@barrywardell.net> | 2007-11-05 14:26:47 +0000 |
|---|---|---|
| committer | Barry Wardell <rockbox@barrywardell.net> | 2007-11-05 14:26:47 +0000 |
| commit | 91bacf363ae4251a87edda4cb1c414153e350d2e (patch) | |
| tree | 25f61537279a458f64bda24b1b4b2dd6888ff8cd | |
| parent | 91ccc01bcf78e6a06dce5f900242397813c1e50e (diff) | |
| download | rockbox-91bacf363ae4251a87edda4cb1c414153e350d2e.tar.gz rockbox-91bacf363ae4251a87edda4cb1c414153e350d2e.zip | |
Get rid of a couple of inl/outl since we have defines. Also use some other defines in place of magic values.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15470 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/drivers/audio/as3514.c | 8 | ||||
| -rw-r--r-- | firmware/target/arm/wmcodec-pp.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/firmware/drivers/audio/as3514.c b/firmware/drivers/audio/as3514.c index bc6705caf2..5d7c700ac1 100644 --- a/firmware/drivers/audio/as3514.c +++ b/firmware/drivers/audio/as3514.c @@ -141,15 +141,15 @@ void audiohw_init(void) DEV_INIT2 &= ~0x300; /*mini2?*/ - outl(inl(0x70000010) & ~0x3000000, 0x70000010); + DEV_INIT1 &=~0x3000000; /*mini2?*/ /* device reset */ - DEV_RS |= 0x800; - DEV_RS &=~0x800; + DEV_RS |= DEV_I2S; + DEV_RS &=~DEV_I2S; /* device enable */ - DEV_EN |= 0x807; + DEV_EN |= (DEV_I2S | 0x7); /* enable external dev clock clocks */ DEV_EN |= 0x2; diff --git a/firmware/target/arm/wmcodec-pp.c b/firmware/target/arm/wmcodec-pp.c index 3dd00695ae..1f688d135f 100644 --- a/firmware/target/arm/wmcodec-pp.c +++ b/firmware/target/arm/wmcodec-pp.c @@ -49,15 +49,15 @@ void audiohw_init(void) { DEV_INIT2 &= ~0x300; /*mini2?*/ - outl(inl(0x70000010) & ~0x3000000, 0x70000010); + DEV_INIT1 &=~0x3000000; /*mini2?*/ /* device reset */ - DEV_RS |= 0x800; - DEV_RS &=~0x800; + DEV_RS |= DEV_I2S; + DEV_RS &=~DEV_I2S; /* device enable */ - DEV_EN |= 0x807; + DEV_EN |= (DEV_I2S | 0x7); /* enable external dev clock clocks */ DEV_EN |= 0x2; |