summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2006-09-12 15:56:31 +0000
committerMichael Sevakis <jethead71@rockbox.org>2006-09-12 15:56:31 +0000
commit44e8233134f29f0ba88d43937409058da292ee1d (patch)
treefa402e3aaffedf2b53e6936345834ceb33992b5d
parent678d662f74676c3d6b28bef7f0717fc356672d52 (diff)
downloadrockbox-44e8233134f29f0ba88d43937409058da292ee1d.tar.gz
rockbox-44e8233134f29f0ba88d43937409058da292ee1d.zip
Added the power off to x5 remote play button. 3s delay seems confortable and well out of the way of the long press for playback stop.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10934 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/drivers/button.c2
-rwxr-xr-xfirmware/target/coldfire/iaudio/x5/button-target.h5
2 files changed, 5 insertions, 2 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 5e6f6b4827..daad4f17de 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -489,6 +489,8 @@ static void button_tick(void)
489 if ((btn == POWEROFF_BUTTON 489 if ((btn == POWEROFF_BUTTON
490#ifdef BUTTON_RC_STOP 490#ifdef BUTTON_RC_STOP
491 || btn == BUTTON_RC_STOP 491 || btn == BUTTON_RC_STOP
492#elif defined(RC_POWEROFF_BUTTON)
493 || btn == RC_POWEROFF_BUTTON
492#endif 494#endif
493 ) && 495 ) &&
494#if defined(CONFIG_CHARGING) && !defined(HAVE_POWEROFF_WHILE_CHARGING) 496#if defined(CONFIG_CHARGING) && !defined(HAVE_POWEROFF_WHILE_CHARGING)
diff --git a/firmware/target/coldfire/iaudio/x5/button-target.h b/firmware/target/coldfire/iaudio/x5/button-target.h
index 998522fe15..ab6e770ed3 100755
--- a/firmware/target/coldfire/iaudio/x5/button-target.h
+++ b/firmware/target/coldfire/iaudio/x5/button-target.h
@@ -64,7 +64,8 @@ int button_read_device(void);
64 |BUTTON_RC_REW|BUTTON_RC_FF\ 64 |BUTTON_RC_REW|BUTTON_RC_FF\
65 |BUTTON_RC_REC|BUTTON_RC_MENU|BUTTON_RC_MODE) 65 |BUTTON_RC_REC|BUTTON_RC_MENU|BUTTON_RC_MODE)
66 66
67#define POWEROFF_BUTTON BUTTON_POWER 67#define POWEROFF_BUTTON BUTTON_POWER
68#define POWEROFF_COUNT 10 68#define RC_POWEROFF_BUTTON BUTTON_RC_PLAY
69#define POWEROFF_COUNT 30
69 70
70#endif /* _BUTTON_TARGET_H_ */ 71#endif /* _BUTTON_TARGET_H_ */