diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-09-20 08:01:56 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-09-20 08:01:56 +0000 |
| commit | bdf4d3927c374d748cd16a1ca087ca6a52401df9 (patch) | |
| tree | 4803d75e06f798f664f7cdb18a78def5641a63f0 | |
| parent | 7b97fe21c0f2c9b6742ad50439020023f385fe6c (diff) | |
Hopefully fix all the errors/warnings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14764 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/target/arm/system-arm.h | 8 | ||||
| -rw-r--r-- | firmware/target/arm/system-target.h | 7 |
2 files changed, 6 insertions, 9 deletions
diff --git a/firmware/target/arm/system-arm.h b/firmware/target/arm/system-arm.h index aeb90df399..c3af652ebc 100644 --- a/firmware/target/arm/system-arm.h +++ b/firmware/target/arm/system-arm.h @@ -22,14 +22,6 @@ #define nop \ asm volatile ("nop") -//#define outw(v,a) *(volatile unsigned short *)(a+PHY_IO_BASE) = (v) -#ifndef outw -#define outw(v,p) (*((unsigned short*)(p + PHY_IO_BASE)) = v) -#endif - -#ifndef inw -#define inw(p) (*((unsigned short*)(p + PHY_IO_BASE))) -#endif /* This gets too complicated otherwise with all the ARM variation and would have conflicts with another system-target.h elsewhere so include a diff --git a/firmware/target/arm/system-target.h b/firmware/target/arm/system-target.h index 5cfd02840c..4e7228415d 100644 --- a/firmware/target/arm/system-target.h +++ b/firmware/target/arm/system-target.h @@ -22,7 +22,7 @@ #include "system-arm.h" -#if (CONFIG_CPU == PP5002) || (CONFIG_CPU == PP5022) || (CONFIG_CPU == PP5024) +#ifdef CPU_PP /* TODO: This header is actually portalplayer specific, and should be * moved into an appropriate subdir (or even split in 2). */ @@ -91,6 +91,11 @@ static inline void flush_icache(void) } #endif /* CONFIG_CPU */ +#else /* CPU_CONFIG == DM320 */ + +#define inw(p) (*((unsigned short*)(p + PHY_IO_BASE))) +#define outw(v,p) (*((unsigned short*)(p + PHY_IO_BASE)) = v) + #endif #endif /* SYSTEM_TARGET_H */ |