Index: firmware/target/arm/as3525/sansa-e200v2/button-e200v2.c
===================================================================
--- firmware/target/arm/as3525/sansa-e200v2/button-e200v2.c	(Revision 20684)
+++ firmware/target/arm/as3525/sansa-e200v2/button-e200v2.c	(Arbeitskopie)
@@ -60,7 +60,7 @@
     return hold_button;
 }
 
-void clickwheel(unsigned int wheel_value)
+static void scrollwheel(void)
 {
     static const unsigned char wheel_tbl[2][4] =
     {
@@ -75,6 +75,10 @@
 
     /* did the wheel value change? */
     unsigned int btn = BUTTON_NONE;
+
+    unsigned wheel_value = _dbop_din & (1<<13|1<<14);
+    wheel_value >>= 13;
+
     if (old_wheel_value == wheel_tbl[0][wheel_value])
         btn = BUTTON_SCROLL_FWD;
     else if (old_wheel_value == wheel_tbl[1][wheel_value])
@@ -178,7 +182,7 @@
     old_wheel_value = wheel_value;
 }
 
-static short read_dbop(void)
+short button_dbop(void)
 {
     /*write a red pixel */
     if (!lcd_button_support())
@@ -202,6 +206,7 @@
     DBOP_CTRL |= (1<<16);                /* Enable output (0:write disable)  */
     DBOP_CTRL &= ~(1<<19);
 
+    scrollwheel();
     return _dbop_din;
 }
 
@@ -217,7 +222,7 @@
 {
     int btn = BUTTON_NONE;
     /* read buttons from dbop */
-    short dbop = read_dbop();
+    short dbop = button_dbop();
 
     /* hold button */
     if(dbop & (1<<12))
@@ -236,11 +241,6 @@
     if (!(dbop & (1<<15)))
     btn |= BUTTON_REC;
 
-    /* handle wheel */
-    int wheel_value = dbop & (1<<13|1<<14);
-    wheel_value >>= 13;
-    clickwheel(wheel_value);
-
     /* Set afsel, so that we can read our buttons */
     GPIOC_AFSEL &= ~(1<<2|1<<3|1<<4|1<<5|1<<6);
     /* set dir so we can read our buttons (but reset the C pins first) */
Index: firmware/target/arm/as3525/kernel-as3525.c
===================================================================
--- firmware/target/arm/as3525/kernel-as3525.c	(Revision 20684)
+++ firmware/target/arm/as3525/kernel-as3525.c	(Arbeitskopie)
@@ -24,19 +24,46 @@
 #include "panic.h"
 #include "timer-target.h"
 
+#ifdef HAVE_SCROLLWHEEL
+/* The scrollwheel is polled every 5 ms (the tick tasks only every 10) */
+extern void button_dbop(void);
+volatile int poll_scrollwheel = 0;
+
 void INT_TIMER2(void)
 {
-    call_tick_tasks();  /* Run through the list of tick tasks */
+    if (!poll_scrollwheel)
+    {
+        call_tick_tasks();  /* Run through the list of tick tasks */
+        poll_scrollwheel = 1;
+    }
+    else
+    {
+        button_dbop();
+        poll_scrollwheel = 0;
+    }
 
     TIMER2_INTCLR = 0;  /* clear interrupt */
 }
+#else
+void INT_TIMER2(void)
+{
+    call_tick_tasks();
 
+    TIMER2_INTCLR = 0;
+}
+#endif
+
 void tick_start(unsigned int interval_in_ms)
 {
     int phi = 0;                            /* prescaler bits */
     int prescale = 1;
     int cycles = TIMER_FREQ / 1000 * interval_in_ms;
 
+#ifdef HAVE_SCROLLWHEEL
+    /* let the timer interrupt twice as often for the scrollwheel polling */
+    cycles >>= 1;
+#endif
+
     while(cycles > 0x10000)
     {
         phi++;
Index: firmware/target/arm/as3525/sansa-fuze/button-fuze.c
===================================================================
--- firmware/target/arm/as3525/sansa-fuze/button-fuze.c	(Revision 20684)
+++ firmware/target/arm/as3525/sansa-fuze/button-fuze.c	(Arbeitskopie)
@@ -49,7 +49,7 @@
 }
 
 #if !defined(BOOTLOADER) && defined(HAVE_SCROLLWHEEL)
-static void scrollwheel(short dbop)
+static void scrollwheel(void)
 {
     /* current wheel values, parsed from dbop and the resulting button */
     unsigned        wheel_value     = 0;
@@ -76,7 +76,7 @@
         { 2, 0, 3, 1 }, /* Clockwise rotation */
         { 1, 3, 0, 2 }, /* Counter-clockwise  */ 
     };
-    wheel_value = dbop & (1<<13|1<<14);
+    wheel_value = _dbop_din & (1<<13|1<<14);
     wheel_value >>= 13;
 
     if (old_wheel_value == wheel_tbl[0][wheel_value])
@@ -91,6 +91,7 @@
             /* direction reversals nullify repeats */
             wheel_repeat        = btn;
             repeat              = 0;
+            counter = 0;
         }
         if (btn != BUTTON_NONE)
         {
@@ -139,7 +140,7 @@
     while(i--);
 }
 
-static short button_dbop(void)
+short button_dbop(void)
 {
     /* skip home and power reading if lcd_button_support was blocked,
      * since the dbop bit 15 is invalid then, and use the old value instead */
@@ -178,6 +179,10 @@
         _dbop_din |= old_home_power & 1<<15;
         _dbop_din &= 0xfeff|(old_home_power & 1<<8);
     }
+#if defined(HAVE_SCROLLWHEEL) && !defined(BOOTLOADER)
+    /* read wheel on bit 13 & 14, but sent to the button queue seperately */
+        scrollwheel();
+#endif
     return _dbop_din;
 }
 
@@ -244,10 +249,6 @@
     else
     {
         hold_button = false;
-#if defined(HAVE_SCROLLWHEEL) && !defined(BOOTLOADER)
-    /* read wheel on bit 13 & 14, but sent to the button queue seperately */
-        scrollwheel(dbop);
-#endif
     /* read power on bit 8, but not if hold button was just released, since
      * you basically always hit power due to the slider mechanism after releasing
      * hold (wait ~1 sec) */