diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2006-09-26 23:35:44 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2006-09-26 23:35:44 +0000 |
commit | b8043fcbf9d434650b58971f669fff714510500a (patch) | |
tree | 005fa98d8b4101476f02ddcdc8ebf24683b9a855 | |
parent | 167c754b4785a175b4c26ecaaacef7d1e1647d1a (diff) | |
download | rockbox-b8043fcbf9d434650b58971f669fff714510500a.tar.gz rockbox-b8043fcbf9d434650b58971f669fff714510500a.zip |
Remote play button was still being read out with remote hold key on.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11076 a1c6a512-1295-4272-9138-f99709370657
-rwxr-xr-x | firmware/target/coldfire/iaudio/x5/button-x5.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/firmware/target/coldfire/iaudio/x5/button-x5.c b/firmware/target/coldfire/iaudio/x5/button-x5.c index 84d1dbc7d8..5874e01a64 100755 --- a/firmware/target/coldfire/iaudio/x5/button-x5.c +++ b/firmware/target/coldfire/iaudio/x5/button-x5.c | |||
@@ -128,10 +128,13 @@ int button_read_device(void) | |||
128 | } | 128 | } |
129 | 129 | ||
130 | data = GPIO_READ; | 130 | data = GPIO_READ; |
131 | |||
132 | /* hold and power are mutually exclusive */ | ||
131 | if (!(data & 0x04000000)) | 133 | if (!(data & 0x04000000)) |
132 | btn |= BUTTON_POWER; | 134 | btn |= BUTTON_POWER; |
133 | 135 | ||
134 | if (!(data & 0x02000000)) | 136 | /* remote play button should be dead if hold */ |
137 | if (!remote_hold_button && !(data & 0x02000000)) | ||
135 | btn |= BUTTON_RC_PLAY; | 138 | btn |= BUTTON_RC_PLAY; |
136 | 139 | ||
137 | return btn; | 140 | return btn; |