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/fm_v2 | |
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/fm_v2')
-rw-r--r-- | firmware/target/sh/archos/fm_v2/power-fm_v2.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/firmware/target/sh/archos/fm_v2/power-fm_v2.c b/firmware/target/sh/archos/fm_v2/power-fm_v2.c index 24bccf6eb2..ce1ef19970 100644 --- a/firmware/target/sh/archos/fm_v2/power-fm_v2.c +++ b/firmware/target/sh/archos/fm_v2/power-fm_v2.c | |||
@@ -100,14 +100,10 @@ void ide_power_enable(bool on) | |||
100 | 100 | ||
101 | bool ide_powered(void) | 101 | bool ide_powered(void) |
102 | { | 102 | { |
103 | #ifdef HAVE_ATA_POWER_OFF | ||
104 | if ((PACR2 & 0x0400) || !(PAIORL & 0x20)) /* not configured for output */ | 103 | if ((PACR2 & 0x0400) || !(PAIORL & 0x20)) /* not configured for output */ |
105 | return true; /* would be floating high, disk on */ | 104 | return true; /* would be floating high, disk on */ |
106 | else | 105 | else |
107 | return (PADRL & 0x20) != 0; | 106 | return (PADRL & 0x20) != 0; |
108 | #else /* !defined(NEEDS_ATA_POWER_ON) && !defined(HAVE_ATA_POWER_OFF) */ | ||
109 | return true; /* pretend always powered if not controlable */ | ||
110 | #endif | ||
111 | } | 107 | } |
112 | 108 | ||
113 | void power_off(void) | 109 | void power_off(void) |