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/player | |
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/player')
-rw-r--r-- | firmware/target/sh/archos/player/power-player.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/firmware/target/sh/archos/player/power-player.c b/firmware/target/sh/archos/player/power-player.c index 7031e45d6a..33f5959021 100644 --- a/firmware/target/sh/archos/player/power-player.c +++ b/firmware/target/sh/archos/player/power-player.c | |||
@@ -66,7 +66,6 @@ void ide_power_enable(bool on) | |||
66 | 66 | ||
67 | bool ide_powered(void) | 67 | bool ide_powered(void) |
68 | { | 68 | { |
69 | #ifdef HAVE_ATA_POWER_OFF | ||
70 | /* This is not correct for very old players, since these are unable to | 69 | /* This is not correct for very old players, since these are unable to |
71 | * control hd power. However, driving the pin doesn't hurt, because it | 70 | * control hd power. However, driving the pin doesn't hurt, because it |
72 | * is not connected anywhere */ | 71 | * is not connected anywhere */ |
@@ -74,9 +73,6 @@ bool ide_powered(void) | |||
74 | return false; /* would be floating low, disk off */ | 73 | return false; /* would be floating low, disk off */ |
75 | else | 74 | else |
76 | return (PBDRL & 0x10) != 0; | 75 | return (PBDRL & 0x10) != 0; |
77 | #else /* !defined(NEEDS_ATA_POWER_ON) && !defined(HAVE_ATA_POWER_OFF) */ | ||
78 | return true; /* pretend always powered if not controlable */ | ||
79 | #endif | ||
80 | } | 76 | } |
81 | 77 | ||
82 | void power_off(void) | 78 | void power_off(void) |