summaryrefslogtreecommitdiffstats
path: root/firmware/drivers/power.c
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2005-11-16 23:42:19 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2005-11-16 23:42:19 +0000
commit73a35a1aa445932176fca78688d43c636a3fda5e (patch)
treeba8cca63507301045a685883b3b23b79eb3e476e /firmware/drivers/power.c
parentd79f3a1e845bcad2d64cbaf467c0f0dae596f537 (diff)
downloadrockbox-73a35a1aa445932176fca78688d43c636a3fda5e.tar.gz
rockbox-73a35a1aa445932176fca78688d43c636a3fda5e.zip
Reverted erroneous commit
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7918 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/power.c')
-rw-r--r--firmware/drivers/power.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/firmware/drivers/power.c b/firmware/drivers/power.c
index 2547c11cb0..4e5d347d54 100644
--- a/firmware/drivers/power.c
+++ b/firmware/drivers/power.c
@@ -62,25 +62,23 @@ int radio_get_status(void)
void power_init(void)
{
#if CONFIG_CPU == MCF5249
-#if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES)
-// or_l(0x00080000, &GPIO1_OUT);
-// or_l(0x00080000, &GPIO1_ENABLE);
-// or_l(0x00080000, &GPIO1_FUNCTION);
+#if IRIVER_H100_SERIES
+ or_l(0x00080000, &GPIO1_OUT);
+ or_l(0x00080000, &GPIO1_ENABLE);
+ or_l(0x00080000, &GPIO1_FUNCTION);
#ifndef BOOTLOADER
/* The boot loader controls the power */
-// ide_power_enable(true);
+ ide_power_enable(true);
#endif
- or_l(0x80000000, &GPIO_OUT);
or_l(0x80000000, &GPIO_ENABLE);
or_l(0x80000000, &GPIO_FUNCTION);
#ifdef HAVE_SPDIF_POWER
spdif_power_enable(false);
#endif
-#ifdef IRIVER_H300_SERIES
+#elif defined(IRIVER_H300_SERIES)
pcf50606_init();
#endif
-#endif
#elif CONFIG_CPU == PP5020
/* TODO: Implement power_init() */
#else