summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2003-02-21 01:12:00 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2003-02-21 01:12:00 +0000
commit70e3331fa1575e6b3dcba2711c81f0b1be404bb1 (patch)
treef879a63497df7eeca50674a7c5242f1312c8abb3
parent400a13f4680061b96c7d02a0eb34b94d6122ce3e (diff)
downloadrockbox-70e3331fa1575e6b3dcba2711c81f0b1be404bb1.tar.gz
rockbox-70e3331fa1575e6b3dcba2711c81f0b1be404bb1.tar.bz2
rockbox-70e3331fa1575e6b3dcba2711c81f0b1be404bb1.zip
Fixed bug #688807, now the Idle poweroff works on FM recorder. Also disabled ATA-poweroff.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3312 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/drivers/power.c3
-rw-r--r--firmware/export/config-fmrecorder.h7
2 files changed, 5 insertions, 5 deletions
diff --git a/firmware/drivers/power.c b/firmware/drivers/power.c
index d3605065c7..b10cefef81 100644
--- a/firmware/drivers/power.c
+++ b/firmware/drivers/power.c
@@ -78,6 +78,9 @@ void power_off(void)
#ifdef HAVE_POWEROFF_ON_PBDR
PBDR &= ~PBDR_BTN_OFF;
PBIOR |= PBDR_BTN_OFF;
+#elif defined(HAVE_POWEROFF_ON_PB5)
+ PBDR &= ~0x20;
+ PBIOR |= 0x20;
#else
PADR &= ~0x800;
PAIOR |= 0x800;
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h
index 88ed9e433c..1814e8d53b 100644
--- a/firmware/export/config-fmrecorder.h
+++ b/firmware/export/config-fmrecorder.h
@@ -13,9 +13,6 @@
/* Define this if you have a MAS3587F */
#define HAVE_MAS3587F
-/* Define this if you have ATA power-off control */
-#define HAVE_ATA_POWER_OFF
-
/* Define this if you have a FM Recorder key system */
#define HAVE_FMADC 1
@@ -28,8 +25,8 @@
/* Battery scale factor (guessed, seems to be 1,25 * value from recorder) */
#define BATTERY_SCALE_FACTOR 8081
-/* Define this if you control power on PBDR (instead of PADR) */
-#define HAVE_POWEROFF_ON_PBDR
+/* Define this if you control power on PB5 (instead of the OFF button) */
+#define HAVE_POWEROFF_ON_PB5
/* Offset ( in the firmware file's header ) to the file length */
#define FIRMWARE_OFFSET_FILE_LENGTH 20