Few Fuze/e200v2 button fixes. Don't read the scrollwheel when the hold button is active and rename a variable to describe better what it is for.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20701 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 10 insertions, 3 deletions

diff --git a/firmware/target/arm/as3525/sansa-fuze/button-fuze.c b/firmware/target/arm/as3525/sansa-fuze/button-fuze.c
index f532a96431..afbba78074 100644
--- a/firmware/target/arm/as3525/sansa-fuze/button-fuze.c
+++ b/firmware/target/arm/as3525/sansa-fuze/button-fuze.c
@@ -56,7 +56,7 @@ static void scrollwheel(short dbop_din)
     unsigned        btn             = BUTTON_NONE;
     /* old wheel values */
     static unsigned old_wheel_value = 0;
-    static unsigned wheel_repeat    = BUTTON_NONE;
+    static unsigned old_btn         = BUTTON_NONE;
 
     /* getting BUTTON_REPEAT works like this: We increment repeat by 2 if the
      * wheel was turned, and decrement it by 1 each tick,
@@ -76,6 +76,13 @@ static void scrollwheel(short dbop_din)
         { 2, 0, 3, 1 }, /* Clockwise rotation */
         { 1, 3, 0, 2 }, /* Counter-clockwise  */ 
     };
+
+    if(hold_button)
+    {
+        repeat  =  counter  = 0;
+        return;
+    }
+
     wheel_value = dbop_din & (1<<13|1<<14);
     wheel_value >>= 13;
 
@@ -86,10 +93,10 @@ static void scrollwheel(short dbop_din)
 
     if (btn != BUTTON_NONE)
     {
-        if (btn != wheel_repeat)
+        if (btn != old_btn)
         {
             /* direction reversals nullify repeats */
-            wheel_repeat        = btn;
+            old_btn =  btn;
             repeat  =  counter  = 0;
         }
         if (btn != BUTTON_NONE)