diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2012-01-03 04:33:26 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2012-01-03 04:33:26 +0000 |
commit | bbe5845f04433846c553579d70310bef8efd0f50 (patch) | |
tree | 2c47895c54315030608c13a3e9d8ffeb3fd461f1 | |
parent | 0ff5c5d3ed58d7fc0ac8090bfe0b0de6f3d668d8 (diff) | |
download | rockbox-bbe5845f04433846c553579d70310bef8efd0f50.tar.gz rockbox-bbe5845f04433846c553579d70310bef8efd0f50.zip |
arm/pp : assume CPU_PP
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31532 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/target/arm/pp/ascodec-target.h | 6 | ||||
-rw-r--r-- | firmware/target/arm/pp/ata-target.h | 4 | ||||
-rw-r--r-- | firmware/target/arm/pp/sd-pp-target.h | 4 | ||||
-rw-r--r-- | firmware/target/arm/pp/system-target.h | 6 |
4 files changed, 1 insertions, 19 deletions
diff --git a/firmware/target/arm/pp/ascodec-target.h b/firmware/target/arm/pp/ascodec-target.h index 68d9905a6b..e7fd1b3b35 100644 --- a/firmware/target/arm/pp/ascodec-target.h +++ b/firmware/target/arm/pp/ascodec-target.h | |||
@@ -27,10 +27,6 @@ | |||
27 | 27 | ||
28 | #include "config.h" | 28 | #include "config.h" |
29 | 29 | ||
30 | #ifdef CPU_PP | ||
31 | /* TODO: This header is actually portalplayer specific, and should be | ||
32 | * moved into an appropriate subdir */ | ||
33 | |||
34 | #include "as3514.h" | 30 | #include "as3514.h" |
35 | #include "i2c-pp.h" | 31 | #include "i2c-pp.h" |
36 | 32 | ||
@@ -98,6 +94,4 @@ static inline int ascodec_read_charger(void) | |||
98 | 94 | ||
99 | extern void ascodec_suppressor_on(bool on); | 95 | extern void ascodec_suppressor_on(bool on); |
100 | 96 | ||
101 | #endif /* CPU_PP */ | ||
102 | |||
103 | #endif /* !_ASCODEC_TARGET_H */ | 97 | #endif /* !_ASCODEC_TARGET_H */ |
diff --git a/firmware/target/arm/pp/ata-target.h b/firmware/target/arm/pp/ata-target.h index 616c451579..b888f85b88 100644 --- a/firmware/target/arm/pp/ata-target.h +++ b/firmware/target/arm/pp/ata-target.h | |||
@@ -24,8 +24,6 @@ | |||
24 | 24 | ||
25 | #include "config.h" | 25 | #include "config.h" |
26 | 26 | ||
27 | #ifdef CPU_PP | ||
28 | |||
29 | #ifdef HAVE_BOOTLOADER_USB_MODE | 27 | #ifdef HAVE_BOOTLOADER_USB_MODE |
30 | #define ATA_DRIVER_CLOSE | 28 | #define ATA_DRIVER_CLOSE |
31 | #endif | 29 | #endif |
@@ -57,8 +55,6 @@ | |||
57 | 55 | ||
58 | #endif /* CONFIG_CPU */ | 56 | #endif /* CONFIG_CPU */ |
59 | 57 | ||
60 | #endif | ||
61 | |||
62 | #ifdef HAVE_ATA_DMA | 58 | #ifdef HAVE_ATA_DMA |
63 | 59 | ||
64 | /* IDE DMA controller registers */ | 60 | /* IDE DMA controller registers */ |
diff --git a/firmware/target/arm/pp/sd-pp-target.h b/firmware/target/arm/pp/sd-pp-target.h index 222daa1a52..342543552a 100644 --- a/firmware/target/arm/pp/sd-pp-target.h +++ b/firmware/target/arm/pp/sd-pp-target.h | |||
@@ -21,12 +21,8 @@ | |||
21 | #ifndef ATA_SD_TARGET_H | 21 | #ifndef ATA_SD_TARGET_H |
22 | #define ATA_SD_TARGET_H | 22 | #define ATA_SD_TARGET_H |
23 | 23 | ||
24 | #ifdef CPU_PP /* PortalPlayer specific functions */ | ||
25 | |||
26 | #ifdef HAVE_HOTSWAP | 24 | #ifdef HAVE_HOTSWAP |
27 | void microsd_int(void); | 25 | void microsd_int(void); |
28 | #endif | 26 | #endif |
29 | 27 | ||
30 | #endif | 28 | #endif |
31 | |||
32 | #endif | ||
diff --git a/firmware/target/arm/pp/system-target.h b/firmware/target/arm/pp/system-target.h index e7f9ce0245..84419edd77 100644 --- a/firmware/target/arm/pp/system-target.h +++ b/firmware/target/arm/pp/system-target.h | |||
@@ -26,9 +26,7 @@ | |||
26 | #include "system-arm.h" | 26 | #include "system-arm.h" |
27 | #include <stdbool.h> | 27 | #include <stdbool.h> |
28 | 28 | ||
29 | #ifdef CPU_PP | 29 | /* TODO: This header could be split in 2 */ |
30 | /* TODO: This header is actually portalplayer specific, and should be | ||
31 | * moved into an appropriate subdir (or even split in 2). */ | ||
32 | 30 | ||
33 | #if CONFIG_CPU == PP5002 | 31 | #if CONFIG_CPU == PP5002 |
34 | #define CPUFREQ_SLEEP 32768 | 32 | #define CPUFREQ_SLEEP 32768 |
@@ -201,6 +199,4 @@ void system_prepare_fw_start(void); | |||
201 | 199 | ||
202 | #endif /* BOOTLOADER */ | 200 | #endif /* BOOTLOADER */ |
203 | 201 | ||
204 | #endif /* CPU_PP */ | ||
205 | |||
206 | #endif /* SYSTEM_TARGET_H */ | 202 | #endif /* SYSTEM_TARGET_H */ |