pdbox: Added keypad for iPod 1G-4G. Reordered SOURCES alphabetically.

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

1 files changed, 15 insertions, 3 deletions

diff --git a/apps/plugins/pdbox/pdbox.h b/apps/plugins/pdbox/pdbox.h
index e0a0fb59c7..2ee32a0dc8 100644
--- a/apps/plugins/pdbox/pdbox.h
+++ b/apps/plugins/pdbox/pdbox.h
@@ -225,7 +225,7 @@ enum pd_key_id
 
 /* Map real keys to virtual ones.
    Feel free to add your preferred keymap here. */
-#if defined(IRIVER_H300_SERIES)
+#if (CONFIG_KEYPAD == IRIVER_H300_PAD)
     /* Added by wincent */
     #define PDPOD_QUIT (BUTTON_OFF)
     #define PDPOD_PLAY (BUTTON_ON)
@@ -235,7 +235,7 @@ enum pd_key_id
     #define PDPOD_WHEELLEFT (BUTTON_DOWN)
     #define PDPOD_WHEELRIGHT (BUTTON_UP)
     #define PDPOD_ACTION (BUTTON_MODE)
-#elif defined(IRIVER_H100_SERIES)
+#elif (CONFIG_KEYPAD == IRIVER_H100_PAD)
     /* Added by wincent */
     #define PDPOD_QUIT (BUTTON_OFF)
     #define PDPOD_PLAY (BUTTON_REC)
@@ -245,7 +245,8 @@ enum pd_key_id
     #define PDPOD_WHEELLEFT (BUTTON_DOWN)
     #define PDPOD_WHEELRIGHT (BUTTON_UP)
     #define PDPOD_ACTION (BUTTON_ON)
-#elif CONFIG_KEYPAD == SANSA_FUZE_PAD
+#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD)
+    /* Added by funman */
     #define PDPOD_QUIT (BUTTON_HOME|BUTTON_REPEAT)
     #define PDPOD_PLAY BUTTON_UP
     #define PDPOD_PREVIOUS BUTTON_LEFT
@@ -254,6 +255,17 @@ enum pd_key_id
     #define PDPOD_WHEELLEFT BUTTON_SCROLL_BACK
     #define PDPOD_WHEELRIGHT BUTTON_SCROLL_FWD
     #define PDPOD_ACTION BUTTON_DOWN
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \
+      (CONFIG_KEYPAD == IPOD_1G2G_PAD)
+    /* Added by wincent */
+    #define PDPOD_QUIT (BUTTON_SELECT | BUTTON_MENU)
+    #define PDPOD_PLAY (BUTTON_PLAY)
+    #define PDPOD_PREVIOUS (BUTTON_LEFT)
+    #define PDPOD_NEXT (BUTTON_RIGHT)
+    #define PDPOD_MENU (BUTTON_MENU)
+    #define PDPOD_WHEELLEFT (BUTTON_SCROLL_BACK)
+    #define PDPOD_WHEELRIGHT (BUTTON_SCROLL_FWD)
+    #define PDPOD_ACTION (BUTTON_SELECT)
 #else
     #warning "No keys defined for this architecture!"
 #endif