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.zip rockbox-b8043fcbf9d434650b58971f669fff714510500a.tar.gz rockbox-b8043fcbf9d434650b58971f669fff714510500a.tar.bz2 rockbox-b8043fcbf9d434650b58971f669fff714510500a.tar.xz | |
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 84d1dbc..5874e01 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) } data = GPIO_READ; + + /* hold and power are mutually exclusive */ if (!(data & 0x04000000)) btn |= BUTTON_POWER; - if (!(data & 0x02000000)) + /* remote play button should be dead if hold */ + if (!remote_hold_button && !(data & 0x02000000)) btn |= BUTTON_RC_PLAY; return btn; |