2 files changed, 13 insertions, 13 deletions

diff --git a/firmware/target/arm/as3525/sansa-m200v4/button-m200v4.c b/firmware/target/arm/as3525/sansa-m200v4/button-m200v4.c
index a10956657f..d6bf0acf9b 100644
--- a/firmware/target/arm/as3525/sansa-m200v4/button-m200v4.c
+++ b/firmware/target/arm/as3525/sansa-m200v4/button-m200v4.c
@@ -41,7 +41,7 @@ int button_read_device(void)
     
     /* direct GPIO connections */
     if (GPIOA_PIN(3))
-        result |= BUTTON_MENU;
+        result |= BUTTON_POWER;
 
     /* This is a keypad using A4-A6 as columns and A0-A2 as rows */
     GPIOA_PIN(4) = (1<<4);
@@ -50,10 +50,10 @@ int button_read_device(void)
     /* A4A0 is unused */
 
     if (GPIOA_PIN(1))
-        result |= BUTTON_VOLDOWN;
+        result |= BUTTON_VOL_DOWN;
 
     if (GPIOA_PIN(2))
-        result |= BUTTON_PLAYPAUSE;
+        result |= BUTTON_UP;
 
     GPIOA_PIN(4) = 0x00;  
     
@@ -76,10 +76,10 @@ int button_read_device(void)
     btn_delay();
     
     if (GPIOA_PIN(0))
-        result |= BUTTON_REPEATAB;
+        result |= BUTTON_DOWN;
 
     if (GPIOA_PIN(1))
-        result |= BUTTON_VOLUP;
+        result |= BUTTON_VOL_UP;
 
     /* hold button is read in button_hold() */
         
diff --git a/firmware/target/arm/as3525/sansa-m200v4/button-target.h b/firmware/target/arm/as3525/sansa-m200v4/button-target.h
index 779f7400bb..49a7409a6b 100644
--- a/firmware/target/arm/as3525/sansa-m200v4/button-target.h
+++ b/firmware/target/arm/as3525/sansa-m200v4/button-target.h
@@ -32,24 +32,24 @@ int button_read_device(void);
 bool button_hold(void);
 
 /* Main unit's buttons */
-#define BUTTON_MENU         0x00000001
-#define BUTTON_VOLUP        0x00000002
-#define BUTTON_VOLDOWN      0x00000004
-#define BUTTON_PLAYPAUSE    0x00000008
-#define BUTTON_REPEATAB     0x00000010
+#define BUTTON_POWER        0x00000001
+#define BUTTON_VOL_UP       0x00000002
+#define BUTTON_VOL_DOWN     0x00000004
+#define BUTTON_UP           0x00000008
+#define BUTTON_DOWN         0x00000010
 #define BUTTON_LEFT         0x00000020
 #define BUTTON_RIGHT        0x00000040
 #define BUTTON_SELECT       0x00000080
 #define BUTTON_HOLD         0x00000100
 
-#define BUTTON_MAIN (BUTTON_MENU|BUTTON_VOLUP|BUTTON_VOLDOWN\
-                    |BUTTON_PLAYPAUSE|BUTTON_REPEATAB|BUTTON_LEFT\
+#define BUTTON_MAIN (BUTTON_POWER|BUTTON_VOL_UP|BUTTON_VOL_DOWN\
+                    |BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT\
                     |BUTTON_RIGHT|BUTTON_SELECT|BUTTON_HOLD)
 
 #define BUTTON_REMOTE 0
 
 /* Software power-off */
-#define POWEROFF_BUTTON BUTTON_MENU
+#define POWEROFF_BUTTON BUTTON_POWER
 #define POWEROFF_COUNT 40
                 
 #endif /* _BUTTON_TARGET_H_ */