diff options
author | Jens Arnold <amiconn@rockbox.org> | 2007-08-14 22:06:23 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2007-08-14 22:06:23 +0000 |
commit | 8a177345ce7b96a00f1f14387412c2dfacfeaf34 (patch) | |
tree | fbb8dfa828cf578d535e3d77deebf077b24d2970 /firmware/export | |
parent | 360d951271659af590103dd81efb8166f5b226a2 (diff) | |
download | rockbox-8a177345ce7b96a00f1f14387412c2dfacfeaf34.tar.gz rockbox-8a177345ce7b96a00f1f14387412c2dfacfeaf34.zip |
Moved archos power handling into target tree. * Tuner power handling cleaned up a bit.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14345 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/config-fmrecorder.h | 6 | ||||
-rw-r--r-- | firmware/export/config-ondiofm.h | 3 | ||||
-rw-r--r-- | firmware/export/config-ondiosp.h | 3 | ||||
-rw-r--r-- | firmware/export/config-player.h | 6 | ||||
-rw-r--r-- | firmware/export/config-recorder.h | 6 | ||||
-rw-r--r-- | firmware/export/config-recorderv2.h | 6 | ||||
-rw-r--r-- | firmware/export/power.h | 5 | ||||
-rw-r--r-- | firmware/export/tuner.h | 1 |
8 files changed, 2 insertions, 34 deletions
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h index 2f5254f3bc..a41c69a7bf 100644 --- a/firmware/export/config-fmrecorder.h +++ b/firmware/export/config-fmrecorder.h | |||
@@ -84,18 +84,12 @@ | |||
84 | /* Define this if you have a FM Recorder key system */ | 84 | /* Define this if you have a FM Recorder key system */ |
85 | #define HAVE_FMADC | 85 | #define HAVE_FMADC |
86 | 86 | ||
87 | /* Define this if you need to power on ATA */ | ||
88 | #define NEEDS_ATA_POWER_ON | ||
89 | |||
90 | /* Define this if battery voltage can only be measured with ATA powered */ | 87 | /* Define this if battery voltage can only be measured with ATA powered */ |
91 | #define NEED_ATA_POWER_BATT_MEASURE | 88 | #define NEED_ATA_POWER_BATT_MEASURE |
92 | 89 | ||
93 | /* Define this to the CPU frequency */ | 90 | /* Define this to the CPU frequency */ |
94 | #define CPU_FREQ 11059200 | 91 | #define CPU_FREQ 11059200 |
95 | 92 | ||
96 | /* Define this if you control power on PB5 (instead of the OFF button) */ | ||
97 | #define HAVE_POWEROFF_ON_PB5 | ||
98 | |||
99 | /* Offset ( in the firmware file's header ) to the file length */ | 93 | /* Offset ( in the firmware file's header ) to the file length */ |
100 | #define FIRMWARE_OFFSET_FILE_LENGTH 20 | 94 | #define FIRMWARE_OFFSET_FILE_LENGTH 20 |
101 | 95 | ||
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h index f9c2b191f1..335ce855fc 100644 --- a/firmware/export/config-ondiofm.h +++ b/firmware/export/config-ondiofm.h | |||
@@ -75,9 +75,6 @@ | |||
75 | /* Define this for different I2C pinout */ | 75 | /* Define this for different I2C pinout */ |
76 | #define CONFIG_I2C I2C_ONDIO | 76 | #define CONFIG_I2C I2C_ONDIO |
77 | 77 | ||
78 | /* Define this if you control power on PB5 (instead of the OFF button) */ | ||
79 | #define HAVE_POWEROFF_ON_PB5 | ||
80 | |||
81 | /* Offset ( in the firmware file's header ) to the file length */ | 78 | /* Offset ( in the firmware file's header ) to the file length */ |
82 | #define FIRMWARE_OFFSET_FILE_LENGTH 20 | 79 | #define FIRMWARE_OFFSET_FILE_LENGTH 20 |
83 | 80 | ||
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h index 510ce01f57..0ceb72e936 100644 --- a/firmware/export/config-ondiosp.h +++ b/firmware/export/config-ondiosp.h | |||
@@ -61,9 +61,6 @@ | |||
61 | /* Define this to the CPU frequency */ | 61 | /* Define this to the CPU frequency */ |
62 | #define CPU_FREQ 12000000 | 62 | #define CPU_FREQ 12000000 |
63 | 63 | ||
64 | /* Define this if you control power on PB5 (instead of the OFF button) */ | ||
65 | #define HAVE_POWEROFF_ON_PB5 | ||
66 | |||
67 | /* Offset ( in the firmware file's header ) to the file length */ | 64 | /* Offset ( in the firmware file's header ) to the file length */ |
68 | #define FIRMWARE_OFFSET_FILE_LENGTH 20 | 65 | #define FIRMWARE_OFFSET_FILE_LENGTH 20 |
69 | 66 | ||
diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h index 5e20d9e393..bd89b0bb2e 100644 --- a/firmware/export/config-player.h +++ b/firmware/export/config-player.h | |||
@@ -48,9 +48,6 @@ | |||
48 | * Attention, some players crash when ATA power-off is enabled! */ | 48 | * Attention, some players crash when ATA power-off is enabled! */ |
49 | //#define HAVE_ATA_POWER_OFF | 49 | //#define HAVE_ATA_POWER_OFF |
50 | 50 | ||
51 | /* Define this if you need to power on ATA */ | ||
52 | #define NEEDS_ATA_POWER_ON | ||
53 | |||
54 | /* Define this if you control ata power player style | 51 | /* Define this if you control ata power player style |
55 | (with PB4, new player only) */ | 52 | (with PB4, new player only) */ |
56 | #define ATA_POWER_PLAYERSTYLE | 53 | #define ATA_POWER_PLAYERSTYLE |
@@ -64,9 +61,6 @@ | |||
64 | 61 | ||
65 | #define CONFIG_I2C I2C_PLAYREC | 62 | #define CONFIG_I2C I2C_PLAYREC |
66 | 63 | ||
67 | /* Define this if you control power on PADR (instead of PBDR) */ | ||
68 | #define HAVE_POWEROFF_ON_PADR | ||
69 | |||
70 | /* Offset ( in the firmware file's header ) to the file length */ | 64 | /* Offset ( in the firmware file's header ) to the file length */ |
71 | #define FIRMWARE_OFFSET_FILE_LENGTH 0 | 65 | #define FIRMWARE_OFFSET_FILE_LENGTH 0 |
72 | 66 | ||
diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h index 920db04a01..4569c8bfd0 100644 --- a/firmware/export/config-recorder.h +++ b/firmware/export/config-recorder.h | |||
@@ -71,15 +71,9 @@ | |||
71 | /* Define this if you have ATA power-off control */ | 71 | /* Define this if you have ATA power-off control */ |
72 | #define HAVE_ATA_POWER_OFF | 72 | #define HAVE_ATA_POWER_OFF |
73 | 73 | ||
74 | /* Define this if you need to power on ATA */ | ||
75 | #define NEEDS_ATA_POWER_ON | ||
76 | |||
77 | /* Define this to the CPU frequency */ | 74 | /* Define this to the CPU frequency */ |
78 | #define CPU_FREQ 11059200 | 75 | #define CPU_FREQ 11059200 |
79 | 76 | ||
80 | /* Define this if you control power on PBDR (instead of PADR) */ | ||
81 | #define HAVE_POWEROFF_ON_PBDR | ||
82 | |||
83 | /* Offset ( in the firmware file's header ) to the file length */ | 77 | /* Offset ( in the firmware file's header ) to the file length */ |
84 | #define FIRMWARE_OFFSET_FILE_LENGTH 0 | 78 | #define FIRMWARE_OFFSET_FILE_LENGTH 0 |
85 | 79 | ||
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h index fc1461066a..d28595d154 100644 --- a/firmware/export/config-recorderv2.h +++ b/firmware/export/config-recorderv2.h | |||
@@ -81,18 +81,12 @@ | |||
81 | /* Define this if you have a FM Recorder key system */ | 81 | /* Define this if you have a FM Recorder key system */ |
82 | #define HAVE_FMADC | 82 | #define HAVE_FMADC |
83 | 83 | ||
84 | /* Define this if you need to power on ATA */ | ||
85 | #define NEEDS_ATA_POWER_ON | ||
86 | |||
87 | /* Define this if battery voltage can only be measured with ATA powered */ | 84 | /* Define this if battery voltage can only be measured with ATA powered */ |
88 | #define NEED_ATA_POWER_BATT_MEASURE | 85 | #define NEED_ATA_POWER_BATT_MEASURE |
89 | 86 | ||
90 | /* Define this to the CPU frequency */ | 87 | /* Define this to the CPU frequency */ |
91 | #define CPU_FREQ 11059200 | 88 | #define CPU_FREQ 11059200 |
92 | 89 | ||
93 | /* Define this if you control power on PB5 (instead of the OFF button) */ | ||
94 | #define HAVE_POWEROFF_ON_PB5 | ||
95 | |||
96 | /* Offset ( in the firmware file's header ) to the file length */ | 90 | /* Offset ( in the firmware file's header ) to the file length */ |
97 | #define FIRMWARE_OFFSET_FILE_LENGTH 20 | 91 | #define FIRMWARE_OFFSET_FILE_LENGTH 20 |
98 | 92 | ||
diff --git a/firmware/export/power.h b/firmware/export/power.h index b97410fd54..7c0ed3df89 100644 --- a/firmware/export/power.h +++ b/firmware/export/power.h | |||
@@ -48,9 +48,8 @@ bool spdif_powered(void); | |||
48 | #endif | 48 | #endif |
49 | 49 | ||
50 | #if CONFIG_TUNER | 50 | #if CONFIG_TUNER |
51 | extern bool tuner_power(bool status); | 51 | bool tuner_power(bool status); |
52 | extern bool tuner_power_nolock(bool status); | 52 | bool tuner_power_nolock(bool status); |
53 | extern bool tuner_powered(void); | ||
54 | #endif | 53 | #endif |
55 | 54 | ||
56 | #endif | 55 | #endif |
diff --git a/firmware/export/tuner.h b/firmware/export/tuner.h index 1225830094..c1bd326c0f 100644 --- a/firmware/export/tuner.h +++ b/firmware/export/tuner.h | |||
@@ -127,7 +127,6 @@ enum | |||
127 | 127 | ||
128 | void tuner_init(void); | 128 | void tuner_init(void); |
129 | bool tuner_power(bool power); | 129 | bool tuner_power(bool power); |
130 | bool tuner_powered(void); | ||
131 | 130 | ||
132 | #endif /* #if CONFIG_TUNER */ | 131 | #endif /* #if CONFIG_TUNER */ |
133 | 132 | ||