From 91bacf363ae4251a87edda4cb1c414153e350d2e Mon Sep 17 00:00:00 2001 From: Barry Wardell Date: Mon, 5 Nov 2007 14:26:47 +0000 Subject: 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 --- firmware/drivers/audio/as3514.c | 8 ++++---- 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; -- cgit v1.2.3