summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-02-17 03:03:06 +0000
committerThomas Martitz <kugel@rockbox.org>2009-02-17 03:03:06 +0000
commit5593de5e7990897bdd350231c76013e17fc4b617 (patch)
treef4ab8aed65429983fe163dfa0b280951e5eb9808 /firmware/target/arm
parente7718a711fcd91bc4a5ebe4f98de1924a14e2a3d (diff)
downloadrockbox-5593de5e7990897bdd350231c76013e17fc4b617.tar.gz
rockbox-5593de5e7990897bdd350231c76013e17fc4b617.zip
Fix red
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20029 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm')
-rw-r--r--firmware/target/arm/as3525/sansa-fuze/button-fuze.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/firmware/target/arm/as3525/sansa-fuze/button-fuze.c b/firmware/target/arm/as3525/sansa-fuze/button-fuze.c
index ca761cdb66..cf84599083 100644
--- a/firmware/target/arm/as3525/sansa-fuze/button-fuze.c
+++ b/firmware/target/arm/as3525/sansa-fuze/button-fuze.c
@@ -168,15 +168,17 @@ static int button_dbop(void)
hold_button = _dbop_din & (1<<12);
if (hold_button)
return BUTTON_NONE;
+#if defined(HAVE_SCROLLWHEEL)
+ /* read wheel on bit 13 & 14, but sent to the button queue seperately */
+ clickwheel();
+#endif
#endif
- /* read power */
+ /* read power on bit 8 */
if (_dbop_din & (1<<8))
ret |= BUTTON_POWER;
+ /* read home on bit 15 */
if(!(_dbop_din & (1<<15)))
ret |= BUTTON_HOME;
-#if defined(HAVE_SCROLLWHEEL)
- clickwheel();
-#endif
return ret;
}