diff options
author | Barry Wardell <rockbox@barrywardell.net> | 2007-03-03 23:37:17 +0000 |
---|---|---|
committer | Barry Wardell <rockbox@barrywardell.net> | 2007-03-03 23:37:17 +0000 |
commit | 169ebdbda7d805e83de06cd013759e6281d5db34 (patch) | |
tree | cbc23eea79cceb9611ee825ce3070d12d4b80db8 /firmware/target | |
parent | 8b061252c4359aa960ae31c0a4b2ba92f6771017 (diff) | |
download | rockbox-169ebdbda7d805e83de06cd013759e6281d5db34.tar.gz rockbox-169ebdbda7d805e83de06cd013759e6281d5db34.zip |
Some more replacing of inl/outl with register #define's (doesn't change end-result binary). Add lots more #define's based on the ipodlinux wiki and some extrapolation.
Also add PortalPlayer SoC version to the HW info debug screen.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12575 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target')
-rw-r--r-- | firmware/target/arm/ata-pp5020.c | 8 | ||||
-rw-r--r-- | firmware/target/arm/pcm-pp.c | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/firmware/target/arm/ata-pp5020.c b/firmware/target/arm/ata-pp5020.c index f8ca773132..022d1654d6 100644 --- a/firmware/target/arm/ata-pp5020.c +++ b/firmware/target/arm/ata-pp5020.c | |||
@@ -43,9 +43,9 @@ bool ata_is_coldstart() | |||
43 | void ata_device_init() | 43 | void ata_device_init() |
44 | { | 44 | { |
45 | /* From ipod-ide.c:ipod_ide_register() */ | 45 | /* From ipod-ide.c:ipod_ide_register() */ |
46 | outl(inl(0xc3000028) | (1 << 5), 0xc3000028); | 46 | IDE0_CFG |= (1<<5); |
47 | outl(inl(0xc3000028) & ~0x10000000, 0xc3000028); | 47 | IDE0_CFG &=~(0x10000000); /* cpu < 65MHz */ |
48 | 48 | ||
49 | outl(0x10, 0xc3000000); | 49 | IDE0_PRI_TIMING0 = 0x10; |
50 | outl(0x80002150, 0xc3000004); | 50 | IDE0_PRI_TIMING1 = 0x80002150; |
51 | } | 51 | } |
diff --git a/firmware/target/arm/pcm-pp.c b/firmware/target/arm/pcm-pp.c index 891213468c..d8eecadc9b 100644 --- a/firmware/target/arm/pcm-pp.c +++ b/firmware/target/arm/pcm-pp.c | |||
@@ -206,9 +206,8 @@ void pcm_play_dma_start(const void *addr, size_t size) | |||
206 | pcm_playing = true; | 206 | pcm_playing = true; |
207 | 207 | ||
208 | #if CONFIG_CPU == PP5020 | 208 | #if CONFIG_CPU == PP5020 |
209 | /* setup I2S interrupt for FIQ */ | 209 | CPU_INT_PRIORITY |= I2S_MASK; /* FIQ priority for I2S */ |
210 | outl(inl(0x6000402c) | I2S_MASK, 0x6000402c); | 210 | CPU_INT_EN = I2S_MASK; /* Enable I2S interrupt */ |
211 | CPU_INT_EN = I2S_MASK; | ||
212 | #elif CONFIG_CPU == PP5024 | 211 | #elif CONFIG_CPU == PP5024 |
213 | #else | 212 | #else |
214 | /* setup I2S interrupt for FIQ */ | 213 | /* setup I2S interrupt for FIQ */ |