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/SOURCES | 7 +- firmware/drivers/power.c | 225 --------------------- 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 - firmware/target/arm/archos/av300/power-av300.c | 12 +- firmware/target/arm/iriver/h10/power-h10.c | 24 +-- .../arm/pnx0101/iriver-ifp7xx/power-ifp7xx.c | 13 +- .../target/arm/sandisk/sansa-e200/power-e200.c | 5 - firmware/target/coldfire/iaudio/x5/power-x5.c | 12 +- firmware/target/coldfire/iriver/h100/power-h100.c | 12 +- firmware/target/coldfire/iriver/h300/power-h300.c | 12 +- firmware/target/sh/archos/fm_v2/power-fm_v2.c | 109 ++++++++++ firmware/target/sh/archos/ondio/power-ondio.c | 78 +++++++ firmware/target/sh/archos/player/power-player.c | 87 ++++++++ .../target/sh/archos/recorder/power-recorder.c | 103 ++++++++++ 21 files changed, 397 insertions(+), 338 deletions(-) delete mode 100644 firmware/drivers/power.c create mode 100644 firmware/target/sh/archos/fm_v2/power-fm_v2.c create mode 100644 firmware/target/sh/archos/ondio/power-ondio.c create mode 100644 firmware/target/sh/archos/player/power-player.c create mode 100644 firmware/target/sh/archos/recorder/power-recorder.c (limited to 'firmware') diff --git a/firmware/SOURCES b/firmware/SOURCES index bbbe150112..363ba81f23 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -96,9 +96,6 @@ drivers/lcd-remote-2bit-vi.c /* Misc. */ drivers/led.c drivers/button.c -#ifndef TARGET_TREE -drivers/power.c -#endif /* TARGET_TREE */ #ifndef SIMULATOR drivers/dac.c drivers/serial.c @@ -340,6 +337,7 @@ target/sh/archos/player/button-player.c target/sh/archos/player/hwcompat-player.c target/sh/archos/player/lcd-as-player.S target/sh/archos/player/lcd-player.c +target/sh/archos/player/power-player.c target/sh/archos/player/usb-player.c #endif /* SIMULATOR */ #endif /* ARCHOS_PLAYER */ @@ -351,6 +349,7 @@ target/sh/archos/ata-as-archos.S target/sh/archos/lcd-archos-bitmap.c target/sh/archos/lcd-as-archos-bitmap.S target/sh/archos/recorder/button-recorder.c +target/sh/archos/recorder/power-recorder.c target/sh/archos/recorder/usb-recorder.c #endif /* SIMULATOR */ #endif /* ARCHOS_RECORDER */ @@ -362,6 +361,7 @@ target/sh/archos/ata-as-archos.S target/sh/archos/lcd-archos-bitmap.c target/sh/archos/lcd-as-archos-bitmap.S target/sh/archos/fm_v2/button-fm_v2.c +target/sh/archos/fm_v2/power-fm_v2.c target/sh/archos/fm_v2/usb-fm_v2.c #endif /* SIMULATOR */ #endif /* ARCHOS_FMRECORDER || ARCHOS_RECORDERV2 */ @@ -371,6 +371,7 @@ target/sh/archos/fm_v2/usb-fm_v2.c target/sh/archos/lcd-archos-bitmap.c target/sh/archos/lcd-as-archos-bitmap.S target/sh/archos/ondio/button-ondio.c +target/sh/archos/ondio/power-ondio.c target/sh/archos/ondio/usb-ondio.c #endif /* SIMULATOR */ #endif /* ARCHOS_ONDIOFM || ARCHOS_ONDIOFM */ diff --git a/firmware/drivers/power.c b/firmware/drivers/power.c deleted file mode 100644 index 17a3fecea1..0000000000 --- a/firmware/drivers/power.c +++ /dev/null @@ -1,225 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 by Linus Nielsen Feltzing - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#include "config.h" -#include "cpu.h" -#include -#include "adc.h" -#include "kernel.h" -#include "system.h" -#include "power.h" -#include "logf.h" -#include "usb.h" -#include "backlight-target.h" - -#if CONFIG_CHARGING == CHARGING_CONTROL -bool charger_enabled; -#endif - - -#if CONFIG_TUNER - -static bool powered = false; - -bool tuner_powered(void) -{ - return powered; -} - -bool tuner_power(bool status) -{ - bool old_status = powered; - powered = status; -#ifdef HAVE_TUNER_PWR_CTRL - if (status) - { - and_b(~0x04, &PADRL); /* drive PA2 low for tuner enable */ - sleep(1); /* let the voltage settle */ - } - else - or_b(0x04, &PADRL); /* drive PA2 high for tuner disable */ -#endif - return old_status; -} - -#endif /* #if CONFIG_TUNER */ - -#ifndef SIMULATOR - -void power_init(void) -{ -#ifdef HAVE_POWEROFF_ON_PB5 - PBCR2 &= ~0x0c00; /* GPIO for PB5 */ - or_b(0x20, &PBIORL); - or_b(0x20, &PBDRL); /* hold power */ -#if defined(HAVE_MMC) && !defined(HAVE_BACKLIGHT) - /* Disable backlight on backlight-modded Ondios when running - * a standard build (always on otherwise). */ - PACR1 &= ~0x3000; /* Set PA14 (backlight control) to GPIO */ - and_b(~0x40, &PADRH); /* drive it low */ - or_b(0x40, &PAIORH); /* ..and output */ -#endif -#endif -#if CONFIG_CHARGING == CHARGING_CONTROL - PBCR2 &= ~0x0c00; /* GPIO for PB5 */ - or_b(0x20, &PBIORL); /* Set charging control bit to output */ - charger_enable(false); /* Default to charger OFF */ -#endif -#ifdef HAVE_TUNER_PWR_CTRL - PACR2 &= ~0x0030; /* GPIO for PA2 */ - or_b(0x04, &PADRL); /* drive PA2 high for tuner disable */ - or_b(0x04, &PAIORL); /* output for PA2 */ -#endif -} - -#if CONFIG_CHARGING -bool charger_inserted(void) -{ -#if CONFIG_CHARGING == CHARGING_CONTROL - /* Recorder */ - return adc_read(ADC_EXT_POWER) > 0x100; -#elif defined (HAVE_FMADC) - /* FM or V2, can also charge from the USB port */ - return (adc_read(ADC_CHARGE_REGULATOR) < 0x1FF); -#else - /* Player */ - return (PADR & 1) == 0; -#endif -} -#endif /* CONFIG_CHARGING */ - -#if CONFIG_CHARGING == CHARGING_CONTROL -void charger_enable(bool on) -{ - if(on) - { - and_b(~0x20, &PBDRL); - charger_enabled = 1; - } - else - { - or_b(0x20, &PBDRL); - charger_enabled = 0; - } -} -#endif - -#if CONFIG_CHARGING == CHARGING_MONITOR -/* Returns true if the unit is charging the batteries. */ -bool charging_state(void) { -#if CONFIG_BATTERY == BATT_LIION2200 - /* We use the information from the ADC_EXT_POWER ADC channel, which - tells us the charging current from the LTC1734. When DC is - connected (either via the external adapter, or via USB), we try - to determine if it is actively charging or only maintaining the - charge. My tests show that ADC readings below about 0x80 means - that the LTC1734 is only maintaining the charge. */ - return adc_read(ADC_EXT_POWER) >= 0x80; -#endif -} -#endif - -#ifndef HAVE_MMC -void ide_power_enable(bool on) -{ - (void)on; - - bool touched = false; -#ifdef NEEDS_ATA_POWER_ON - if(on) - { -#ifdef ATA_POWER_PLAYERSTYLE - or_b(0x10, &PBDRL); -#else - or_b(0x20, &PADRL); -#endif - touched = true; - } -#endif /* NEEDS_ATA_POWER_ON */ -#ifdef HAVE_ATA_POWER_OFF - if(!on) - { -#ifdef ATA_POWER_PLAYERSTYLE - and_b(~0x10, &PBDRL); -#else - and_b(~0x20, &PADRL); -#endif - touched = true; - } -#endif /* HAVE_ATA_POWER_OFF */ - -/* late port preparation, else problems with read/modify/write - of other bits on same port, while input and floating high */ - if (touched) - { -#ifdef ATA_POWER_PLAYERSTYLE - or_b(0x10, &PBIORL); /* PB4 is an output */ - PBCR2 &= ~0x0300; /* GPIO for PB4 */ -#else - or_b(0x20, &PAIORL); /* PA5 is an output */ - PACR2 &= 0xFBFF; /* GPIO for PA5 */ -#endif - } -} - - -bool ide_powered(void) -{ -#if defined(NEEDS_ATA_POWER_ON) || defined(HAVE_ATA_POWER_OFF) -#ifdef ATA_POWER_PLAYERSTYLE - /* This is not correct for very old players, since these are unable to - * control hd power. However, driving the pin doesn't hurt, because it - * is not connected anywhere */ - if ((PBCR2 & 0x0300) || !(PBIORL & 0x10)) /* not configured for output */ - return false; /* would be floating low, disk off */ - else - return (PBDRL & 0x10) != 0; -#else /* !ATA_POWER_PLAYERSTYLE */ - if ((PACR2 & 0x0400) || !(PAIORL & 0x20)) /* not configured for output */ - return true; /* would be floating high, disk on */ - else - return (PADRL & 0x20) != 0; -#endif /* !ATA_POWER_PLAYERSTYLE */ -#else /* !defined(NEEDS_ATA_POWER_ON) && !defined(HAVE_ATA_POWER_OFF) */ - return true; /* pretend always powered if not controlable */ -#endif -} -#endif /* !HAVE_MMC */ - -void power_off(void) -{ - set_irq_level(HIGHEST_IRQ_LEVEL); -#ifdef HAVE_POWEROFF_ON_PBDR - and_b(~0x10, &PBDRL); - or_b(0x10, &PBIORL); -#elif defined(HAVE_POWEROFF_ON_PB5) -#if defined(HAVE_MMC) && defined(HAVE_BACKLIGHT) - /* Switch off the light on backlight-modded Ondios */ - __backlight_off(); -#endif - and_b(~0x20, &PBDRL); - or_b(0x20, &PBIORL); -#else /* player */ - and_b(~0x08, &PADRH); - or_b(0x08, &PAIORH); -#endif - while(1) - yield(); -} - -#endif /* SIMULATOR */ 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 */ diff --git a/firmware/target/arm/archos/av300/power-av300.c b/firmware/target/arm/archos/av300/power-av300.c index 6cc8b4f7c7..1bd4470fd3 100644 --- a/firmware/target/arm/archos/av300/power-av300.c +++ b/firmware/target/arm/archos/av300/power-av300.c @@ -82,16 +82,8 @@ void ide_power_enable(bool on) #endif /* SIMULATOR */ -static bool powered = false; - -bool tuner_powered() -{ - return powered; -} - bool tuner_power(bool status) { - bool old_status = powered; - powered = status; - return old_status; + (void)status; + return true; } diff --git a/firmware/target/arm/iriver/h10/power-h10.c b/firmware/target/arm/iriver/h10/power-h10.c index d0d3ce59d1..9cbdb50080 100644 --- a/firmware/target/arm/iriver/h10/power-h10.c +++ b/firmware/target/arm/iriver/h10/power-h10.c @@ -38,27 +38,11 @@ bool charger_enabled; #if 0 #if CONFIG_TUNER -static bool powered = false; - -bool tuner_powered() -{ - return powered; -} - bool tuner_power(bool status) { - bool old_status = powered; - powered = status; -#ifdef HAVE_TUNER_PWR_CTRL - if (status) - { - and_b(~0x04, &PADRL); /* drive PA2 low for tuner enable */ - sleep(1); /* let the voltage settle */ - } - else - or_b(0x04, &PADRL); /* drive PA2 high for tuner disable */ -#endif - return old_status; + (void)status; + /* TODO: tuner power control */ + return true; } #endif /* #if CONFIG_TUNER */ @@ -69,7 +53,7 @@ void power_init(void) } bool charger_inserted(void) -{ +{ return (GPIOF_INPUT_VAL & 0x08)?true:false; } diff --git a/firmware/target/arm/pnx0101/iriver-ifp7xx/power-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/power-ifp7xx.c index dfdcb1d27a..b219244510 100644 --- a/firmware/target/arm/pnx0101/iriver-ifp7xx/power-ifp7xx.c +++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/power-ifp7xx.c @@ -28,19 +28,10 @@ #if CONFIG_TUNER -static bool powered = false; - -bool tuner_powered(void) -{ - return powered; -} - bool tuner_power(bool status) { - bool old_status = powered; - powered = status; - - return old_status; + (void)status; + return true; } #endif /* #if CONFIG_TUNER */ diff --git a/firmware/target/arm/sandisk/sansa-e200/power-e200.c b/firmware/target/arm/sandisk/sansa-e200/power-e200.c index 2745f0ba50..b9a77cb9e0 100644 --- a/firmware/target/arm/sandisk/sansa-e200/power-e200.c +++ b/firmware/target/arm/sandisk/sansa-e200/power-e200.c @@ -125,8 +125,3 @@ bool tuner_power(bool status) lv24020lp_unlock(); return old_status; } - -bool tuner_powered(void) -{ - return powered; -} diff --git a/firmware/target/coldfire/iaudio/x5/power-x5.c b/firmware/target/coldfire/iaudio/x5/power-x5.c index 76d612334b..cfcb384a24 100644 --- a/firmware/target/coldfire/iaudio/x5/power-x5.c +++ b/firmware/target/coldfire/iaudio/x5/power-x5.c @@ -67,16 +67,8 @@ void power_off(void) #endif /* SIMULATOR */ -static bool powered = false; - -bool tuner_powered() -{ - return powered; -} - bool tuner_power(bool status) { - bool old_status = powered; - powered = status; - return old_status; + (void)status; + return true; } diff --git a/firmware/target/coldfire/iriver/h100/power-h100.c b/firmware/target/coldfire/iriver/h100/power-h100.c index 27000ebf8a..5dc8618cc6 100644 --- a/firmware/target/coldfire/iriver/h100/power-h100.c +++ b/firmware/target/coldfire/iriver/h100/power-h100.c @@ -27,18 +27,10 @@ #if CONFIG_TUNER -static bool powered = false; - -bool tuner_powered(void) -{ - return powered; -} - bool tuner_power(bool status) { - bool old_status = powered; - powered = status; - return old_status; + (void)status; + return true; } #endif /* #if CONFIG_TUNER */ diff --git a/firmware/target/coldfire/iriver/h300/power-h300.c b/firmware/target/coldfire/iriver/h300/power-h300.c index b687b29cba..21c723da8e 100644 --- a/firmware/target/coldfire/iriver/h300/power-h300.c +++ b/firmware/target/coldfire/iriver/h300/power-h300.c @@ -27,18 +27,10 @@ #if CONFIG_TUNER -static bool powered = false; - -bool tuner_powered(void) -{ - return powered; -} - bool tuner_power(bool status) { - bool old_status = powered; - powered = status; - return old_status; + (void)status; + return true; } #endif /* #if CONFIG_TUNER */ diff --git a/firmware/target/sh/archos/fm_v2/power-fm_v2.c b/firmware/target/sh/archos/fm_v2/power-fm_v2.c new file mode 100644 index 0000000000..94a36339bb --- /dev/null +++ b/firmware/target/sh/archos/fm_v2/power-fm_v2.c @@ -0,0 +1,109 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2002 by Linus Nielsen Feltzing + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#include "config.h" +#include "cpu.h" +#include +#include "adc.h" +#include "kernel.h" +#include "system.h" +#include "power.h" +#include "usb.h" + +#if CONFIG_TUNER + +bool tuner_power(bool status) +{ + (void)status; + return true; +} + +#endif /* #if CONFIG_TUNER */ + +void power_init(void) +{ + PBCR2 &= ~0x0c00; /* GPIO for PB5 */ + or_b(0x20, &PBIORL); + or_b(0x20, &PBDRL); /* hold power */ +} + +bool charger_inserted(void) +{ + /* FM or V2 can also charge from the USB port */ + return (adc_read(ADC_CHARGE_REGULATOR) < 0x1FF); +} + +/* Returns true if the unit is charging the batteries. */ +bool charging_state(void) +{ + /* We use the information from the ADC_EXT_POWER ADC channel, which + tells us the charging current from the LTC1734. When DC is + connected (either via the external adapter, or via USB), we try + to determine if it is actively charging or only maintaining the + charge. My tests show that ADC readings below about 0x80 means + that the LTC1734 is only maintaining the charge. */ + return adc_read(ADC_EXT_POWER) >= 0x80; +} + +void ide_power_enable(bool on) +{ + bool touched = false; + + if(on) + { + or_b(0x20, &PADRL); + touched = true; + } +#ifdef HAVE_ATA_POWER_OFF + if(!on) + { + and_b(~0x20, &PADRL); + touched = true; + } +#endif /* HAVE_ATA_POWER_OFF */ + +/* late port preparation, else problems with read/modify/write + of other bits on same port, while input and floating high */ + if (touched) + { + or_b(0x20, &PAIORL); /* PA5 is an output */ + PACR2 &= 0xFBFF; /* GPIO for PA5 */ + } +} + + +bool ide_powered(void) +{ +#ifdef HAVE_ATA_POWER_OFF + if ((PACR2 & 0x0400) || !(PAIORL & 0x20)) /* not configured for output */ + return true; /* would be floating high, disk on */ + else + return (PADRL & 0x20) != 0; +#else /* !defined(NEEDS_ATA_POWER_ON) && !defined(HAVE_ATA_POWER_OFF) */ + return true; /* pretend always powered if not controlable */ +#endif +} + +void power_off(void) +{ + set_irq_level(HIGHEST_IRQ_LEVEL); + and_b(~0x20, &PBDRL); + or_b(0x20, &PBIORL); + while(1) + yield(); +} diff --git a/firmware/target/sh/archos/ondio/power-ondio.c b/firmware/target/sh/archos/ondio/power-ondio.c new file mode 100644 index 0000000000..cedc3d10b9 --- /dev/null +++ b/firmware/target/sh/archos/ondio/power-ondio.c @@ -0,0 +1,78 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2002 by Linus Nielsen Feltzing + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#include "config.h" +#include "cpu.h" +#include +#include "adc.h" +#include "kernel.h" +#include "system.h" +#include "power.h" +#include "usb.h" +#include "backlight-target.h" + +#if CONFIG_TUNER + +static bool powered = false; + +bool tuner_power(bool status) +{ + bool old_status = powered; + + powered = status; + if (status) + { + and_b(~0x04, &PADRL); /* drive PA2 low for tuner enable */ + sleep(1); /* let the voltage settle */ + } + else + or_b(0x04, &PADRL); /* drive PA2 high for tuner disable */ + return old_status; +} + +#endif /* #if CONFIG_TUNER */ + +void power_init(void) +{ + PBCR2 &= ~0x0c00; /* GPIO for PB5 */ + or_b(0x20, &PBIORL); + or_b(0x20, &PBDRL); /* hold power */ +#ifndef HAVE_BACKLIGHT + /* Disable backlight on backlight-modded Ondios when running + * a standard build (always on otherwise). */ + PACR1 &= ~0x3000; /* Set PA14 (backlight control) to GPIO */ + and_b(~0x40, &PADRH); /* drive it low */ + or_b(0x40, &PAIORH); /* ..and output */ +#endif + PACR2 &= ~0x0030; /* GPIO for PA2 */ + or_b(0x04, &PADRL); /* drive PA2 high for tuner disable */ + or_b(0x04, &PAIORL); /* output for PA2 */ +} + +void power_off(void) +{ + set_irq_level(HIGHEST_IRQ_LEVEL); +#ifdef HAVE_BACKLIGHT + /* Switch off the light on backlight-modded Ondios */ + __backlight_off(); +#endif + and_b(~0x20, &PBDRL); + or_b(0x20, &PBIORL); + while(1) + yield(); +} diff --git a/firmware/target/sh/archos/player/power-player.c b/firmware/target/sh/archos/player/power-player.c new file mode 100644 index 0000000000..7d9d0d7d16 --- /dev/null +++ b/firmware/target/sh/archos/player/power-player.c @@ -0,0 +1,87 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2002 by Linus Nielsen Feltzing + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#include "config.h" +#include "cpu.h" +#include +#include "adc.h" +#include "kernel.h" +#include "system.h" +#include "power.h" +#include "usb.h" + +void power_init(void) +{ +} + +bool charger_inserted(void) +{ + /* Player */ + return (PADR & 1) == 0; +} + +void ide_power_enable(bool on) +{ + bool touched = false; + + if(on) + { + or_b(0x10, &PBDRL); + touched = true; + } +#ifdef HAVE_ATA_POWER_OFF + if(!on) + { + and_b(~0x10, &PBDRL); + touched = true; + } +#endif /* HAVE_ATA_POWER_OFF */ + +/* late port preparation, else problems with read/modify/write + of other bits on same port, while input and floating high */ + if (touched) + { + or_b(0x10, &PBIORL); /* PB4 is an output */ + PBCR2 &= ~0x0300; /* GPIO for PB4 */ + } +} + + +bool ide_powered(void) +{ +#ifdef HAVE_ATA_POWER_OFF + /* This is not correct for very old players, since these are unable to + * control hd power. However, driving the pin doesn't hurt, because it + * is not connected anywhere */ + if ((PBCR2 & 0x0300) || !(PBIORL & 0x10)) /* not configured for output */ + return false; /* would be floating low, disk off */ + else + return (PBDRL & 0x10) != 0; +#else /* !defined(NEEDS_ATA_POWER_ON) && !defined(HAVE_ATA_POWER_OFF) */ + return true; /* pretend always powered if not controlable */ +#endif +} + +void power_off(void) +{ + set_irq_level(HIGHEST_IRQ_LEVEL); + and_b(~0x08, &PADRH); + or_b(0x08, &PAIORH); + while(1) + yield(); +} diff --git a/firmware/target/sh/archos/recorder/power-recorder.c b/firmware/target/sh/archos/recorder/power-recorder.c new file mode 100644 index 0000000000..2af8df1bb6 --- /dev/null +++ b/firmware/target/sh/archos/recorder/power-recorder.c @@ -0,0 +1,103 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2002 by Linus Nielsen Feltzing + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#include "config.h" +#include "cpu.h" +#include +#include "adc.h" +#include "kernel.h" +#include "system.h" +#include "power.h" +#include "usb.h" + +bool charger_enabled; + +void power_init(void) +{ + PBCR2 &= ~0x0c00; /* GPIO for PB5 */ + or_b(0x20, &PBIORL); /* Set charging control bit to output */ + charger_enable(false); /* Default to charger OFF */ +} + +bool charger_inserted(void) +{ + /* Recorder */ + return adc_read(ADC_EXT_POWER) > 0x100; +} + +void charger_enable(bool on) +{ + if(on) + { + and_b(~0x20, &PBDRL); + charger_enabled = 1; + } + else + { + or_b(0x20, &PBDRL); + charger_enabled = 0; + } +} + +void ide_power_enable(bool on) +{ + bool touched = false; + + if(on) + { + or_b(0x20, &PADRL); + touched = true; + } +#ifdef HAVE_ATA_POWER_OFF + if(!on) + { + and_b(~0x20, &PADRL); + touched = true; + } +#endif /* HAVE_ATA_POWER_OFF */ + +/* late port preparation, else problems with read/modify/write + of other bits on same port, while input and floating high */ + if (touched) + { + or_b(0x20, &PAIORL); /* PA5 is an output */ + PACR2 &= 0xFBFF; /* GPIO for PA5 */ + } +} + + +bool ide_powered(void) +{ +#ifdef HAVE_ATA_POWER_OFF + if ((PACR2 & 0x0400) || !(PAIORL & 0x20)) /* not configured for output */ + return true; /* would be floating high, disk on */ + else + return (PADRL & 0x20) != 0; +#else /* !defined(NEEDS_ATA_POWER_ON) && !defined(HAVE_ATA_POWER_OFF) */ + return true; /* pretend always powered if not controlable */ +#endif +} + +void power_off(void) +{ + set_irq_level(HIGHEST_IRQ_LEVEL); + and_b(~0x10, &PBDRL); + or_b(0x10, &PBIORL); + while(1) + yield(); +} -- cgit v1.2.3