summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Salfischberger <tomas@rockbox.org>2005-06-08 15:49:21 +0000
committerTomas Salfischberger <tomas@rockbox.org>2005-06-08 15:49:21 +0000
commit1e5ff8ad0a6b2eda4d1c8410d281cb9c149dc3b0 (patch)
tree2f9a987e39c0b606fa4fcdf648b8297ac27376db
parent8ed869de4d33a5f435cd5ec193c190fd115f38c6 (diff)
downloadrockbox-1e5ff8ad0a6b2eda4d1c8410d281cb9c149dc3b0.zip
rockbox-1e5ff8ad0a6b2eda4d1c8410d281cb9c149dc3b0.tar.gz
rockbox-1e5ff8ad0a6b2eda4d1c8410d281cb9c149dc3b0.tar.bz2
rockbox-1e5ff8ad0a6b2eda4d1c8410d281cb9c149dc3b0.tar.xz
Fixed bug, the remote play/pause button (BUTTON_RC_ON) worked with hold on.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6614 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/drivers/button.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 38bb319..afdbccb 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -443,7 +443,11 @@ static int button_read(void)
data = GPIO1_READ;
if ((data & 0x20) == 0)
btn |= BUTTON_ON;
+ }
+ if (!remote_button_hold())
+ {
+ data = GPIO1_READ;
if ((data & 0x40) == 0)
btn |= BUTTON_RC_ON;
}