diff options
42 files changed, 47 insertions, 57 deletions
diff --git a/apps/bookmark.h b/apps/bookmark.h index 6d281700f4..dff4473167 100644 --- a/apps/bookmark.h +++ b/apps/bookmark.h | |||
@@ -33,8 +33,7 @@ | |||
33 | #define BOOKMARK_DELETE (BUTTON_ON | BUTTON_SELECT) | 33 | #define BOOKMARK_DELETE (BUTTON_ON | BUTTON_SELECT) |
34 | #define BOOKMARK_DOWN BUTTON_DOWN | 34 | #define BOOKMARK_DOWN BUTTON_DOWN |
35 | 35 | ||
36 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 36 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
37 | (CONFIG_KEYPAD == IPOD_NANO_PAD) | ||
38 | #define BOOKMARK_SELECT BUTTON_SELECT | 37 | #define BOOKMARK_SELECT BUTTON_SELECT |
39 | #define BOOKMARK_DELETE (BUTTON_RIGHT | BUTTON_REPEAT) | 38 | #define BOOKMARK_DELETE (BUTTON_RIGHT | BUTTON_REPEAT) |
40 | #define BOOKMARK_DOWN BUTTON_SCROLL_FWD | 39 | #define BOOKMARK_DOWN BUTTON_SCROLL_FWD |
diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h index 54b3d1ec64..610c3021bf 100644 --- a/apps/gui/gwps.h +++ b/apps/gui/gwps.h | |||
@@ -172,8 +172,7 @@ | |||
172 | #define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN) | 172 | #define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN) |
173 | #define WPS_ID3 (BUTTON_MENU | BUTTON_ON) | 173 | #define WPS_ID3 (BUTTON_MENU | BUTTON_ON) |
174 | 174 | ||
175 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 175 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
176 | (CONFIG_KEYPAD == IPOD_NANO_PAD) | ||
177 | 176 | ||
178 | /* TODO: Check WPS button assignments */ | 177 | /* TODO: Check WPS button assignments */ |
179 | 178 | ||
diff --git a/apps/gui/list.h b/apps/gui/list.h index 5ba7983e0d..3ae1b80dc2 100644 --- a/apps/gui/list.h +++ b/apps/gui/list.h | |||
@@ -65,8 +65,7 @@ | |||
65 | #define LIST_NEXT BUTTON_DOWN | 65 | #define LIST_NEXT BUTTON_DOWN |
66 | #define LIST_PREV BUTTON_UP | 66 | #define LIST_PREV BUTTON_UP |
67 | 67 | ||
68 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 68 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
69 | (CONFIG_KEYPAD == IPOD_NANO_PAD) | ||
70 | #define LIST_NEXT BUTTON_SCROLL_FWD | 69 | #define LIST_NEXT BUTTON_SCROLL_FWD |
71 | #define LIST_PREV BUTTON_SCROLL_BACK | 70 | #define LIST_PREV BUTTON_SCROLL_BACK |
72 | 71 | ||
diff --git a/apps/gui/select.h b/apps/gui/select.h index 9bbfddf221..b6a9afd55c 100644 --- a/apps/gui/select.h +++ b/apps/gui/select.h | |||
@@ -54,8 +54,7 @@ | |||
54 | #define SELECT_CANCEL BUTTON_STOP | 54 | #define SELECT_CANCEL BUTTON_STOP |
55 | #define SELECT_CANCEL2 BUTTON_MENU | 55 | #define SELECT_CANCEL2 BUTTON_MENU |
56 | 56 | ||
57 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 57 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
58 | (CONFIG_KEYPAD == IPOD_NANO_PAD) | ||
59 | #define SELECT_INC BUTTON_SCROLL_FWD | 58 | #define SELECT_INC BUTTON_SCROLL_FWD |
60 | #define SELECT_DEC BUTTON_SCROLL_BACK | 59 | #define SELECT_DEC BUTTON_SCROLL_BACK |
61 | #define SELECT_OK BUTTON_SELECT | 60 | #define SELECT_OK BUTTON_SELECT |
diff --git a/apps/gui/yesno.h b/apps/gui/yesno.h index ac6500daf8..5399c88391 100644 --- a/apps/gui/yesno.h +++ b/apps/gui/yesno.h | |||
@@ -23,7 +23,7 @@ | |||
23 | #elif CONFIG_KEYPAD == GMINI100_PAD | 23 | #elif CONFIG_KEYPAD == GMINI100_PAD |
24 | #define YESNO_OK BUTTON_PLAY | 24 | #define YESNO_OK BUTTON_PLAY |
25 | 25 | ||
26 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 26 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
27 | #define YESNO_OK BUTTON_RIGHT | 27 | #define YESNO_OK BUTTON_RIGHT |
28 | #endif | 28 | #endif |
29 | enum yesno_res | 29 | enum yesno_res |
diff --git a/apps/menu.h b/apps/menu.h index 98cbf9417c..2d5c036a34 100644 --- a/apps/menu.h +++ b/apps/menu.h | |||
@@ -68,7 +68,7 @@ | |||
68 | #define MENU_ENTER BUTTON_RIGHT | 68 | #define MENU_ENTER BUTTON_RIGHT |
69 | #define MENU_ENTER2 BUTTON_PLAY | 69 | #define MENU_ENTER2 BUTTON_PLAY |
70 | 70 | ||
71 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 71 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
72 | 72 | ||
73 | /* TODO: Check menu button assignments */ | 73 | /* TODO: Check menu button assignments */ |
74 | 74 | ||
diff --git a/apps/plugins/battery_test.c b/apps/plugins/battery_test.c index 87d60c85a5..b559ed53af 100644 --- a/apps/plugins/battery_test.c +++ b/apps/plugins/battery_test.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ | 39 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
40 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | 40 | (CONFIG_KEYPAD == IRIVER_H300_PAD) |
41 | #define BATTERY_TEST_QUIT BUTTON_OFF | 41 | #define BATTERY_TEST_QUIT BUTTON_OFF |
42 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 42 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
43 | #define BATTERY_TEST_QUIT BUTTON_MENU | 43 | #define BATTERY_TEST_QUIT BUTTON_MENU |
44 | #endif | 44 | #endif |
45 | 45 | ||
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index ed2f9337b2..2a2d520371 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c | |||
@@ -50,7 +50,7 @@ | |||
50 | #define BOUNCE_QUIT (BUTTON_OFF | BUTTON_REL) | 50 | #define BOUNCE_QUIT (BUTTON_OFF | BUTTON_REL) |
51 | #define BOUNCE_MODE (BUTTON_SELECT | BUTTON_REL) | 51 | #define BOUNCE_MODE (BUTTON_SELECT | BUTTON_REL) |
52 | 52 | ||
53 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 53 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
54 | #define BOUNCE_UP BUTTON_SCROLL_BACK | 54 | #define BOUNCE_UP BUTTON_SCROLL_BACK |
55 | #define BOUNCE_DOWN BUTTON_SCROLL_FWD | 55 | #define BOUNCE_DOWN BUTTON_SCROLL_FWD |
56 | #define BOUNCE_QUIT (BUTTON_MENU | BUTTON_REL) | 56 | #define BOUNCE_QUIT (BUTTON_MENU | BUTTON_REL) |
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 70104391d6..51b9cfacc7 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -132,7 +132,7 @@ F3: equal to "=" | |||
132 | #define CALCULATOR_OPERATORS BUTTON_MODE | 132 | #define CALCULATOR_OPERATORS BUTTON_MODE |
133 | #define CALCULATOR_CLEAR BUTTON_REC | 133 | #define CALCULATOR_CLEAR BUTTON_REC |
134 | 134 | ||
135 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 135 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
136 | 136 | ||
137 | #define CALCULATOR_UP BUTTON_SCROLL_BACK | 137 | #define CALCULATOR_UP BUTTON_SCROLL_BACK |
138 | #define CALCULATOR_DOWN BUTTON_SCROLL_FWD | 138 | #define CALCULATOR_DOWN BUTTON_SCROLL_FWD |
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index b53980f9e4..3291f3e32e 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -64,7 +64,7 @@ | |||
64 | #define CHC_SETTINGS_CANCEL BUTTON_OFF | 64 | #define CHC_SETTINGS_CANCEL BUTTON_OFF |
65 | #define CHC_SETTINGS_CANCEL2 BUTTON_REC | 65 | #define CHC_SETTINGS_CANCEL2 BUTTON_REC |
66 | 66 | ||
67 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 67 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
68 | #define CHC_QUIT BUTTON_PLAY | 68 | #define CHC_QUIT BUTTON_PLAY |
69 | #define CHC_STARTSTOP BUTTON_SELECT | 69 | #define CHC_STARTSTOP BUTTON_SELECT |
70 | #define CHC_RESET BUTTON_LEFT | 70 | #define CHC_RESET BUTTON_LEFT |
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index 295ac35dc3..56ce12a388 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c | |||
@@ -974,7 +974,7 @@ STATIC void chip8 (void) | |||
974 | #define CHIP8_KEY6 BUTTON_RIGHT | 974 | #define CHIP8_KEY6 BUTTON_RIGHT |
975 | #define CHIP8_KEY8 BUTTON_DOWN | 975 | #define CHIP8_KEY8 BUTTON_DOWN |
976 | 976 | ||
977 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 977 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
978 | #define CHIP8_OFF BUTTON_MENU | 978 | #define CHIP8_OFF BUTTON_MENU |
979 | #define CHIP8_KEY2 BUTTON_SCROLL_BACK | 979 | #define CHIP8_KEY2 BUTTON_SCROLL_BACK |
980 | #define CHIP8_KEY4 BUTTON_LEFT | 980 | #define CHIP8_KEY4 BUTTON_LEFT |
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index f081f88e4a..cebc36a016 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -79,7 +79,7 @@ | |||
79 | #define CUBE_PAUSE (BUTTON_ON | BUTTON_REL) | 79 | #define CUBE_PAUSE (BUTTON_ON | BUTTON_REL) |
80 | #define CUBE_HIGHSPEED BUTTON_SELECT | 80 | #define CUBE_HIGHSPEED BUTTON_SELECT |
81 | 81 | ||
82 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 82 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
83 | #define CUBE_QUIT BUTTON_MENU | 83 | #define CUBE_QUIT BUTTON_MENU |
84 | #define CUBE_X_INC BUTTON_LEFT | 84 | #define CUBE_X_INC BUTTON_LEFT |
85 | #define CUBE_X_DEC BUTTON_RIGHT | 85 | #define CUBE_X_DEC BUTTON_RIGHT |
diff --git a/apps/plugins/databox/databox.c b/apps/plugins/databox/databox.c index c2a33b7331..d9b513c378 100644 --- a/apps/plugins/databox/databox.c +++ b/apps/plugins/databox/databox.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #elif CONFIG_KEYPAD == ONDIO_PAD | 29 | #elif CONFIG_KEYPAD == ONDIO_PAD |
30 | #define DBX_SELECT BUTTON_MENU | 30 | #define DBX_SELECT BUTTON_MENU |
31 | #define DBX_STOP BUTTON_OFF | 31 | #define DBX_STOP BUTTON_OFF |
32 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 32 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
33 | #define DBX_SELECT BUTTON_SELECT | 33 | #define DBX_SELECT BUTTON_SELECT |
34 | #define DBX_STOP BUTTON_MENU | 34 | #define DBX_STOP BUTTON_MENU |
35 | #elif CONFIG_KEYPAD == PLAYER_PAD | 35 | #elif CONFIG_KEYPAD == PLAYER_PAD |
diff --git a/apps/plugins/demystify.c b/apps/plugins/demystify.c index 67674b099d..8cb3315bdf 100644 --- a/apps/plugins/demystify.c +++ b/apps/plugins/demystify.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #ifdef HAVE_LCD_BITMAP | 24 | #ifdef HAVE_LCD_BITMAP |
25 | 25 | ||
26 | /* Key assignement */ | 26 | /* Key assignement */ |
27 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 27 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) |
28 | #define DEMYSTIFY_QUIT BUTTON_MENU | 28 | #define DEMYSTIFY_QUIT BUTTON_MENU |
29 | #define DEMYSTIFY_ADD_POLYGON BUTTON_RIGHT | 29 | #define DEMYSTIFY_ADD_POLYGON BUTTON_RIGHT |
30 | #define DEMYSTIFY_REMOVE_POLYGON BUTTON_LEFT | 30 | #define DEMYSTIFY_REMOVE_POLYGON BUTTON_LEFT |
diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c index a80ace2871..aea7c44a6c 100644 --- a/apps/plugins/dict.c +++ b/apps/plugins/dict.c | |||
@@ -102,7 +102,7 @@ long reverse (long N) { | |||
102 | /* Button definitions */ | 102 | /* Button definitions */ |
103 | #if CONFIG_KEYPAD == PLAYER_PAD | 103 | #if CONFIG_KEYPAD == PLAYER_PAD |
104 | #define LP_QUIT BUTTON_STOP | 104 | #define LP_QUIT BUTTON_STOP |
105 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 105 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
106 | #define LP_QUIT BUTTON_MENU | 106 | #define LP_QUIT BUTTON_MENU |
107 | #else | 107 | #else |
108 | #define LP_QUIT BUTTON_OFF | 108 | #define LP_QUIT BUTTON_OFF |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index da449d397c..f921a2e95d 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -50,7 +50,7 @@ | |||
50 | #define FLIPIT_TOGGLE_PRE BUTTON_SELECT | 50 | #define FLIPIT_TOGGLE_PRE BUTTON_SELECT |
51 | #define FLIPIT_TOGGLE (BUTTON_SELECT | BUTTON_REL) | 51 | #define FLIPIT_TOGGLE (BUTTON_SELECT | BUTTON_REL) |
52 | 52 | ||
53 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 53 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
54 | 54 | ||
55 | #define FLIPIT_UP BUTTON_SCROLL_FWD | 55 | #define FLIPIT_UP BUTTON_SCROLL_FWD |
56 | #define FLIPIT_DOWN BUTTON_SCROLL_BACK | 56 | #define FLIPIT_DOWN BUTTON_SCROLL_BACK |
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 2031a1cc3b..739e8141a6 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -67,7 +67,7 @@ | |||
67 | #define BEJEWELED_SELECT BUTTON_SELECT | 67 | #define BEJEWELED_SELECT BUTTON_SELECT |
68 | #define BEJEWELED_RESUME BUTTON_MODE | 68 | #define BEJEWELED_RESUME BUTTON_MODE |
69 | 69 | ||
70 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 70 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
71 | #define BEJEWELED_SCROLLWHEEL | 71 | #define BEJEWELED_SCROLLWHEEL |
72 | #define BEJEWELED_UP BUTTON_MENU | 72 | #define BEJEWELED_UP BUTTON_MENU |
73 | #define BEJEWELED_DOWN BUTTON_PLAY | 73 | #define BEJEWELED_DOWN BUTTON_PLAY |
@@ -2241,7 +2241,7 @@ static int bejeweled(struct game_context* bj) { | |||
2241 | rb->lcd_puts(0, 7, "Directions to move"); | 2241 | rb->lcd_puts(0, 7, "Directions to move"); |
2242 | rb->snprintf(str, 18, "High Score: %d", bj->highscores[0]); | 2242 | rb->snprintf(str, 18, "High Score: %d", bj->highscores[0]); |
2243 | rb->lcd_puts(0, 9, str); | 2243 | rb->lcd_puts(0, 9, str); |
2244 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 2244 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
2245 | rb->lcd_puts(0, 2, "PLAY to start"); | 2245 | rb->lcd_puts(0, 2, "PLAY to start"); |
2246 | rb->lcd_puts(0, 3, "SELECT+PLAY to save/resume"); | 2246 | rb->lcd_puts(0, 3, "SELECT+PLAY to save/resume"); |
2247 | rb->lcd_puts(0, 4, "SELECT+MENU to exit"); | 2247 | rb->lcd_puts(0, 4, "SELECT+MENU to exit"); |
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index 40f131861a..ba5451410b 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c | |||
@@ -181,7 +181,7 @@ const unsigned char rockbox16x7[] = { | |||
181 | #define LP_INC_X BUTTON_RIGHT | 181 | #define LP_INC_X BUTTON_RIGHT |
182 | #define LP_DEC_Y (BUTTON_ON | BUTTON_LEFT) | 182 | #define LP_DEC_Y (BUTTON_ON | BUTTON_LEFT) |
183 | #define LP_INC_Y (BUTTON_ON | BUTTON_RIGHT) | 183 | #define LP_INC_Y (BUTTON_ON | BUTTON_RIGHT) |
184 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 184 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
185 | #define LP_QUIT BUTTON_MENU | 185 | #define LP_QUIT BUTTON_MENU |
186 | #define LP_DEC_X BUTTON_LEFT | 186 | #define LP_DEC_X BUTTON_LEFT |
187 | #define LP_INC_X BUTTON_RIGHT | 187 | #define LP_INC_X BUTTON_RIGHT |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index ea278df59c..624c807b92 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -71,7 +71,7 @@ use F3 to see how many mines are left (supposing all your flags are correct) | |||
71 | #define MINESWP_DISCOVER BUTTON_ON | 71 | #define MINESWP_DISCOVER BUTTON_ON |
72 | #define MINESWP_INFO BUTTON_MODE | 72 | #define MINESWP_INFO BUTTON_MODE |
73 | 73 | ||
74 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 74 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
75 | #define MINESWP_UP BUTTON_SCROLL_BACK | 75 | #define MINESWP_UP BUTTON_SCROLL_BACK |
76 | #define MINESWP_DOWN BUTTON_SCROLL_FWD | 76 | #define MINESWP_DOWN BUTTON_SCROLL_FWD |
77 | #define MINESWP_QUIT BUTTON_MENU | 77 | #define MINESWP_QUIT BUTTON_MENU |
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c index a05d1656c8..0773236140 100644 --- a/apps/plugins/mosaique.c +++ b/apps/plugins/mosaique.c | |||
@@ -51,7 +51,7 @@ | |||
51 | #define MOSAIQUE_SPEED BUTTON_MODE | 51 | #define MOSAIQUE_SPEED BUTTON_MODE |
52 | #define MOSAIQUE_RESTART BUTTON_ON | 52 | #define MOSAIQUE_RESTART BUTTON_ON |
53 | 53 | ||
54 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 54 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
55 | #define MOSAIQUE_QUIT BUTTON_MENU | 55 | #define MOSAIQUE_QUIT BUTTON_MENU |
56 | #define MOSAIQUE_SPEED BUTTON_SELECT | 56 | #define MOSAIQUE_SPEED BUTTON_SELECT |
57 | #define MOSAIQUE_RESTART BUTTON_PLAY | 57 | #define MOSAIQUE_RESTART BUTTON_PLAY |
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index 68bc3968bf..41507c5ff4 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -56,7 +56,7 @@ | |||
56 | #define PONG_RIGHT_UP BUTTON_ON | 56 | #define PONG_RIGHT_UP BUTTON_ON |
57 | #define PONG_RIGHT_DOWN BUTTON_MODE | 57 | #define PONG_RIGHT_DOWN BUTTON_MODE |
58 | 58 | ||
59 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 59 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
60 | #define PONG_QUIT BUTTON_SELECT | 60 | #define PONG_QUIT BUTTON_SELECT |
61 | #define PONG_LEFT_UP BUTTON_MENU | 61 | #define PONG_LEFT_UP BUTTON_MENU |
62 | #define PONG_LEFT_DOWN BUTTON_LEFT | 62 | #define PONG_LEFT_DOWN BUTTON_LEFT |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index 9fcc8cf563..786e590571 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -22,7 +22,7 @@ | |||
22 | 22 | ||
23 | #ifdef HAVE_LCD_BITMAP | 23 | #ifdef HAVE_LCD_BITMAP |
24 | 24 | ||
25 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 25 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) |
26 | #define ROCKBLOX_OFF BUTTON_MENU | 26 | #define ROCKBLOX_OFF BUTTON_MENU |
27 | #define ROCKBLOX_UP BUTTON_SCROLL_BACK | 27 | #define ROCKBLOX_UP BUTTON_SCROLL_BACK |
28 | #define ROCKBLOX_DOWN BUTTON_SCROLL_FWD | 28 | #define ROCKBLOX_DOWN BUTTON_SCROLL_FWD |
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index d85d011e13..a153467a75 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #define PUZZLE_SHUFFLE BUTTON_SELECT | 43 | #define PUZZLE_SHUFFLE BUTTON_SELECT |
44 | #define PUZZLE_PICTURE BUTTON_ON | 44 | #define PUZZLE_PICTURE BUTTON_ON |
45 | 45 | ||
46 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 46 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
47 | #define PUZZLE_QUIT BUTTON_MENU | 47 | #define PUZZLE_QUIT BUTTON_MENU |
48 | #define PUZZLE_UP BUTTON_SCROLL_BACK | 48 | #define PUZZLE_UP BUTTON_SCROLL_BACK |
49 | #define PUZZLE_DOWN BUTTON_SCROLL_FWD | 49 | #define PUZZLE_DOWN BUTTON_SCROLL_FWD |
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index 01716b2d0b..bf5d8f9795 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c | |||
@@ -53,8 +53,7 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left; | |||
53 | #define SNAKE_DOWN BUTTON_DOWN | 53 | #define SNAKE_DOWN BUTTON_DOWN |
54 | #define SNAKE_PLAYPAUSE BUTTON_ON | 54 | #define SNAKE_PLAYPAUSE BUTTON_ON |
55 | 55 | ||
56 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 56 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
57 | |||
58 | #define SNAKE_QUIT (BUTTON_SELECT|BUTTON_MENU) | 57 | #define SNAKE_QUIT (BUTTON_SELECT|BUTTON_MENU) |
59 | #define SNAKE_UP BUTTON_MENU | 58 | #define SNAKE_UP BUTTON_MENU |
60 | #define SNAKE_DOWN BUTTON_PLAY | 59 | #define SNAKE_DOWN BUTTON_PLAY |
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index f5ee34b2cb..ea526b3871 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -91,8 +91,7 @@ Head and Tail are stored | |||
91 | #define SNAKE2_SELECT_TYPE BUTTON_MODE | 91 | #define SNAKE2_SELECT_TYPE BUTTON_MODE |
92 | #define SNAKE2_PLAYPAUSE BUTTON_ON | 92 | #define SNAKE2_PLAYPAUSE BUTTON_ON |
93 | 93 | ||
94 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 94 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
95 | |||
96 | #define SNAKE2_UP BUTTON_MENU | 95 | #define SNAKE2_UP BUTTON_MENU |
97 | #define SNAKE2_DOWN BUTTON_PLAY | 96 | #define SNAKE2_DOWN BUTTON_PLAY |
98 | #define SNAKE2_QUIT (BUTTON_SELECT | BUTTON_MENU) | 97 | #define SNAKE2_QUIT (BUTTON_SELECT | BUTTON_MENU) |
diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c index 06ec4ac5f6..ec4a240894 100644 --- a/apps/plugins/snow.c +++ b/apps/plugins/snow.c | |||
@@ -34,7 +34,7 @@ | |||
34 | /* variable button definitions */ | 34 | /* variable button definitions */ |
35 | #if CONFIG_KEYPAD == PLAYER_PAD | 35 | #if CONFIG_KEYPAD == PLAYER_PAD |
36 | #define SNOW_QUIT BUTTON_STOP | 36 | #define SNOW_QUIT BUTTON_STOP |
37 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 37 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
38 | #define SNOW_QUIT BUTTON_MENU | 38 | #define SNOW_QUIT BUTTON_MENU |
39 | #else | 39 | #else |
40 | #define SNOW_QUIT BUTTON_OFF | 40 | #define SNOW_QUIT BUTTON_OFF |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 545ea771ef..515997379d 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -63,7 +63,7 @@ | |||
63 | #define SOKOBAN_LEVEL_DOWN BUTTON_REC | 63 | #define SOKOBAN_LEVEL_DOWN BUTTON_REC |
64 | #define SOKOBAN_LEVEL_REPEAT BUTTON_SELECT | 64 | #define SOKOBAN_LEVEL_REPEAT BUTTON_SELECT |
65 | 65 | ||
66 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 66 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
67 | #define SOKOBAN_UP BUTTON_MENU | 67 | #define SOKOBAN_UP BUTTON_MENU |
68 | #define SOKOBAN_DOWN BUTTON_PLAY | 68 | #define SOKOBAN_DOWN BUTTON_PLAY |
69 | #define SOKOBAN_QUIT (BUTTON_SELECT | BUTTON_MENU) | 69 | #define SOKOBAN_QUIT (BUTTON_SELECT | BUTTON_MENU) |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index efecaa854b..ea56e2a693 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -102,7 +102,7 @@ static struct plugin_api* rb; | |||
102 | #define SOL_MENU_INFO BUTTON_MODE | 102 | #define SOL_MENU_INFO BUTTON_MODE |
103 | #define SOL_MENU_INFO2 BUTTON_REC | 103 | #define SOL_MENU_INFO2 BUTTON_REC |
104 | 104 | ||
105 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 105 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
106 | 106 | ||
107 | #define SOL_QUIT (BUTTON_SELECT | BUTTON_MENU) | 107 | #define SOL_QUIT (BUTTON_SELECT | BUTTON_MENU) |
108 | #define SOL_UP BUTTON_MENU | 108 | #define SOL_UP BUTTON_MENU |
@@ -148,7 +148,7 @@ static struct plugin_api* rb; | |||
148 | #define HELP_SOL_CUR2STACK "SELECT..: Put the card under the cursor on one of the 4 final stacks." | 148 | #define HELP_SOL_CUR2STACK "SELECT..: Put the card under the cursor on one of the 4 final stacks." |
149 | #define HELP_SOL_REM2STACK "PLAY+RIGHT: Put the card on top of the remains' stack on one of the 4 final stacks." | 149 | #define HELP_SOL_REM2STACK "PLAY+RIGHT: Put the card on top of the remains' stack on one of the 4 final stacks." |
150 | 150 | ||
151 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 151 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
152 | #define HELP_SOL_MOVE "SELECT: Select cards, Move cards, reveal hidden cards ..." | 152 | #define HELP_SOL_MOVE "SELECT: Select cards, Move cards, reveal hidden cards ..." |
153 | #define HELP_SOL_DRAW "SELECT+PLAY: Un-select a card if it was selected. Else, draw 3 new cards out of the remains' stack." | 153 | #define HELP_SOL_DRAW "SELECT+PLAY: Un-select a card if it was selected. Else, draw 3 new cards out of the remains' stack." |
154 | #define HELP_SOL_REM2CUR "SELECT+LEFT: Put the card on top of the remains' stack on top of the cursor." | 154 | #define HELP_SOL_REM2CUR "SELECT+LEFT: Put the card on top of the remains' stack on top of the cursor." |
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index ac85738577..c6a2853231 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -96,7 +96,7 @@ | |||
96 | #define STAR_LEVEL_REPEAT (BUTTON_MODE | BUTTON_UP) | 96 | #define STAR_LEVEL_REPEAT (BUTTON_MODE | BUTTON_UP) |
97 | #define STAR_MENU_RUN BUTTON_RIGHT | 97 | #define STAR_MENU_RUN BUTTON_RIGHT |
98 | 98 | ||
99 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 99 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
100 | 100 | ||
101 | #define STAR_QUIT (BUTTON_SELECT | BUTTON_MENU) | 101 | #define STAR_QUIT (BUTTON_SELECT | BUTTON_MENU) |
102 | #define STAR_UP BUTTON_SCROLL_BACK | 102 | #define STAR_UP BUTTON_SCROLL_BACK |
diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c index 8462c2f478..407e79f3c1 100644 --- a/apps/plugins/starfield.c +++ b/apps/plugins/starfield.c | |||
@@ -24,7 +24,7 @@ | |||
24 | static struct plugin_api* rb; /* global api struct pointer */ | 24 | static struct plugin_api* rb; /* global api struct pointer */ |
25 | 25 | ||
26 | /* Key assignement */ | 26 | /* Key assignement */ |
27 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 27 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) |
28 | #define STARFIELD_QUIT BUTTON_MENU | 28 | #define STARFIELD_QUIT BUTTON_MENU |
29 | #define STARFIELD_INCREASE_ZMOVE BUTTON_SCROLL_FWD | 29 | #define STARFIELD_INCREASE_ZMOVE BUTTON_SCROLL_FWD |
30 | #define STARFIELD_DECREASE_ZMOVE BUTTON_SCROLL_BACK | 30 | #define STARFIELD_DECREASE_ZMOVE BUTTON_SCROLL_BACK |
diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c index 8023341350..0dfac24c6d 100644 --- a/apps/plugins/stats.c +++ b/apps/plugins/stats.c | |||
@@ -28,7 +28,7 @@ static int fontwidth, fontheight; | |||
28 | 28 | ||
29 | #if CONFIG_KEYPAD == PLAYER_PAD | 29 | #if CONFIG_KEYPAD == PLAYER_PAD |
30 | #define STATS_STOP BUTTON_STOP | 30 | #define STATS_STOP BUTTON_STOP |
31 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 31 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
32 | #define STATS_STOP BUTTON_MENU | 32 | #define STATS_STOP BUTTON_MENU |
33 | #else | 33 | #else |
34 | #define STATS_STOP BUTTON_OFF | 34 | #define STATS_STOP BUTTON_OFF |
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index c4aeaf2711..9df064d36f 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -61,7 +61,7 @@ | |||
61 | #define STOPWATCH_LAP_TIMER BUTTON_ON | 61 | #define STOPWATCH_LAP_TIMER BUTTON_ON |
62 | #define STOPWATCH_SCROLL_UP BUTTON_RIGHT | 62 | #define STOPWATCH_SCROLL_UP BUTTON_RIGHT |
63 | #define STOPWATCH_SCROLL_DOWN BUTTON_LEFT | 63 | #define STOPWATCH_SCROLL_DOWN BUTTON_LEFT |
64 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 64 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
65 | #define STOPWATCH_QUIT BUTTON_MENU | 65 | #define STOPWATCH_QUIT BUTTON_MENU |
66 | #define STOPWATCH_START_STOP BUTTON_SELECT | 66 | #define STOPWATCH_START_STOP BUTTON_SELECT |
67 | #define STOPWATCH_RESET_TIMER BUTTON_LEFT | 67 | #define STOPWATCH_RESET_TIMER BUTTON_LEFT |
diff --git a/apps/plugins/sudoku.c b/apps/plugins/sudoku.c index 586b94b721..453a4447b1 100644 --- a/apps/plugins/sudoku.c +++ b/apps/plugins/sudoku.c | |||
@@ -95,8 +95,7 @@ Example ".ss" file, and one with a saved state: | |||
95 | #define SUDOKU_BUTTON_MENU BUTTON_MODE | 95 | #define SUDOKU_BUTTON_MENU BUTTON_MODE |
96 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC | 96 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC |
97 | 97 | ||
98 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 98 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
99 | |||
100 | #define SUDOKU_BUTTON_QUIT (BUTTON_SELECT | BUTTON_MENU) | 99 | #define SUDOKU_BUTTON_QUIT (BUTTON_SELECT | BUTTON_MENU) |
101 | #define SUDOKU_BUTTON_UP BUTTON_SCROLL_BACK | 100 | #define SUDOKU_BUTTON_UP BUTTON_SCROLL_BACK |
102 | #define SUDOKU_BUTTON_DOWN BUTTON_SCROLL_FWD | 101 | #define SUDOKU_BUTTON_DOWN BUTTON_SCROLL_FWD |
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index 99e1f5e461..60438c9dc9 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c | |||
@@ -119,7 +119,7 @@ | |||
119 | #define VIEWER_COLUMN_LEFT (BUTTON_ON | BUTTON_LEFT) | 119 | #define VIEWER_COLUMN_LEFT (BUTTON_ON | BUTTON_LEFT) |
120 | #define VIEWER_COLUMN_RIGHT (BUTTON_ON | BUTTON_RIGHT) | 120 | #define VIEWER_COLUMN_RIGHT (BUTTON_ON | BUTTON_RIGHT) |
121 | 121 | ||
122 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 122 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
123 | #define VIEWER_QUIT BUTTON_MENU | 123 | #define VIEWER_QUIT BUTTON_MENU |
124 | #define VIEWER_PAGE_UP BUTTON_SCROLL_FWD | 124 | #define VIEWER_PAGE_UP BUTTON_SCROLL_FWD |
125 | #define VIEWER_PAGE_DOWN BUTTON_SCROLL_BACK | 125 | #define VIEWER_PAGE_DOWN BUTTON_SCROLL_BACK |
@@ -1172,7 +1172,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file) | |||
1172 | 1172 | ||
1173 | #if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == ONDIO_PAD) \ | 1173 | #if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == ONDIO_PAD) \ |
1174 | || (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) \ | 1174 | || (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) \ |
1175 | || (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 1175 | || (CONFIG_KEYPAD == IPOD_4G_PAD) |
1176 | case VIEWER_MODE_PAGE: | 1176 | case VIEWER_MODE_PAGE: |
1177 | /* Page-overlap mode */ | 1177 | /* Page-overlap mode */ |
1178 | if (++page_mode == PAGE_MODES) | 1178 | if (++page_mode == PAGE_MODES) |
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c index c2ff8b6f17..d4cc8fbfd0 100644 --- a/apps/recorder/keyboard.c +++ b/apps/recorder/keyboard.c | |||
@@ -101,7 +101,7 @@ | |||
101 | #define KBD_UP BUTTON_UP | 101 | #define KBD_UP BUTTON_UP |
102 | #define KBD_DOWN BUTTON_DOWN | 102 | #define KBD_DOWN BUTTON_DOWN |
103 | 103 | ||
104 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 104 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
105 | 105 | ||
106 | #define KBD_MODES /* iPod uses 2 modes, picker and line edit */ | 106 | #define KBD_MODES /* iPod uses 2 modes, picker and line edit */ |
107 | #define KBD_SELECT (BUTTON_SELECT | BUTTON_REL) /* backspace in line edit */ | 107 | #define KBD_SELECT (BUTTON_SELECT | BUTTON_REL) /* backspace in line edit */ |
diff --git a/apps/settings.h b/apps/settings.h index 7f463c01fe..7378f1daeb 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -88,8 +88,7 @@ | |||
88 | #define SETTINGS_NEXT BUTTON_RIGHT | 88 | #define SETTINGS_NEXT BUTTON_RIGHT |
89 | #define SETTINGS_ACCEPT BUTTON_MENU | 89 | #define SETTINGS_ACCEPT BUTTON_MENU |
90 | 90 | ||
91 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 91 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
92 | (CONFIG_KEYPAD == IPOD_NANO_PAD) | ||
93 | #define SETTINGS_INC BUTTON_SCROLL_FWD | 92 | #define SETTINGS_INC BUTTON_SCROLL_FWD |
94 | #define SETTINGS_DEC BUTTON_SCROLL_BACK | 93 | #define SETTINGS_DEC BUTTON_SCROLL_BACK |
95 | #define SETTINGS_OK BUTTON_SELECT | 94 | #define SETTINGS_OK BUTTON_SELECT |
diff --git a/apps/tree.h b/apps/tree.h index d0da72643e..05800ae68a 100644 --- a/apps/tree.h +++ b/apps/tree.h | |||
@@ -135,8 +135,7 @@ | |||
135 | #define TREE_CONTEXT2 (BUTTON_ON | BUTTON_PLAY) | 135 | #define TREE_CONTEXT2 (BUTTON_ON | BUTTON_PLAY) |
136 | #define TREE_POWER_BTN BUTTON_ON | 136 | #define TREE_POWER_BTN BUTTON_ON |
137 | 137 | ||
138 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 138 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
139 | (CONFIG_KEYPAD == IPOD_NANO_PAD) | ||
140 | 139 | ||
141 | #define TREE_NEXT BUTTON_SCROLL_FWD | 140 | #define TREE_NEXT BUTTON_SCROLL_FWD |
142 | #define TREE_PREV BUTTON_SCROLL_BACK | 141 | #define TREE_PREV BUTTON_SCROLL_BACK |
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index 307b424d09..15276a985e 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c | |||
@@ -63,7 +63,7 @@ static int button_read(void); | |||
63 | static bool remote_button_hold_only(void); | 63 | static bool remote_button_hold_only(void); |
64 | #endif | 64 | #endif |
65 | 65 | ||
66 | #if CONFIG_KEYPAD == IPOD_4G_PAD || CONFIG_KEYPAD == IPOD_NANO_PAD | 66 | #if CONFIG_KEYPAD == IPOD_4G_PAD |
67 | /* Variable to use for setting button status in interrupt handler */ | 67 | /* Variable to use for setting button status in interrupt handler */ |
68 | int int_btn = BUTTON_NONE; | 68 | int int_btn = BUTTON_NONE; |
69 | 69 | ||
@@ -371,7 +371,7 @@ void button_init(void) | |||
371 | /* nothing to initialize here */ | 371 | /* nothing to initialize here */ |
372 | #elif CONFIG_KEYPAD == GMINI100_PAD | 372 | #elif CONFIG_KEYPAD == GMINI100_PAD |
373 | /* nothing to initialize here */ | 373 | /* nothing to initialize here */ |
374 | #elif CONFIG_KEYPAD == IPOD_4G_PAD || CONFIG_KEYPAD == IPOD_NANO_PAD | 374 | #elif CONFIG_KEYPAD == IPOD_4G_PAD |
375 | opto_i2c_init(); | 375 | opto_i2c_init(); |
376 | /* hold button - enable as input */ | 376 | /* hold button - enable as input */ |
377 | GPIOA_ENABLE |= 0x20; | 377 | GPIOA_ENABLE |= 0x20; |
@@ -397,7 +397,7 @@ void button_init(void) | |||
397 | } | 397 | } |
398 | 398 | ||
399 | #ifdef HAVE_LCD_BITMAP /* only bitmap displays can be flipped */ | 399 | #ifdef HAVE_LCD_BITMAP /* only bitmap displays can be flipped */ |
400 | #if (CONFIG_KEYPAD != IPOD_4G_PAD) && (CONFIG_KEYPAD != IPOD_NANO_PAD) | 400 | #if (CONFIG_KEYPAD != IPOD_4G_PAD) |
401 | /* | 401 | /* |
402 | * helper function to swap UP/DOWN, LEFT/RIGHT (and F1/F3 for Recorder) | 402 | * helper function to swap UP/DOWN, LEFT/RIGHT (and F1/F3 for Recorder) |
403 | */ | 403 | */ |
@@ -821,7 +821,7 @@ static int button_read(void) | |||
821 | if (data & 0x01) | 821 | if (data & 0x01) |
822 | btn |= BUTTON_ON; | 822 | btn |= BUTTON_ON; |
823 | 823 | ||
824 | #elif CONFIG_KEYPAD == IPOD_4G_PAD || CONFIG_KEYPAD == IPOD_NANO_PAD | 824 | #elif CONFIG_KEYPAD == IPOD_4G_PAD |
825 | (void)data; | 825 | (void)data; |
826 | /* The int_btn variable is set in the button interrupt handler */ | 826 | /* The int_btn variable is set in the button interrupt handler */ |
827 | btn = int_btn; | 827 | btn = int_btn; |
diff --git a/firmware/export/button.h b/firmware/export/button.h index 4bf5edde5b..47912ef1df 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h | |||
@@ -149,7 +149,7 @@ bool remote_button_hold(void); | |||
149 | #define BUTTON_DOWN 0x0020 | 149 | #define BUTTON_DOWN 0x0020 |
150 | #define BUTTON_MENU 0x0100 | 150 | #define BUTTON_MENU 0x0100 |
151 | 151 | ||
152 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 152 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
153 | 153 | ||
154 | /* TODO: These codes should relate to the hardware */ | 154 | /* TODO: These codes should relate to the hardware */ |
155 | 155 | ||
diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h index 6657ba8aaa..8c7a3b2f8c 100644 --- a/firmware/export/config-ipodnano.h +++ b/firmware/export/config-ipodnano.h | |||
@@ -21,7 +21,7 @@ | |||
21 | #define LCD_DEPTH 16 /* 65536 colours */ | 21 | #define LCD_DEPTH 16 /* 65536 colours */ |
22 | #define LCD_PIXELFORMAT RGB565SWAPPED /* rgb565 byte-swapped */ | 22 | #define LCD_PIXELFORMAT RGB565SWAPPED /* rgb565 byte-swapped */ |
23 | 23 | ||
24 | #define CONFIG_KEYPAD IPOD_NANO_PAD | 24 | #define CONFIG_KEYPAD IPOD_4G_PAD |
25 | 25 | ||
26 | /* Define this if you do software codec */ | 26 | /* Define this if you do software codec */ |
27 | #define CONFIG_CODEC SWCODEC | 27 | #define CONFIG_CODEC SWCODEC |
diff --git a/firmware/export/config.h b/firmware/export/config.h index 858b348ed3..3f563ca9df 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -51,7 +51,6 @@ | |||
51 | #define IRIVER_H300_PAD 5 | 51 | #define IRIVER_H300_PAD 5 |
52 | #define IAUDIO_X5_PAD 6 | 52 | #define IAUDIO_X5_PAD 6 |
53 | #define IPOD_4G_PAD 7 | 53 | #define IPOD_4G_PAD 7 |
54 | #define IPOD_NANO_PAD 8 | ||
55 | 54 | ||
56 | /* CONFIG_REMOTE_KEYPAD */ | 55 | /* CONFIG_REMOTE_KEYPAD */ |
57 | #define H100_REMOTE 1 | 56 | #define H100_REMOTE 1 |
diff --git a/uisimulator/x11/screenhack.c b/uisimulator/x11/screenhack.c index 4cd2802aa2..5270990029 100644 --- a/uisimulator/x11/screenhack.c +++ b/uisimulator/x11/screenhack.c | |||
@@ -122,7 +122,7 @@ | |||
122 | "Enter, A OFF\n" \ | 122 | "Enter, A OFF\n" \ |
123 | "., INS MENU\n" | 123 | "., INS MENU\n" |
124 | 124 | ||
125 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | 125 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
126 | #define KEYBOARD_SPECIFIC \ | 126 | #define KEYBOARD_SPECIFIC \ |
127 | "[not written yet]" | 127 | "[not written yet]" |
128 | 128 | ||