From 5593de5e7990897bdd350231c76013e17fc4b617 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Tue, 17 Feb 2009 03:03:06 +0000 Subject: [PATCH] Fix red git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20029 a1c6a512-1295-4272-9138-f99709370657 --- .../target/arm/as3525/sansa-fuze/button-fuze.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 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; -#endif - /* read power */ - if (_dbop_din & (1<<8)) - ret |= BUTTON_POWER; - if(!(_dbop_din & (1<<15))) - ret |= BUTTON_HOME; -#if defined(HAVE_SCROLLWHEEL) +#if defined(HAVE_SCROLLWHEEL) + /* read wheel on bit 13 & 14, but sent to the button queue seperately */ clickwheel(); #endif +#endif + /* 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; return ret; }