diff options
author | Jens Arnold <amiconn@rockbox.org> | 2010-04-11 16:23:27 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2010-04-11 16:23:27 +0000 |
commit | f54ce55bce692c1715f6af0d109f96b9be756f14 (patch) | |
tree | a939cf4a935f1f5da8a1c51eae8816ca4aa1659b /firmware/target/sh/archos/recorder | |
parent | 07ec3c9d69b12103dbfa608ebcfa0c73e91ebbbb (diff) | |
download | rockbox-f54ce55bce692c1715f6af0d109f96b9be756f14.tar.gz rockbox-f54ce55bce692c1715f6af0d109f96b9be756f14.zip |
Fix an almost 3 years old bug introduced when moving the archos power handling to target tree: ide_powered() must always use the full implementation, even if HAVE_ATA_POWER_OFF isn't defined. This led to an ATA panic in the Player's charging screen for SVN builds (only applies to flashed Players).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25593 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/sh/archos/recorder')
-rw-r--r-- | firmware/target/sh/archos/recorder/power-recorder.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/firmware/target/sh/archos/recorder/power-recorder.c b/firmware/target/sh/archos/recorder/power-recorder.c index 8d7ea5fc51..48cfdc1e17 100644 --- a/firmware/target/sh/archos/recorder/power-recorder.c +++ b/firmware/target/sh/archos/recorder/power-recorder.c | |||
@@ -92,14 +92,10 @@ void ide_power_enable(bool on) | |||
92 | 92 | ||
93 | bool ide_powered(void) | 93 | bool ide_powered(void) |
94 | { | 94 | { |
95 | #ifdef HAVE_ATA_POWER_OFF | ||
96 | if ((PACR2 & 0x0400) || !(PAIORL & 0x20)) /* not configured for output */ | 95 | if ((PACR2 & 0x0400) || !(PAIORL & 0x20)) /* not configured for output */ |
97 | return true; /* would be floating high, disk on */ | 96 | return true; /* would be floating high, disk on */ |
98 | else | 97 | else |
99 | return (PADRL & 0x20) != 0; | 98 | return (PADRL & 0x20) != 0; |
100 | #else /* !defined(NEEDS_ATA_POWER_ON) && !defined(HAVE_ATA_POWER_OFF) */ | ||
101 | return true; /* pretend always powered if not controlable */ | ||
102 | #endif | ||
103 | } | 99 | } |
104 | 100 | ||
105 | void power_off(void) | 101 | void power_off(void) |