1 files changed, 20 insertions, 6 deletions

diff --git a/firmware/target/arm/iriver/h10/button-h10.c b/firmware/target/arm/iriver/h10/button-h10.c
index badcd594a1..7979a52976 100644
--- a/firmware/target/arm/iriver/h10/button-h10.c
+++ b/firmware/target/arm/iriver/h10/button-h10.c
@@ -49,6 +49,7 @@ int button_read_device(void)
     int btn = BUTTON_NONE;
         unsigned char state;
         static bool hold_button = false;
+
 #if 0
     /* light handling */
     if (hold_button && !button_hold())
@@ -58,12 +59,25 @@ int button_read_device(void)
 #endif
 
     hold_button = button_hold();
-    state = GPIOA_INPUT_VAL & 0xf8;
-    if ((state & 0x8) == 0) btn |= BUTTON_FF;
-    if ((state & 0x16) == 0) btn |= BUTTON_PLAY;
-    if ((state & 0x32) == 0) btn |= BUTTON_REW;
-    if ((state & 0x64) == 0) btn |= BUTTON_RIGHT;
-    if ((state & 0x128) == 0) btn |= BUTTON_LEFT;
+        if (!hold_button)
+    {
+                /* Read normal buttons */
+                state = GPIOA_INPUT_VAL & 0xf8;
+                if ((state & 0x8) == 0) btn |= BUTTON_FF;
+                if ((state & 0x10) == 0) btn |= BUTTON_PLAY;
+                if ((state & 0x20) == 0) btn |= BUTTON_REW;
+                if ((state & 0x40) == 0) btn |= BUTTON_RIGHT;
+                if ((state & 0x80) == 0) btn |= BUTTON_LEFT;
+                
+                /* Read power button */
+                if ((GPIOB_INPUT_VAL & 0x1) == 0) btn |= BUTTON_POWER;
+                
+                /* Read scroller */
+                if ( ((GPIOC_INPUT_VAL & 0x4)==1) && ((GPIOD_INPUT_VAL & 0x10)==1) )
+                {
+                        /* Scroller is pressed */
+                }
+        }
         
     return btn;
 }