From 8a177345ce7b96a00f1f14387412c2dfacfeaf34 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Tue, 14 Aug 2007 22:06:23 +0000 Subject: 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 --- firmware/export/config-fmrecorder.h | 6 ------ firmware/export/config-ondiofm.h | 3 --- firmware/export/config-ondiosp.h | 3 --- firmware/export/config-player.h | 6 ------ firmware/export/config-recorder.h | 6 ------ firmware/export/config-recorderv2.h | 6 ------ firmware/export/power.h | 5 ++--- firmware/export/tuner.h | 1 - 8 files changed, 2 insertions(+), 34 deletions(-) (limited to 'firmware/export') 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 @@ /* Define this if you have a FM Recorder key system */ #define HAVE_FMADC -/* Define this if you need to power on ATA */ -#define NEEDS_ATA_POWER_ON - /* Define this if battery voltage can only be measured with ATA powered */ #define NEED_ATA_POWER_BATT_MEASURE /* Define this to the CPU frequency */ #define CPU_FREQ 11059200 -/* Define this if you control power on PB5 (instead of the OFF button) */ -#define HAVE_POWEROFF_ON_PB5 - /* Offset ( in the firmware file's header ) to the file length */ #define FIRMWARE_OFFSET_FILE_LENGTH 20 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 @@ /* Define this for different I2C pinout */ #define CONFIG_I2C I2C_ONDIO -/* Define this if you control power on PB5 (instead of the OFF button) */ -#define HAVE_POWEROFF_ON_PB5 - /* Offset ( in the firmware file's header ) to the file length */ #define FIRMWARE_OFFSET_FILE_LENGTH 20 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 @@ /* Define this to the CPU frequency */ #define CPU_FREQ 12000000 -/* Define this if you control power on PB5 (instead of the OFF button) */ -#define HAVE_POWEROFF_ON_PB5 - /* Offset ( in the firmware file's header ) to the file length */ #define FIRMWARE_OFFSET_FILE_LENGTH 20 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 @@ * Attention, some players crash when ATA power-off is enabled! */ //#define HAVE_ATA_POWER_OFF -/* Define this if you need to power on ATA */ -#define NEEDS_ATA_POWER_ON - /* Define this if you control ata power player style (with PB4, new player only) */ #define ATA_POWER_PLAYERSTYLE @@ -64,9 +61,6 @@ #define CONFIG_I2C I2C_PLAYREC -/* Define this if you control power on PADR (instead of PBDR) */ -#define HAVE_POWEROFF_ON_PADR - /* Offset ( in the firmware file's header ) to the file length */ #define FIRMWARE_OFFSET_FILE_LENGTH 0 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 @@ /* Define this if you have ATA power-off control */ #define HAVE_ATA_POWER_OFF -/* Define this if you need to power on ATA */ -#define NEEDS_ATA_POWER_ON - /* Define this to the CPU frequency */ #define CPU_FREQ 11059200 -/* Define this if you control power on PBDR (instead of PADR) */ -#define HAVE_POWEROFF_ON_PBDR - /* Offset ( in the firmware file's header ) to the file length */ #define FIRMWARE_OFFSET_FILE_LENGTH 0 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 @@ /* Define this if you have a FM Recorder key system */ #define HAVE_FMADC -/* Define this if you need to power on ATA */ -#define NEEDS_ATA_POWER_ON - /* Define this if battery voltage can only be measured with ATA powered */ #define NEED_ATA_POWER_BATT_MEASURE /* Define this to the CPU frequency */ #define CPU_FREQ 11059200 -/* Define this if you control power on PB5 (instead of the OFF button) */ -#define HAVE_POWEROFF_ON_PB5 - /* Offset ( in the firmware file's header ) to the file length */ #define FIRMWARE_OFFSET_FILE_LENGTH 20 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); #endif #if CONFIG_TUNER -extern bool tuner_power(bool status); -extern bool tuner_power_nolock(bool status); -extern bool tuner_powered(void); +bool tuner_power(bool status); +bool tuner_power_nolock(bool status); #endif #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 void tuner_init(void); bool tuner_power(bool power); -bool tuner_powered(void); #endif /* #if CONFIG_TUNER */ -- cgit v1.2.3