Initial setup for the H300 keypad

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

2 files changed, 24 insertions, 2 deletions

diff --git a/firmware/export/button.h b/firmware/export/button.h
index 5b55cc54c7..40c374880b 100644
--- a/firmware/export/button.h
+++ b/firmware/export/button.h
@@ -34,7 +34,8 @@ void button_clear_queue(void);
 void button_set_flip(bool flip); /* turn 180 degrees */
 #endif
 
-#if CONFIG_KEYPAD == IRIVER_H100_PAD
+#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
+    (CONFIG_KEYPAD == IRIVER_H300_PAD)
 bool button_hold(void);
 bool remote_button_hold(void);
 #endif
@@ -77,6 +78,27 @@ bool remote_button_hold(void);
 #define BUTTON_RC_FF          (BUTTON_REMOTE | 0x02000000)
 #define BUTTON_RC_REW         (BUTTON_REMOTE | 0x04000000)
 
+#elif CONFIG_KEYPAD == IRIVER_H300_PAD
+
+/* iRiver H300 specific button codes */
+#define  BUTTON_SELECT        0x0100
+#define  BUTTON_MODE          0x0200
+#define  BUTTON_REC           0x0400
+#define  BUTTON_ON            0x0001
+#define  BUTTON_OFF           0x0002
+#define  BUTTON_UP            0x0010
+#define  BUTTON_DOWN          0x0020
+
+#define BUTTON_RC_ON          (BUTTON_REMOTE | 0x00010000)
+#define BUTTON_RC_STOP        (BUTTON_REMOTE | 0x00020000)
+#define BUTTON_RC_VOL         (BUTTON_REMOTE | 0x00040000)
+#define BUTTON_RC_BITRATE     (BUTTON_REMOTE | 0x00200000)
+#define BUTTON_RC_REC         (BUTTON_REMOTE | 0x00400000)
+#define BUTTON_RC_SOURCE      (BUTTON_REMOTE | 0x00800000)
+#define BUTTON_RC_MENU        (BUTTON_REMOTE | 0x01000000)
+#define BUTTON_RC_FF          (BUTTON_REMOTE | 0x02000000)
+#define BUTTON_RC_REW         (BUTTON_REMOTE | 0x04000000)
+
 #elif CONFIG_KEYPAD == RECORDER_PAD
 
 /* Recorder specific button codes */
diff --git a/firmware/export/config.h b/firmware/export/config.h
index c5b694ed8d..e0d901b587 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -45,7 +45,7 @@
 #define ONDIO_PAD       2
 #define IRIVER_H100_PAD 3
 #define GMINI100_PAD    4
-#define IRIVER_H300_PAD 3
+#define IRIVER_H300_PAD 5
 
 /* CONFIG_REMOTE_KEYPAD */
 #define H100_REMOTE 0