summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2004-10-12 11:00:19 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2004-10-12 11:00:19 +0000
commit0b3ea1bfcba0e56e72cacfcb88944dcf2e3b3a07 (patch)
tree70627c231bc98f806bfd0fb7e7b1af58432df819 /firmware
parent2e9412025b2f84b86a855c05beb748bc2e585525 (diff)
downloadrockbox-0b3ea1bfcba0e56e72cacfcb88944dcf2e3b3a07.zip
rockbox-0b3ea1bfcba0e56e72cacfcb88944dcf2e3b3a07.tar.gz
rockbox-0b3ea1bfcba0e56e72cacfcb88944dcf2e3b3a07.tar.bz2
rockbox-0b3ea1bfcba0e56e72cacfcb88944dcf2e3b3a07.tar.xz
Now the FM, V2 and Ondio players use the new SYS_POWEROFF event. Now you can safely turn off the player by holding OFF.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5259 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/drivers/button.c11
-rw-r--r--firmware/export/config-fmrecorder.h3
-rw-r--r--firmware/export/config-ondiofm.h3
-rw-r--r--firmware/export/config-ondiosp.h3
4 files changed, 15 insertions, 5 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 607e72e..0cfe1d1 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -54,7 +54,7 @@ static bool flipped; /* bottons can be flipped to match the LCD flip */
#define REPEAT_INTERVAL_FINISH 5
/* Number of repeated keys before shutting off */
-#define POWEROFF_COUNT 40
+#define POWEROFF_COUNT 10
static int button_read(void);
@@ -116,12 +116,13 @@ static void button_tick(void)
repeat_count++;
- /* Shutdown if we have a device which doesn't shut
- down easily with the OFF key */
-#ifdef HAVE_POWEROFF_ON_PB5
+ /* Send a SYS_POWEROFF event if we have a device
+ which doesn't shut down easily with the OFF
+ key */
+#ifdef HAVE_SW_POWEROFF
if(btn == BUTTON_OFF && !charger_inserted() &&
repeat_count > POWEROFF_COUNT)
- power_off();
+ queue_post(&button_queue, SYS_POWEROFF, NULL);
#endif
}
}
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h
index aec31c2..0903e66 100644
--- a/firmware/export/config-fmrecorder.h
+++ b/firmware/export/config-fmrecorder.h
@@ -73,4 +73,7 @@
/* Define this for LCD backlight available */
#define HAVE_BACKLIGHT
+/* Define this if you have a software controlled poweroff */
+#define HAVE_SW_POWEROFF
+
#endif /* SIMULATOR */
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h
index f7cff94..437f868 100644
--- a/firmware/export/config-ondiofm.h
+++ b/firmware/export/config-ondiofm.h
@@ -70,4 +70,7 @@
/* Define this if the MAS SIBI line can be controlled via PB8 */
#define HAVE_MAS_SIBI_CONTROL
+/* Define this if you have a software controlled poweroff */
+#define HAVE_SW_POWEROFF
+
#endif /* SIMULATOR */
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h
index 111787f..9bf29f1 100644
--- a/firmware/export/config-ondiosp.h
+++ b/firmware/export/config-ondiosp.h
@@ -64,4 +64,7 @@
/* Define this if the MAS SIBI line can be controlled via PB8 */
#define HAVE_MAS_SIBI_CONTROL
+/* Define this if you have a software controlled poweroff */
+#define HAVE_SW_POWEROFF
+
#endif /* SIMULATOR */