summaryrefslogtreecommitdiffstats
path: root/firmware/target/sh
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2010-04-11 16:23:27 +0000
committerJens Arnold <amiconn@rockbox.org>2010-04-11 16:23:27 +0000
commitf54ce55bce692c1715f6af0d109f96b9be756f14 (patch)
treea939cf4a935f1f5da8a1c51eae8816ca4aa1659b /firmware/target/sh
parent07ec3c9d69b12103dbfa608ebcfa0c73e91ebbbb (diff)
downloadrockbox-f54ce55bce692c1715f6af0d109f96b9be756f14.tar.gz
rockbox-f54ce55bce692c1715f6af0d109f96b9be756f14.tar.bz2
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')
-rw-r--r--firmware/target/sh/archos/fm_v2/power-fm_v2.c4
-rw-r--r--firmware/target/sh/archos/player/power-player.c4
-rw-r--r--firmware/target/sh/archos/recorder/power-recorder.c4
3 files changed, 0 insertions, 12 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)
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)
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)
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 */
@@ -74,9 +73,6 @@ bool ide_powered(void)
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)
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)
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)