2 files changed, 20 insertions, 11 deletions

diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
index 25a69d7630..5655d92ef8 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
@@ -32,15 +32,15 @@ static bool hold_button        = false;
 
 static int const remote_buttons[] =
 {
-    BUTTON_NONE,    /* Headphones connected - remote disconnected */
-    BUTTON_SELECT,
-    BUTTON_MENU,    /* could be changed to BUTTON_A */
-    BUTTON_LEFT,
-    BUTTON_RIGHT,
-    BUTTON_UP,      /* could be changed to BUTTON_VOL_UP */
-    BUTTON_DOWN,    /* could be changed to BUTTON_VOL_DOWN */
-    BUTTON_NONE,    /* Remote control attached - no buttons pressed */
-    BUTTON_NONE,    /* Nothing in the headphone socket */
+    BUTTON_NONE,        /* Headphones connected - remote disconnected */
+    BUTTON_RC_PLAY,
+    BUTTON_RC_DSP,
+    BUTTON_RC_REW,
+    BUTTON_RC_FF,
+    BUTTON_RC_VOL_UP,
+    BUTTON_RC_VOL_DOWN,
+    BUTTON_NONE,        /* Remote control attached - no buttons pressed */
+    BUTTON_NONE,        /* Nothing in the headphone socket */
 };
 
 void button_init_device(void)
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/button-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/button-target.h
index ab68e8050f..7a39212de9 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/button-target.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/button-target.h
@@ -44,6 +44,15 @@ int button_read_device(void);
 #define BUTTON_SELECT       0x00000100
 #define BUTTON_A            0x00000200
 
+/* Remote control buttons */
+
+#define BUTTON_RC_VOL_UP    0x00000400
+#define BUTTON_RC_VOL_DOWN  0x00000800
+#define BUTTON_RC_FF        0x00001000
+#define BUTTON_RC_REW       0x00002000
+
+#define BUTTON_RC_PLAY      0x00004000
+#define BUTTON_RC_DSP       0x00008000
 
 /* Toshiba Gigabeat specific remote button ADC values */
 /* The remote control uses ADC 1 to emulate button pushes
@@ -80,8 +89,8 @@ int button_read_device(void);
                 |BUTTON_UP|BUTTON_DOWN|BUTTON_VOL_UP|BUTTON_VOL_DOWN\
                 |BUTTON_SELECT|BUTTON_A)
 
-
-#define BUTTON_REMOTE 0
+#define BUTTON_REMOTE (BUTTON_RC_VOL_UP|BUTTON_RC_VOL_DOWN|BUTTON_RC_FF\
+                |BUTTON_RC_REW|BUTTON_RC_PLAY|BUTTON_RC_DSP)
 
 #define POWEROFF_BUTTON BUTTON_POWER
 #define POWEROFF_COUNT 10