diff options
author | Jens Arnold <amiconn@rockbox.org> | 2007-07-27 09:57:27 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2007-07-27 09:57:27 +0000 |
commit | b701322fea42c809092f50e252f45ddfc38293c3 (patch) | |
tree | c988afdc26b6527c9e7a5db3c2c4e2c54bf674c9 | |
parent | 90eacb26164598ae7e13074071836d6100a045a7 (diff) | |
download | rockbox-b701322fea42c809092f50e252f45ddfc38293c3.tar.gz rockbox-b701322fea42c809092f50e252f45ddfc38293c3.zip |
Rockbox compiles and boots now on the 2nd gen, but doesn't work properly yet.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14021 a1c6a512-1295-4272-9138-f99709370657
66 files changed, 193 insertions, 97 deletions
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 9a70fbf6a0..3d8eadb639 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -64,7 +64,8 @@ PLUGIN_HEADER | |||
64 | #define BATTERY_RC_OFF BUTTON_RC_STOP | 64 | #define BATTERY_RC_OFF BUTTON_RC_STOP |
65 | 65 | ||
66 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 66 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
67 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 67 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
68 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
68 | 69 | ||
69 | #define BATTERY_ON BUTTON_PLAY | 70 | #define BATTERY_ON BUTTON_PLAY |
70 | #define BATTERY_OFF BUTTON_MENU | 71 | #define BATTERY_OFF BUTTON_MENU |
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index 1cce364125..f587ecc27a 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -96,8 +96,9 @@ PLUGIN_HEADER | |||
96 | #define BJACK_RIGHT BUTTON_RIGHT | 96 | #define BJACK_RIGHT BUTTON_RIGHT |
97 | #define BJACK_LEFT BUTTON_LEFT | 97 | #define BJACK_LEFT BUTTON_LEFT |
98 | 98 | ||
99 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 99 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
100 | (CONFIG_KEYPAD == IPOD_4G_PAD) | 100 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
101 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
101 | #define BJACK_START BUTTON_SELECT | 102 | #define BJACK_START BUTTON_SELECT |
102 | #define BJACK_QUIT BUTTON_MENU | 103 | #define BJACK_QUIT BUTTON_MENU |
103 | #define BJACK_MAX (BUTTON_SELECT|BUTTON_SCROLL_FWD) | 104 | #define BJACK_MAX (BUTTON_SELECT|BUTTON_SCROLL_FWD) |
@@ -826,7 +827,9 @@ static signed int blackjack_get_amount(char message[20], signed int lower_limit, | |||
826 | rb->lcd_putsxy(LCD_WIDTH/2 - 9*w, LCD_HEIGHT/2 - 4*h - 1, message); | 827 | rb->lcd_putsxy(LCD_WIDTH/2 - 9*w, LCD_HEIGHT/2 - 4*h - 1, message); |
827 | rb->snprintf(str, 9, "$%d", amount); | 828 | rb->snprintf(str, 9, "$%d", amount); |
828 | rb->lcd_putsxy(LCD_WIDTH/2 - 9*w, LCD_HEIGHT/2 - 3*h, str); | 829 | rb->lcd_putsxy(LCD_WIDTH/2 - 9*w, LCD_HEIGHT/2 - 3*h, str); |
829 | #if (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 830 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
831 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | ||
832 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
830 | rb->lcd_putsxy(LCD_WIDTH/2 - 9*w, LCD_HEIGHT/2 - h-2, " >>|: +1"); | 833 | rb->lcd_putsxy(LCD_WIDTH/2 - 9*w, LCD_HEIGHT/2 - h-2, " >>|: +1"); |
831 | rb->lcd_putsxy(LCD_WIDTH/2 - 9*w, LCD_HEIGHT/2 - 1, " |<<: -1"); | 834 | rb->lcd_putsxy(LCD_WIDTH/2 - 9*w, LCD_HEIGHT/2 - 1, " |<<: -1"); |
832 | rb->lcd_putsxy(LCD_WIDTH/2 - 9*w, LCD_HEIGHT/2 + h, "SCROLL+: +10"); | 835 | rb->lcd_putsxy(LCD_WIDTH/2 - 9*w, LCD_HEIGHT/2 + h, "SCROLL+: +10"); |
@@ -1034,7 +1037,9 @@ static unsigned int blackjack_menu(struct game_context* bj) { | |||
1034 | rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); | 1037 | rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); |
1035 | rb->lcd_puts(0, 8, str); | 1038 | rb->lcd_puts(0, 8, str); |
1036 | 1039 | ||
1037 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 1040 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
1041 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | ||
1042 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
1038 | #if LCD_WIDTH >=176 | 1043 | #if LCD_WIDTH >=176 |
1039 | rb->lcd_puts(0, 2, "SELECT to start & to hit"); | 1044 | rb->lcd_puts(0, 2, "SELECT to start & to hit"); |
1040 | rb->lcd_puts(0, 3, "MENU to exit"); | 1045 | rb->lcd_puts(0, 3, "MENU to exit"); |
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index 2b79e36ddd..eac6933815 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c | |||
@@ -57,7 +57,8 @@ PLUGIN_HEADER | |||
57 | #define BOUNCE_RC_QUIT (BUTTON_RC_STOP | BUTTON_REL) | 57 | #define BOUNCE_RC_QUIT (BUTTON_RC_STOP | BUTTON_REL) |
58 | 58 | ||
59 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 59 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
60 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 60 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
61 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
61 | #define BOUNCE_UP BUTTON_SCROLL_BACK | 62 | #define BOUNCE_UP BUTTON_SCROLL_BACK |
62 | #define BOUNCE_DOWN BUTTON_SCROLL_FWD | 63 | #define BOUNCE_DOWN BUTTON_SCROLL_FWD |
63 | #define BOUNCE_QUIT (BUTTON_MENU | BUTTON_REL) | 64 | #define BOUNCE_QUIT (BUTTON_MENU | BUTTON_REL) |
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index 93b759d48c..cc19519151 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c | |||
@@ -77,8 +77,9 @@ PLUGIN_HEADER | |||
77 | #define SCROLL_FWD(x) (0) | 77 | #define SCROLL_FWD(x) (0) |
78 | #define SCROLL_BACK(x) (0) | 78 | #define SCROLL_BACK(x) (0) |
79 | 79 | ||
80 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 80 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
81 | (CONFIG_KEYPAD == IPOD_4G_PAD) | 81 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
82 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
82 | 83 | ||
83 | #define QUIT BUTTON_MENU | 84 | #define QUIT BUTTON_MENU |
84 | #define LEFT BUTTON_LEFT | 85 | #define LEFT BUTTON_LEFT |
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index 689e9de598..dede076b4e 100644 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c | |||
@@ -2457,7 +2457,8 @@ static int bubbles(struct game_context* bb) { | |||
2457 | rb->lcd_puts(0, 6, " and show high scores"); | 2457 | rb->lcd_puts(0, 6, " and show high scores"); |
2458 | rb->lcd_puts(0, 7, "LEFT/RIGHT to aim"); | 2458 | rb->lcd_puts(0, 7, "LEFT/RIGHT to aim"); |
2459 | rb->lcd_puts(0, 8, "UP/DOWN to change level"); | 2459 | rb->lcd_puts(0, 8, "UP/DOWN to change level"); |
2460 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 2460 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
2461 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
2461 | rb->lcd_puts(0, 2, "PLAY to start/pause"); | 2462 | rb->lcd_puts(0, 2, "PLAY to start/pause"); |
2462 | rb->lcd_puts(0, 3, "MENU to save/resume"); | 2463 | rb->lcd_puts(0, 3, "MENU to save/resume"); |
2463 | rb->lcd_puts(0, 4, "MENU+SELECT to exit"); | 2464 | rb->lcd_puts(0, 4, "MENU+SELECT to exit"); |
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 04fd4e00eb..e16f58a412 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -146,7 +146,8 @@ PLUGIN_HEADER | |||
146 | #define CALCULATOR_RC_QUIT BUTTON_RC_STOP | 146 | #define CALCULATOR_RC_QUIT BUTTON_RC_STOP |
147 | 147 | ||
148 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 148 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
149 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 149 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
150 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
150 | 151 | ||
151 | #define CALCULATOR_UP BUTTON_SCROLL_BACK | 152 | #define CALCULATOR_UP BUTTON_SCROLL_BACK |
152 | #define CALCULATOR_DOWN BUTTON_SCROLL_FWD | 153 | #define CALCULATOR_DOWN BUTTON_SCROLL_FWD |
diff --git a/apps/plugins/chessbox/chessbox.c b/apps/plugins/chessbox/chessbox.c index d273888f2b..fce5c72d61 100644 --- a/apps/plugins/chessbox/chessbox.c +++ b/apps/plugins/chessbox/chessbox.c | |||
@@ -41,7 +41,8 @@ extern const fb_data chessbox_pieces[]; | |||
41 | PLUGIN_HEADER | 41 | PLUGIN_HEADER |
42 | 42 | ||
43 | /* button definitions */ | 43 | /* button definitions */ |
44 | #if (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 44 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
45 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
45 | #define CB_SELECT BUTTON_SELECT | 46 | #define CB_SELECT BUTTON_SELECT |
46 | #define CB_UP BUTTON_MENU | 47 | #define CB_UP BUTTON_MENU |
47 | #define CB_DOWN BUTTON_PLAY | 48 | #define CB_DOWN BUTTON_PLAY |
diff --git a/apps/plugins/chessbox/chessbox_pgn.c b/apps/plugins/chessbox/chessbox_pgn.c index 0cdd8d82e5..4fb083e1b0 100644 --- a/apps/plugins/chessbox/chessbox_pgn.c +++ b/apps/plugins/chessbox/chessbox_pgn.c | |||
@@ -21,7 +21,8 @@ | |||
21 | #include "plugin.h" | 21 | #include "plugin.h" |
22 | 22 | ||
23 | /* button definitions */ | 23 | /* button definitions */ |
24 | #if (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 24 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
25 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
25 | #define CB_SELECT BUTTON_SELECT | 26 | #define CB_SELECT BUTTON_SELECT |
26 | #define CB_UP BUTTON_MENU | 27 | #define CB_UP BUTTON_MENU |
27 | #define CB_DOWN BUTTON_PLAY | 28 | #define CB_DOWN BUTTON_PLAY |
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 6efaf44300..73c49767f9 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -78,7 +78,8 @@ PLUGIN_HEADER | |||
78 | #define CHC_SETTINGS_CANCEL2 BUTTON_REC | 78 | #define CHC_SETTINGS_CANCEL2 BUTTON_REC |
79 | 79 | ||
80 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 80 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
81 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 81 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
82 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
82 | #define CHC_QUIT BUTTON_PLAY | 83 | #define CHC_QUIT BUTTON_PLAY |
83 | #define CHC_STARTSTOP BUTTON_SELECT | 84 | #define CHC_STARTSTOP BUTTON_SELECT |
84 | #define CHC_RESET BUTTON_LEFT | 85 | #define CHC_RESET BUTTON_LEFT |
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index f76379e5f4..0b06ace784 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c | |||
@@ -991,7 +991,8 @@ STATIC void chip8 (void) | |||
991 | #define CHIP8_RC_OFF BUTTON_RC_STOP | 991 | #define CHIP8_RC_OFF BUTTON_RC_STOP |
992 | 992 | ||
993 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 993 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
994 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 994 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
995 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
995 | #define CHIP8_OFF BUTTON_MENU | 996 | #define CHIP8_OFF BUTTON_MENU |
996 | #define CHIP8_KEY2 BUTTON_SCROLL_BACK | 997 | #define CHIP8_KEY2 BUTTON_SCROLL_BACK |
997 | #define CHIP8_KEY4 BUTTON_LEFT | 998 | #define CHIP8_KEY4 BUTTON_LEFT |
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index 1473192c48..51bd7a894f 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c | |||
@@ -39,8 +39,9 @@ PLUGIN_HEADER | |||
39 | #define ACTION2 BUTTON_SELECT | 39 | #define ACTION2 BUTTON_SELECT |
40 | #define ACTIONTEXT "SELECT" | 40 | #define ACTIONTEXT "SELECT" |
41 | 41 | ||
42 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 42 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
43 | (CONFIG_KEYPAD == IPOD_4G_PAD) | 43 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
44 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
44 | 45 | ||
45 | #define QUIT BUTTON_MENU | 46 | #define QUIT BUTTON_MENU |
46 | #define ACTION BUTTON_SELECT | 47 | #define ACTION BUTTON_SELECT |
diff --git a/apps/plugins/credits.c b/apps/plugins/credits.c index 0bd2a511cd..fc0082bf41 100644 --- a/apps/plugins/credits.c +++ b/apps/plugins/credits.c | |||
@@ -128,7 +128,8 @@ void roll_credits(void) | |||
128 | #if (CONFIG_KEYPAD == RECORDER_PAD) | 128 | #if (CONFIG_KEYPAD == RECORDER_PAD) |
129 | #define PAUSE_TIME 1.2 | 129 | #define PAUSE_TIME 1.2 |
130 | #define ANIM_SPEED 35 | 130 | #define ANIM_SPEED 35 |
131 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) | 131 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
132 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
132 | #define PAUSE_TIME 0 | 133 | #define PAUSE_TIME 0 |
133 | #define ANIM_SPEED 100 | 134 | #define ANIM_SPEED 100 |
134 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) | 135 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) |
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 4088d4e94f..31e1613479 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -95,8 +95,10 @@ PLUGIN_HEADER | |||
95 | #define CUBE_HIGHSPEED BUTTON_SELECT | 95 | #define CUBE_HIGHSPEED BUTTON_SELECT |
96 | 96 | ||
97 | #define CUBE_RC_QUIT BUTTON_RC_STOP | 97 | #define CUBE_RC_QUIT BUTTON_RC_STOP |
98 | |||
98 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 99 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
99 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 100 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
101 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
100 | #define CUBE_QUIT BUTTON_MENU | 102 | #define CUBE_QUIT BUTTON_MENU |
101 | #define CUBE_X_INC BUTTON_RIGHT | 103 | #define CUBE_X_INC BUTTON_RIGHT |
102 | #define CUBE_X_DEC BUTTON_LEFT | 104 | #define CUBE_X_DEC BUTTON_LEFT |
diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c index 76b265eca2..3b0e2f21e1 100644 --- a/apps/plugins/dict.c +++ b/apps/plugins/dict.c | |||
@@ -105,7 +105,8 @@ long reverse (long N) { | |||
105 | #if CONFIG_KEYPAD == PLAYER_PAD | 105 | #if CONFIG_KEYPAD == PLAYER_PAD |
106 | #define LP_QUIT BUTTON_STOP | 106 | #define LP_QUIT BUTTON_STOP |
107 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 107 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
108 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 108 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
109 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
109 | #define LP_QUIT BUTTON_MENU | 110 | #define LP_QUIT BUTTON_MENU |
110 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | 111 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD |
111 | #define LP_QUIT BUTTON_PLAY | 112 | #define LP_QUIT BUTTON_PLAY |
diff --git a/apps/plugins/disktidy.c b/apps/plugins/disktidy.c index 4340770e09..aba78afb3e 100644 --- a/apps/plugins/disktidy.c +++ b/apps/plugins/disktidy.c | |||
@@ -55,8 +55,9 @@ enum tidy_system | |||
55 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | 55 | (CONFIG_KEYPAD == IRIVER_H300_PAD) |
56 | #define TIDY_STOP BUTTON_OFF | 56 | #define TIDY_STOP BUTTON_OFF |
57 | 57 | ||
58 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 58 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
59 | (CONFIG_KEYPAD == IPOD_4G_PAD) | 59 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
60 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
60 | #define TIDY_STOP BUTTON_MENU | 61 | #define TIDY_STOP BUTTON_MENU |
61 | 62 | ||
62 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD | 63 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
diff --git a/apps/plugins/doom/Makefile b/apps/plugins/doom/Makefile index 46bd728ecb..2fe208897b 100644 --- a/apps/plugins/doom/Makefile +++ b/apps/plugins/doom/Makefile | |||
@@ -56,7 +56,7 @@ endif | |||
56 | 56 | ||
57 | # The arm code compiles too large for the plugin buffer when set to optimize for speed | 57 | # The arm code compiles too large for the plugin buffer when set to optimize for speed |
58 | #ifeq ($(CC), arm-elf-gcc) | 58 | #ifeq ($(CC), arm-elf-gcc) |
59 | ifneq (,$(strip $(foreach tgt,SANSA_E200 IPOD_NANO IPOD_COLOR IPOD_VIDEO IPOD_MINI IPOD_3G IPOD_4G IRIVER_H10_5GB IRIVER_H10 GIGABEAT_F,$(findstring $(tgt),$(TARGET))))) | 59 | ifneq (,$(strip $(foreach tgt,SANSA_E200 IPOD_NANO IPOD_COLOR IPOD_VIDEO IPOD_MINI IPOD_1G2G IPOD_3G IPOD_4G IRIVER_H10_5GB IRIVER_H10 GIGABEAT_F,$(findstring $(tgt),$(TARGET))))) |
60 | CFLAGS += -Os | 60 | CFLAGS += -Os |
61 | ifndef SIMVER | 61 | ifndef SIMVER |
62 | ifeq ($(TARGET), IRIVER_H100) | 62 | ifeq ($(TARGET), IRIVER_H100) |
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 6bac32b8ea..24079a0f71 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -149,7 +149,8 @@ void I_ShutdownGraphics(void) | |||
149 | // I_StartTic | 149 | // I_StartTic |
150 | // | 150 | // |
151 | 151 | ||
152 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) | 152 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
153 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
153 | //#define DOOMBUTTON_SCROLLWHEEL | 154 | //#define DOOMBUTTON_SCROLLWHEEL |
154 | #define DOOMBUTTON_UP BUTTON_MENU | 155 | #define DOOMBUTTON_UP BUTTON_MENU |
155 | #define DOOMBUTTON_WEAPON BUTTON_SELECT | 156 | #define DOOMBUTTON_WEAPON BUTTON_SELECT |
@@ -258,7 +259,8 @@ inline void getkey() | |||
258 | event.type = ev_keyup; | 259 | event.type = ev_keyup; |
259 | hswitch=0; | 260 | hswitch=0; |
260 | } | 261 | } |
261 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) | 262 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
263 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
262 | /* Bring up the menu */ | 264 | /* Bring up the menu */ |
263 | event.data1=KEY_ESCAPE; | 265 | event.data1=KEY_ESCAPE; |
264 | #else | 266 | #else |
diff --git a/apps/plugins/fire.c b/apps/plugins/fire.c index bb921ab91f..59e8396f88 100644 --- a/apps/plugins/fire.c +++ b/apps/plugins/fire.c | |||
@@ -73,7 +73,8 @@ static unsigned char draw_buffer[8*LCD_WIDTH]; | |||
73 | #define FIRE_INCREASE_MULT BUTTON_UP | 73 | #define FIRE_INCREASE_MULT BUTTON_UP |
74 | #define FIRE_DECREASE_MULT BUTTON_DOWN | 74 | #define FIRE_DECREASE_MULT BUTTON_DOWN |
75 | 75 | ||
76 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 76 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
77 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
77 | #define FIRE_QUIT BUTTON_MENU | 78 | #define FIRE_QUIT BUTTON_MENU |
78 | #define FIRE_SWITCH_FLAMES_TYPE BUTTON_SELECT | 79 | #define FIRE_SWITCH_FLAMES_TYPE BUTTON_SELECT |
79 | #define FIRE_SWITCH_FLAMES_MOVING BUTTON_RIGHT | 80 | #define FIRE_SWITCH_FLAMES_MOVING BUTTON_RIGHT |
diff --git a/apps/plugins/fireworks.c b/apps/plugins/fireworks.c index 08d4e00d68..dbfe290ac8 100644 --- a/apps/plugins/fireworks.c +++ b/apps/plugins/fireworks.c | |||
@@ -34,7 +34,8 @@ static struct plugin_api* rb; | |||
34 | #if (CONFIG_KEYPAD == IRIVER_H300_PAD) || (CONFIG_KEYPAD == IRIVER_H100_PAD) | 34 | #if (CONFIG_KEYPAD == IRIVER_H300_PAD) || (CONFIG_KEYPAD == IRIVER_H100_PAD) |
35 | #define BTN_MENU BUTTON_OFF | 35 | #define BTN_MENU BUTTON_OFF |
36 | #define BTN_FIRE BUTTON_SELECT | 36 | #define BTN_FIRE BUTTON_SELECT |
37 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) | 37 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
38 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
38 | #define BTN_MENU BUTTON_MENU | 39 | #define BTN_MENU BUTTON_MENU |
39 | #define BTN_FIRE BUTTON_SELECT | 40 | #define BTN_FIRE BUTTON_SELECT |
40 | #elif (CONFIG_KEYPAD == RECORDER_PAD) | 41 | #elif (CONFIG_KEYPAD == RECORDER_PAD) |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index 3d28e0d000..96d6ea1a9b 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -73,7 +73,8 @@ PLUGIN_HEADER | |||
73 | #define FLIPIT_RC_QUIT BUTTON_RC_STOP | 73 | #define FLIPIT_RC_QUIT BUTTON_RC_STOP |
74 | 74 | ||
75 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 75 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
76 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 76 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
77 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
77 | 78 | ||
78 | #define FLIPIT_UP BUTTON_MENU | 79 | #define FLIPIT_UP BUTTON_MENU |
79 | #define FLIPIT_DOWN BUTTON_PLAY | 80 | #define FLIPIT_DOWN BUTTON_PLAY |
@@ -496,8 +497,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
496 | rb->lcd_putsxy(2, 28, "[MODE] shuffle"); | 497 | rb->lcd_putsxy(2, 28, "[MODE] shuffle"); |
497 | rb->lcd_putsxy(2, 38, "[PLAY] solution"); | 498 | rb->lcd_putsxy(2, 38, "[PLAY] solution"); |
498 | rb->lcd_putsxy(2, 48, "[REC] step by step"); | 499 | rb->lcd_putsxy(2, 48, "[REC] step by step"); |
499 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 500 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
500 | (CONFIG_KEYPAD == IPOD_4G_PAD) | 501 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
502 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
501 | rb->lcd_putsxy(2, 8, "[S-MENU] to stop"); | 503 | rb->lcd_putsxy(2, 8, "[S-MENU] to stop"); |
502 | rb->lcd_putsxy(2, 18, "[SELECT] toggle"); | 504 | rb->lcd_putsxy(2, 18, "[SELECT] toggle"); |
503 | rb->lcd_putsxy(2, 28, "[S-LEFT] shuffle"); | 505 | rb->lcd_putsxy(2, 28, "[S-LEFT] shuffle"); |
diff --git a/apps/plugins/grayscale.c b/apps/plugins/grayscale.c index 6d3a83e1e9..5e5002067f 100644 --- a/apps/plugins/grayscale.c +++ b/apps/plugins/grayscale.c | |||
@@ -53,7 +53,8 @@ PLUGIN_HEADER | |||
53 | 53 | ||
54 | #define GRAYSCALE_RC_OFF BUTTON_RC_STOP | 54 | #define GRAYSCALE_RC_OFF BUTTON_RC_STOP |
55 | 55 | ||
56 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 56 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
57 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
57 | #define GRAYSCALE_SHIFT BUTTON_SELECT | 58 | #define GRAYSCALE_SHIFT BUTTON_SELECT |
58 | #define GRAYSCALE_UP BUTTON_SCROLL_BACK | 59 | #define GRAYSCALE_UP BUTTON_SCROLL_BACK |
59 | #define GRAYSCALE_DOWN BUTTON_SCROLL_FWD | 60 | #define GRAYSCALE_DOWN BUTTON_SCROLL_FWD |
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index a99543c069..62a1c3e805 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c | |||
@@ -68,8 +68,9 @@ PLUGIN_HEADER | |||
68 | #define RIGHT BUTTON_RIGHT | 68 | #define RIGHT BUTTON_RIGHT |
69 | #define FIRE BUTTON_PLAY | 69 | #define FIRE BUTTON_PLAY |
70 | 70 | ||
71 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 71 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
72 | (CONFIG_KEYPAD == IPOD_4G_PAD) | 72 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
73 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
73 | 74 | ||
74 | #define QUIT BUTTON_MENU | 75 | #define QUIT BUTTON_MENU |
75 | #define LEFT BUTTON_LEFT | 76 | #define LEFT BUTTON_LEFT |
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index bd0803a8be..b74bf24c60 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -60,7 +60,8 @@ PLUGIN_HEADER | |||
60 | #define JEWELS_CANCEL BUTTON_OFF | 60 | #define JEWELS_CANCEL BUTTON_OFF |
61 | #define JEWELS_RC_CANCEL BUTTON_RC_STOP | 61 | #define JEWELS_RC_CANCEL BUTTON_RC_STOP |
62 | 62 | ||
63 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 63 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
64 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
64 | #define JEWELS_SCROLLWHEEL | 65 | #define JEWELS_SCROLLWHEEL |
65 | #define JEWELS_UP BUTTON_MENU | 66 | #define JEWELS_UP BUTTON_MENU |
66 | #define JEWELS_DOWN BUTTON_PLAY | 67 | #define JEWELS_DOWN BUTTON_PLAY |
@@ -1449,7 +1450,8 @@ static int jewels_main(struct game_context* bj) { | |||
1449 | rb->lcd_puts(0, 9, "SELECT to select"); | 1450 | rb->lcd_puts(0, 9, "SELECT to select"); |
1450 | rb->lcd_puts(0, 10, "Long SELECT to show menu"); | 1451 | rb->lcd_puts(0, 10, "Long SELECT to show menu"); |
1451 | rb->lcd_puts(0, 11, "OFF to cancel"); | 1452 | rb->lcd_puts(0, 11, "OFF to cancel"); |
1452 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 1453 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
1454 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
1453 | rb->lcd_puts(0, 2, "Swap pairs of jewels to"); | 1455 | rb->lcd_puts(0, 2, "Swap pairs of jewels to"); |
1454 | rb->lcd_puts(0, 3, "form connected segments"); | 1456 | rb->lcd_puts(0, 3, "form connected segments"); |
1455 | rb->lcd_puts(0, 4, "of three or more of the"); | 1457 | rb->lcd_puts(0, 4, "of three or more of the"); |
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index f9275fb802..54c8c6cb63 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c | |||
@@ -91,7 +91,8 @@ PLUGIN_HEADER | |||
91 | #define JPEG_MENU BUTTON_OFF | 91 | #define JPEG_MENU BUTTON_OFF |
92 | #define JPEG_RC_MENU BUTTON_RC_STOP | 92 | #define JPEG_RC_MENU BUTTON_RC_STOP |
93 | 93 | ||
94 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 94 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
95 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
95 | #define JPEG_ZOOM_IN BUTTON_SCROLL_FWD | 96 | #define JPEG_ZOOM_IN BUTTON_SCROLL_FWD |
96 | #define JPEG_ZOOM_OUT BUTTON_SCROLL_BACK | 97 | #define JPEG_ZOOM_OUT BUTTON_SCROLL_BACK |
97 | #define JPEG_UP BUTTON_MENU | 98 | #define JPEG_UP BUTTON_MENU |
diff --git a/apps/plugins/lib/pluginlib_actions.h b/apps/plugins/lib/pluginlib_actions.h index 26370d2b99..e350d31aae 100644 --- a/apps/plugins/lib/pluginlib_actions.h +++ b/apps/plugins/lib/pluginlib_actions.h | |||
@@ -103,7 +103,9 @@ static const struct button_mapping generic_directions[] = | |||
103 | { PLA_DOWN_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE}, | 103 | { PLA_DOWN_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE}, |
104 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, | 104 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, |
105 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 105 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
106 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 106 | #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ |
107 | || (CONFIG_KEYPAD == IPOD_3G_PAD) \ | ||
108 | || (CONFIG_KEYPAD == IPOD_4G_PAD) | ||
107 | { PLA_UP, BUTTON_SCROLL_FWD, BUTTON_NONE}, | 109 | { PLA_UP, BUTTON_SCROLL_FWD, BUTTON_NONE}, |
108 | { PLA_DOWN, BUTTON_SCROLL_BACK, BUTTON_NONE}, | 110 | { PLA_DOWN, BUTTON_SCROLL_BACK, BUTTON_NONE}, |
109 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, | 111 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, |
@@ -159,7 +161,9 @@ static const struct button_mapping generic_left_right_fire[] = | |||
159 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 161 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
160 | { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, | 162 | { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, |
161 | { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_NONE}, | 163 | { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_NONE}, |
162 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 164 | #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ |
165 | || (CONFIG_KEYPAD == IPOD_3G_PAD) \ | ||
166 | || (CONFIG_KEYPAD == IPOD_4G_PAD) | ||
163 | { PLA_LEFT, BUTTON_SCROLL_BACK, BUTTON_NONE}, | 167 | { PLA_LEFT, BUTTON_SCROLL_BACK, BUTTON_NONE}, |
164 | { PLA_RIGHT, BUTTON_SCROLL_FWD, BUTTON_NONE}, | 168 | { PLA_RIGHT, BUTTON_SCROLL_FWD, BUTTON_NONE}, |
165 | { PLA_LEFT_REPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE}, | 169 | { PLA_LEFT_REPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE}, |
@@ -225,7 +229,9 @@ static const struct button_mapping generic_actions[] = | |||
225 | {PLA_MENU, BUTTON_MODE, BUTTON_NONE}, | 229 | {PLA_MENU, BUTTON_MODE, BUTTON_NONE}, |
226 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, | 230 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, |
227 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | 231 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, |
228 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 232 | #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ |
233 | || (CONFIG_KEYPAD == IPOD_3G_PAD) \ | ||
234 | || (CONFIG_KEYPAD == IPOD_4G_PAD) | ||
229 | {PLA_QUIT, BUTTON_MENU|BUTTON_SELECT, BUTTON_NONE}, | 235 | {PLA_QUIT, BUTTON_MENU|BUTTON_SELECT, BUTTON_NONE}, |
230 | {PLA_START, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, | 236 | {PLA_START, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, |
231 | {PLA_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_NONE}, | 237 | {PLA_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_NONE}, |
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index f030e13a51..6a37e3602d 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c | |||
@@ -184,7 +184,8 @@ const unsigned char rockbox16x7[] = { | |||
184 | #define LP_DEC_Y (BUTTON_ON | BUTTON_LEFT) | 184 | #define LP_DEC_Y (BUTTON_ON | BUTTON_LEFT) |
185 | #define LP_INC_Y (BUTTON_ON | BUTTON_RIGHT) | 185 | #define LP_INC_Y (BUTTON_ON | BUTTON_RIGHT) |
186 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 186 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
187 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 187 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
188 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
188 | #define LP_QUIT BUTTON_MENU | 189 | #define LP_QUIT BUTTON_MENU |
189 | #define LP_DEC_X BUTTON_LEFT | 190 | #define LP_DEC_X BUTTON_LEFT |
190 | #define LP_INC_X BUTTON_RIGHT | 191 | #define LP_INC_X BUTTON_RIGHT |
diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c index b1e8587764..48450ae455 100644 --- a/apps/plugins/mandelbrot.c +++ b/apps/plugins/mandelbrot.c | |||
@@ -81,7 +81,8 @@ PLUGIN_HEADER | |||
81 | #define MANDELBROT_RC_QUIT BUTTON_RC_STOP | 81 | #define MANDELBROT_RC_QUIT BUTTON_RC_STOP |
82 | 82 | ||
83 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 83 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
84 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 84 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
85 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
85 | #define MANDELBROT_QUIT (BUTTON_SELECT | BUTTON_MENU) | 86 | #define MANDELBROT_QUIT (BUTTON_SELECT | BUTTON_MENU) |
86 | #define MANDELBROT_UP BUTTON_MENU | 87 | #define MANDELBROT_UP BUTTON_MENU |
87 | #define MANDELBROT_DOWN BUTTON_PLAY | 88 | #define MANDELBROT_DOWN BUTTON_PLAY |
diff --git a/apps/plugins/maze.c b/apps/plugins/maze.c index e0f9e0134c..952edff9c7 100644 --- a/apps/plugins/maze.c +++ b/apps/plugins/maze.c | |||
@@ -34,7 +34,8 @@ | |||
34 | PLUGIN_HEADER | 34 | PLUGIN_HEADER |
35 | 35 | ||
36 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 36 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
37 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 37 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
38 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
38 | # undef __PLUGINLIB_ACTIONS_H__ | 39 | # undef __PLUGINLIB_ACTIONS_H__ |
39 | # define MAZE_NEW (BUTTON_SELECT | BUTTON_REPEAT) | 40 | # define MAZE_NEW (BUTTON_SELECT | BUTTON_REPEAT) |
40 | # define MAZE_NEW_PRE BUTTON_SELECT | 41 | # define MAZE_NEW_PRE BUTTON_SELECT |
diff --git a/apps/plugins/mazezam.c b/apps/plugins/mazezam.c index 6f68f98e36..e00049e3b9 100644 --- a/apps/plugins/mazezam.c +++ b/apps/plugins/mazezam.c | |||
@@ -77,7 +77,8 @@ MEM_FUNCTION_WRAPPERS(rb); | |||
77 | #define MAZEZAM_QUIT_KEYNAME "[POWER]" | 77 | #define MAZEZAM_QUIT_KEYNAME "[POWER]" |
78 | 78 | ||
79 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 79 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
80 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 80 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
81 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
81 | #define MAZEZAM_UP BUTTON_MENU | 82 | #define MAZEZAM_UP BUTTON_MENU |
82 | #define MAZEZAM_DOWN BUTTON_PLAY | 83 | #define MAZEZAM_DOWN BUTTON_PLAY |
83 | #define MAZEZAM_LEFT BUTTON_LEFT | 84 | #define MAZEZAM_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/midiplay.c b/apps/plugins/midiplay.c index 6dc11888d4..c19ca04806 100644 --- a/apps/plugins/midiplay.c +++ b/apps/plugins/midiplay.c | |||
@@ -42,7 +42,8 @@ PLUGIN_IRAM_DECLARE | |||
42 | 42 | ||
43 | #define BTN_RC_QUIT BUTTON_RC_STOP | 43 | #define BTN_RC_QUIT BUTTON_RC_STOP |
44 | 44 | ||
45 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 45 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
46 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
46 | #define BTN_QUIT (BUTTON_SELECT | BUTTON_MENU) | 47 | #define BTN_QUIT (BUTTON_SELECT | BUTTON_MENU) |
47 | #define BTN_RIGHT BUTTON_RIGHT | 48 | #define BTN_RIGHT BUTTON_RIGHT |
48 | #define BTN_UP BUTTON_SCROLL_FWD | 49 | #define BTN_UP BUTTON_SCROLL_FWD |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 41d0a1ef31..4ea9aa1522 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -74,7 +74,8 @@ enum minesweeper_status { | |||
74 | # define MINESWP_RC_QUIT BUTTON_RC_STOP | 74 | # define MINESWP_RC_QUIT BUTTON_RC_STOP |
75 | 75 | ||
76 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 76 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
77 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 77 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
78 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
78 | # define MINESWP_SCROLLWHEEL | 79 | # define MINESWP_SCROLLWHEEL |
79 | # define MINESWP_UP BUTTON_MENU | 80 | # define MINESWP_UP BUTTON_MENU |
80 | # define MINESWP_DOWN BUTTON_PLAY | 81 | # define MINESWP_DOWN BUTTON_PLAY |
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c index 0ccda0eaab..bfcd53af66 100644 --- a/apps/plugins/mosaique.c +++ b/apps/plugins/mosaique.c | |||
@@ -70,7 +70,8 @@ PLUGIN_HEADER | |||
70 | #define MOSAIQUE_RC_QUIT BUTTON_RC_STOP | 70 | #define MOSAIQUE_RC_QUIT BUTTON_RC_STOP |
71 | 71 | ||
72 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 72 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
73 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 73 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
74 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
74 | #define MOSAIQUE_QUIT BUTTON_MENU | 75 | #define MOSAIQUE_QUIT BUTTON_MENU |
75 | #define MOSAIQUE_SPEED BUTTON_SELECT | 76 | #define MOSAIQUE_SPEED BUTTON_SELECT |
76 | #define MOSAIQUE_RESTART BUTTON_PLAY | 77 | #define MOSAIQUE_RESTART BUTTON_PLAY |
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index 8a4560a935..55cfac3899 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c | |||
@@ -2327,8 +2327,8 @@ void get_mp3_filename(char *wav_name) | |||
2327 | #define MP3ENC_NEXT BUTTON_DOWN | 2327 | #define MP3ENC_NEXT BUTTON_DOWN |
2328 | #define MP3ENC_DONE BUTTON_OFF | 2328 | #define MP3ENC_DONE BUTTON_OFF |
2329 | #define MP3ENC_SELECT BUTTON_SELECT | 2329 | #define MP3ENC_SELECT BUTTON_SELECT |
2330 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 2330 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
2331 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 2331 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) |
2332 | #define MP3ENC_PREV BUTTON_SCROLL_BACK | 2332 | #define MP3ENC_PREV BUTTON_SCROLL_BACK |
2333 | #define MP3ENC_NEXT BUTTON_SCROLL_FWD | 2333 | #define MP3ENC_NEXT BUTTON_SCROLL_FWD |
2334 | #define MP3ENC_DONE BUTTON_MENU | 2334 | #define MP3ENC_DONE BUTTON_MENU |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index c28aca018a..a0659a9f0d 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -121,7 +121,8 @@ PLUGIN_IRAM_DECLARE | |||
121 | #define MPEG_VOLDOWN BUTTON_DOWN | 121 | #define MPEG_VOLDOWN BUTTON_DOWN |
122 | #define MPEG_VOLUP BUTTON_UP | 122 | #define MPEG_VOLUP BUTTON_UP |
123 | 123 | ||
124 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 124 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
125 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
125 | #define MPEG_MENU BUTTON_MENU | 126 | #define MPEG_MENU BUTTON_MENU |
126 | #define MPEG_PAUSE (BUTTON_PLAY | BUTTON_REL) | 127 | #define MPEG_PAUSE (BUTTON_PLAY | BUTTON_REL) |
127 | #define MPEG_STOP (BUTTON_PLAY | BUTTON_REPEAT) | 128 | #define MPEG_STOP (BUTTON_PLAY | BUTTON_REPEAT) |
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index 67d258d7e6..3291580df6 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c | |||
@@ -74,7 +74,8 @@ PLUGIN_HEADER | |||
74 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN | 74 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN |
75 | #define OSCILLOSCOPE_RC_QUIT BUTTON_RC_STOP | 75 | #define OSCILLOSCOPE_RC_QUIT BUTTON_RC_STOP |
76 | 76 | ||
77 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 77 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
78 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
78 | #define OSCILLOSCOPE_QUIT (BUTTON_SELECT | BUTTON_MENU) | 79 | #define OSCILLOSCOPE_QUIT (BUTTON_SELECT | BUTTON_MENU) |
79 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_SELECT | BUTTON_PLAY) | 80 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_SELECT | BUTTON_PLAY) |
80 | #define OSCILLOSCOPE_ADVMODE (BUTTON_SELECT | BUTTON_RIGHT) | 81 | #define OSCILLOSCOPE_ADVMODE (BUTTON_SELECT | BUTTON_RIGHT) |
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index 09249d996a..df22444b81 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c | |||
@@ -51,7 +51,8 @@ static unsigned char sp1, sp2, sp3, sp4; /* Speed of plasma */ | |||
51 | static int plasma_frequency; | 51 | static int plasma_frequency; |
52 | 52 | ||
53 | /* Key assignement, all bitmapped models */ | 53 | /* Key assignement, all bitmapped models */ |
54 | #if (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 54 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
55 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
55 | #define PLASMA_QUIT BUTTON_MENU | 56 | #define PLASMA_QUIT BUTTON_MENU |
56 | #define PLASMA_INCREASE_FREQUENCY BUTTON_SCROLL_FWD | 57 | #define PLASMA_INCREASE_FREQUENCY BUTTON_SCROLL_FWD |
57 | #define PLASMA_DECREASE_FREQUENCY BUTTON_SCROLL_BACK | 58 | #define PLASMA_DECREASE_FREQUENCY BUTTON_SCROLL_BACK |
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index 1ffe8b770c..a1a1d58593 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -77,7 +77,8 @@ PLUGIN_HEADER | |||
77 | #define PONG_RC_QUIT BUTTON_RC_STOP | 77 | #define PONG_RC_QUIT BUTTON_RC_STOP |
78 | 78 | ||
79 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 79 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
80 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 80 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
81 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
81 | #define PONG_QUIT BUTTON_SELECT | 82 | #define PONG_QUIT BUTTON_SELECT |
82 | #define PONG_LEFT_UP BUTTON_MENU | 83 | #define PONG_LEFT_UP BUTTON_MENU |
83 | #define PONG_LEFT_DOWN BUTTON_LEFT | 84 | #define PONG_LEFT_DOWN BUTTON_LEFT |
diff --git a/apps/plugins/random_folder_advance_config.c b/apps/plugins/random_folder_advance_config.c index abe7bfdfbf..27e8c0b294 100644 --- a/apps/plugins/random_folder_advance_config.c +++ b/apps/plugins/random_folder_advance_config.c | |||
@@ -42,8 +42,9 @@ struct file_format *list = NULL; | |||
42 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) \ | 42 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) \ |
43 | || (CONFIG_KEYPAD == IRIVER_H300_PAD) | 43 | || (CONFIG_KEYPAD == IRIVER_H300_PAD) |
44 | 44 | ||
45 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) \ | 45 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
46 | || (CONFIG_KEYPAD == IPOD_3G_PAD) | 46 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
47 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
47 | 48 | ||
48 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | 49 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD |
49 | 50 | ||
diff --git a/apps/plugins/reversi/reversi-gui.c b/apps/plugins/reversi/reversi-gui.c index 23ed5d798d..374cc0f151 100644 --- a/apps/plugins/reversi/reversi-gui.c +++ b/apps/plugins/reversi/reversi-gui.c | |||
@@ -566,7 +566,8 @@ enum plugin_status plugin_start(struct plugin_api *api, void *parameter) { | |||
566 | 566 | ||
567 | reversi_gui_init(); | 567 | reversi_gui_init(); |
568 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 568 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
569 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 569 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
570 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
570 | cursor_wrap_mode = WRAP_TORUS; | 571 | cursor_wrap_mode = WRAP_TORUS; |
571 | #else | 572 | #else |
572 | cursor_wrap_mode = WRAP_FLAT; | 573 | cursor_wrap_mode = WRAP_FLAT; |
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h index 293be2492f..43dab46ae9 100644 --- a/apps/plugins/reversi/reversi-gui.h +++ b/apps/plugins/reversi/reversi-gui.h | |||
@@ -57,7 +57,8 @@ | |||
57 | #define REVERSI_BUTTON_MENU BUTTON_MODE | 57 | #define REVERSI_BUTTON_MENU BUTTON_MODE |
58 | 58 | ||
59 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 59 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
60 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 60 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
61 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
61 | #define REVERSI_BUTTON_UP BUTTON_MENU | 62 | #define REVERSI_BUTTON_UP BUTTON_MENU |
62 | #define REVERSI_BUTTON_DOWN BUTTON_PLAY | 63 | #define REVERSI_BUTTON_DOWN BUTTON_PLAY |
63 | #define REVERSI_BUTTON_LEFT BUTTON_LEFT | 64 | #define REVERSI_BUTTON_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index 2484d6eaaa..e66d24256b 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -24,8 +24,9 @@ | |||
24 | 24 | ||
25 | PLUGIN_HEADER | 25 | PLUGIN_HEADER |
26 | 26 | ||
27 | #if (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 27 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
28 | (CONFIG_KEYPAD == IPOD_4G_PAD) | 28 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
29 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
29 | 30 | ||
30 | #define ROCKBLOX_OFF (BUTTON_MENU | BUTTON_SELECT) | 31 | #define ROCKBLOX_OFF (BUTTON_MENU | BUTTON_SELECT) |
31 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK | 32 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK |
@@ -52,6 +53,7 @@ PLUGIN_HEADER | |||
52 | #define ROCKBLOX_RESTART BUTTON_ON | 53 | #define ROCKBLOX_RESTART BUTTON_ON |
53 | 54 | ||
54 | #define ROCKBLOX_RC_OFF BUTTON_RC_STOP | 55 | #define ROCKBLOX_RC_OFF BUTTON_RC_STOP |
56 | |||
55 | #elif CONFIG_KEYPAD == RECORDER_PAD | 57 | #elif CONFIG_KEYPAD == RECORDER_PAD |
56 | 58 | ||
57 | #define ROCKBLOX_OFF BUTTON_OFF | 59 | #define ROCKBLOX_OFF BUTTON_OFF |
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index 184add1bf5..ae4517dfc6 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c | |||
@@ -48,7 +48,8 @@ PLUGIN_HEADER | |||
48 | #define ROCKPAINT_LEFT BUTTON_LEFT | 48 | #define ROCKPAINT_LEFT BUTTON_LEFT |
49 | #define ROCKPAINT_RIGHT BUTTON_RIGHT | 49 | #define ROCKPAINT_RIGHT BUTTON_RIGHT |
50 | 50 | ||
51 | #elif ( CONFIG_KEYPAD == IPOD_4G_PAD ) || ( CONFIG_KEYPAD == IPOD_3G_PAD ) | 51 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
52 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
52 | #define ROCKPAINT_QUIT ( ~BUTTON_MAIN ) | 53 | #define ROCKPAINT_QUIT ( ~BUTTON_MAIN ) |
53 | #define ROCKPAINT_DRAW BUTTON_SELECT | 54 | #define ROCKPAINT_DRAW BUTTON_SELECT |
54 | #define ROCKPAINT_MENU ( BUTTON_SELECT | BUTTON_MENU ) | 55 | #define ROCKPAINT_MENU ( BUTTON_SELECT | BUTTON_MENU ) |
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index fa1ee0e443..b819f354cc 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -55,7 +55,8 @@ PLUGIN_HEADER | |||
55 | #define PUZZLE_RC_QUIT BUTTON_RC_STOP | 55 | #define PUZZLE_RC_QUIT BUTTON_RC_STOP |
56 | 56 | ||
57 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 57 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
58 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 58 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
59 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
59 | #define PUZZLE_QUIT (BUTTON_SELECT | BUTTON_MENU) | 60 | #define PUZZLE_QUIT (BUTTON_SELECT | BUTTON_MENU) |
60 | #define PUZZLE_UP BUTTON_MENU | 61 | #define PUZZLE_UP BUTTON_MENU |
61 | #define PUZZLE_DOWN BUTTON_PLAY | 62 | #define PUZZLE_DOWN BUTTON_PLAY |
@@ -400,7 +401,8 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
400 | rb->lcd_putsxy(0, 28, "[MODE..] shuffle"); | 401 | rb->lcd_putsxy(0, 28, "[MODE..] shuffle"); |
401 | rb->lcd_putsxy(0, 38, "[MODE] change pic"); | 402 | rb->lcd_putsxy(0, 38, "[MODE] change pic"); |
402 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 403 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
403 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 404 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
405 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
404 | rb->lcd_putsxy(0, 18, "[S-MENU] to stop"); | 406 | rb->lcd_putsxy(0, 18, "[S-MENU] to stop"); |
405 | rb->lcd_putsxy(0, 28, "[S-LEFT] shuffle"); | 407 | rb->lcd_putsxy(0, 28, "[S-LEFT] shuffle"); |
406 | rb->lcd_putsxy(0, 38, "[S-RIGHT] change pic"); | 408 | rb->lcd_putsxy(0, 38, "[S-RIGHT] change pic"); |
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index 6acbb808aa..eeca6bd547 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c | |||
@@ -64,7 +64,8 @@ PLUGIN_HEADER | |||
64 | #define SNAKE_RC_QUIT BUTTON_RC_STOP | 64 | #define SNAKE_RC_QUIT BUTTON_RC_STOP |
65 | 65 | ||
66 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 66 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
67 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 67 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
68 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
68 | #define SNAKE_QUIT (BUTTON_SELECT|BUTTON_MENU) | 69 | #define SNAKE_QUIT (BUTTON_SELECT|BUTTON_MENU) |
69 | #define SNAKE_UP BUTTON_MENU | 70 | #define SNAKE_UP BUTTON_MENU |
70 | #define SNAKE_DOWN BUTTON_PLAY | 71 | #define SNAKE_DOWN BUTTON_PLAY |
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index 2a2665cab3..8b49a7cd55 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -195,7 +195,8 @@ PLUGIN_HEADER | |||
195 | 195 | ||
196 | #define SNAKE2_RC_QUIT BUTTON_RC_STOP | 196 | #define SNAKE2_RC_QUIT BUTTON_RC_STOP |
197 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 197 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
198 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 198 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
199 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
199 | #define SNAKE2_UP BUTTON_MENU | 200 | #define SNAKE2_UP BUTTON_MENU |
200 | #define SNAKE2_DOWN BUTTON_PLAY | 201 | #define SNAKE2_DOWN BUTTON_PLAY |
201 | #define SNAKE2_QUIT (BUTTON_SELECT | BUTTON_MENU) | 202 | #define SNAKE2_QUIT (BUTTON_SELECT | BUTTON_MENU) |
diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c index 87422c1013..c7ebb1864c 100644 --- a/apps/plugins/snow.c +++ b/apps/plugins/snow.c | |||
@@ -37,7 +37,8 @@ PLUGIN_HEADER | |||
37 | #if CONFIG_KEYPAD == PLAYER_PAD | 37 | #if CONFIG_KEYPAD == PLAYER_PAD |
38 | #define SNOW_QUIT BUTTON_STOP | 38 | #define SNOW_QUIT BUTTON_STOP |
39 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 39 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
40 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 40 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
41 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
41 | #define SNOW_QUIT BUTTON_MENU | 42 | #define SNOW_QUIT BUTTON_MENU |
42 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | 43 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD |
43 | #define SNOW_QUIT BUTTON_PLAY | 44 | #define SNOW_QUIT BUTTON_PLAY |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 5091637bfc..004494ff11 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -148,7 +148,8 @@ extern const fb_data sokoban_tiles[]; | |||
148 | #define SOKOBAN_RC_MENU BUTTON_RC_STOP | 148 | #define SOKOBAN_RC_MENU BUTTON_RC_STOP |
149 | 149 | ||
150 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 150 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
151 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 151 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
152 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
152 | #define SOKOBAN_UP BUTTON_MENU | 153 | #define SOKOBAN_UP BUTTON_MENU |
153 | #define SOKOBAN_DOWN BUTTON_PLAY | 154 | #define SOKOBAN_DOWN BUTTON_PLAY |
154 | #define SOKOBAN_MENU (BUTTON_SELECT | BUTTON_MENU) | 155 | #define SOKOBAN_MENU (BUTTON_SELECT | BUTTON_MENU) |
@@ -1147,7 +1148,8 @@ static int sokoban_menu(void) | |||
1147 | rb->lcd_putsxy(3, 46, "[PLAY] Restart Level"); | 1148 | rb->lcd_putsxy(3, 46, "[PLAY] Restart Level"); |
1148 | rb->lcd_putsxy(3, 56, "[PLAY+UP] Next Level"); | 1149 | rb->lcd_putsxy(3, 56, "[PLAY+UP] Next Level"); |
1149 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 1150 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
1150 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 1151 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
1152 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
1151 | rb->lcd_putsxy(3, 6, "[SELECT+MENU] Menu"); | 1153 | rb->lcd_putsxy(3, 6, "[SELECT+MENU] Menu"); |
1152 | rb->lcd_putsxy(3, 16, "[SELECT] Undo"); | 1154 | rb->lcd_putsxy(3, 16, "[SELECT] Undo"); |
1153 | rb->lcd_putsxy(3, 26, "[SELECT+PLAY] Redo"); | 1155 | rb->lcd_putsxy(3, 26, "[SELECT+PLAY] Redo"); |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 0b5b9a5fa9..92441baa19 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -131,7 +131,8 @@ static struct plugin_api* rb; | |||
131 | # define HK_CUR2STACK "NAVI.." | 131 | # define HK_CUR2STACK "NAVI.." |
132 | # define HK_REM2STACK "PLAY+RIGHT" | 132 | # define HK_REM2STACK "PLAY+RIGHT" |
133 | 133 | ||
134 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) ||(CONFIG_KEYPAD == IPOD_3G_PAD) | 134 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
135 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
135 | # define SOL_QUIT (BUTTON_SELECT | BUTTON_MENU) | 136 | # define SOL_QUIT (BUTTON_SELECT | BUTTON_MENU) |
136 | # define SOL_UP BUTTON_SCROLL_BACK | 137 | # define SOL_UP BUTTON_SCROLL_BACK |
137 | # define SOL_DOWN BUTTON_SCROLL_FWD | 138 | # define SOL_DOWN BUTTON_SCROLL_FWD |
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index fd8637cd5f..f4208f00d0 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c | |||
@@ -93,7 +93,8 @@ static struct plugin_api* rb; /* global api struct pointer */ | |||
93 | #define AST_FIRE BUTTON_SELECT | 93 | #define AST_FIRE BUTTON_SELECT |
94 | #define AST_FIRE_REP BUTTON_SELECT | BUTTON_REPEAT | 94 | #define AST_FIRE_REP BUTTON_SELECT | BUTTON_REPEAT |
95 | 95 | ||
96 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 96 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
97 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
97 | #define AST_PAUSE (BUTTON_SELECT | BUTTON_PLAY) | 98 | #define AST_PAUSE (BUTTON_SELECT | BUTTON_PLAY) |
98 | #define AST_QUIT (BUTTON_SELECT | BUTTON_MENU) | 99 | #define AST_QUIT (BUTTON_SELECT | BUTTON_MENU) |
99 | #define AST_THRUST BUTTON_MENU | 100 | #define AST_THRUST BUTTON_MENU |
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 415c6d2c31..c9d31a6c9a 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -105,7 +105,8 @@ PLUGIN_HEADER | |||
105 | 105 | ||
106 | #define STAR_RC_QUIT BUTTON_RC_STOP | 106 | #define STAR_RC_QUIT BUTTON_RC_STOP |
107 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 107 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
108 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 108 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
109 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
109 | 110 | ||
110 | #define STAR_QUIT (BUTTON_SELECT | BUTTON_MENU) | 111 | #define STAR_QUIT (BUTTON_SELECT | BUTTON_MENU) |
111 | #define STAR_UP BUTTON_MENU | 112 | #define STAR_UP BUTTON_MENU |
@@ -920,7 +921,8 @@ static int star_menu(void) | |||
920 | "[ON + LEFT] Prev. level\n" | 921 | "[ON + LEFT] Prev. level\n" |
921 | "[ON + NAVI] Reset level\n" | 922 | "[ON + NAVI] Reset level\n" |
922 | "[ON + RIGHT] Next level", true); | 923 | "[ON + RIGHT] Next level", true); |
923 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) | 924 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
925 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
924 | star_display_text("KEYS\n\n" | 926 | star_display_text("KEYS\n\n" |
925 | "[SELECT] Toggle Ctl\n" | 927 | "[SELECT] Toggle Ctl\n" |
926 | "[S + MENU] Exit\n" | 928 | "[S + MENU] Exit\n" |
diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c index d0d2d32066..7c1613cc2f 100644 --- a/apps/plugins/starfield.c +++ b/apps/plugins/starfield.c | |||
@@ -27,7 +27,8 @@ static struct plugin_api* rb; /* global api struct pointer */ | |||
27 | 27 | ||
28 | /* Key assignement */ | 28 | /* Key assignement */ |
29 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 29 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
30 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 30 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
31 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
31 | #define STARFIELD_QUIT BUTTON_MENU | 32 | #define STARFIELD_QUIT BUTTON_MENU |
32 | #define STARFIELD_INCREASE_ZMOVE BUTTON_SCROLL_FWD | 33 | #define STARFIELD_INCREASE_ZMOVE BUTTON_SCROLL_FWD |
33 | #define STARFIELD_DECREASE_ZMOVE BUTTON_SCROLL_BACK | 34 | #define STARFIELD_DECREASE_ZMOVE BUTTON_SCROLL_BACK |
diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c index 0f52954abf..dca5e89753 100644 --- a/apps/plugins/stats.c +++ b/apps/plugins/stats.c | |||
@@ -38,8 +38,9 @@ static bool abort; | |||
38 | #define STATS_STOP BUTTON_OFF | 38 | #define STATS_STOP BUTTON_OFF |
39 | #define STATS_STOP_REMOTE BUTTON_RC_STOP | 39 | #define STATS_STOP_REMOTE BUTTON_RC_STOP |
40 | 40 | ||
41 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) \ | 41 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
42 | || (CONFIG_KEYPAD == IPOD_3G_PAD) | 42 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
43 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
43 | #define STATS_STOP BUTTON_MENU | 44 | #define STATS_STOP BUTTON_MENU |
44 | 45 | ||
45 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | 46 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD |
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index 9a66103429..6f18617d2d 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -71,7 +71,8 @@ PLUGIN_HEADER | |||
71 | #define STOPWATCH_RC_QUIT BUTTON_RC_STOP | 71 | #define STOPWATCH_RC_QUIT BUTTON_RC_STOP |
72 | 72 | ||
73 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 73 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
74 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 74 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
75 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
75 | #define STOPWATCH_QUIT BUTTON_MENU | 76 | #define STOPWATCH_QUIT BUTTON_MENU |
76 | #define STOPWATCH_START_STOP BUTTON_SELECT | 77 | #define STOPWATCH_START_STOP BUTTON_SELECT |
77 | #define STOPWATCH_RESET_TIMER BUTTON_LEFT | 78 | #define STOPWATCH_RESET_TIMER BUTTON_LEFT |
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index f850fcf327..20e7c435c4 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -71,7 +71,8 @@ | |||
71 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC | 71 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC |
72 | 72 | ||
73 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 73 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
74 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 74 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
75 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
75 | #define SUDOKU_BUTTON_MENU BUTTON_MENU | 76 | #define SUDOKU_BUTTON_MENU BUTTON_MENU |
76 | #define SUDOKU_BUTTON_LEFT BUTTON_SCROLL_BACK | 77 | #define SUDOKU_BUTTON_LEFT BUTTON_SCROLL_BACK |
77 | #define SUDOKU_BUTTON_RIGHT BUTTON_SCROLL_FWD | 78 | #define SUDOKU_BUTTON_RIGHT BUTTON_SCROLL_FWD |
diff --git a/apps/plugins/test_fps.c b/apps/plugins/test_fps.c index 2ff7fff907..ef1973f8b2 100644 --- a/apps/plugins/test_fps.c +++ b/apps/plugins/test_fps.c | |||
@@ -20,7 +20,8 @@ | |||
20 | 20 | ||
21 | #ifdef HAVE_LCD_BITMAP | 21 | #ifdef HAVE_LCD_BITMAP |
22 | 22 | ||
23 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) | 23 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
24 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
24 | #define FPS_QUIT BUTTON_MENU | 25 | #define FPS_QUIT BUTTON_MENU |
25 | #elif defined(BUTTON_OFF) | 26 | #elif defined(BUTTON_OFF) |
26 | #define FPS_QUIT BUTTON_OFF | 27 | #define FPS_QUIT BUTTON_OFF |
diff --git a/apps/plugins/test_scanrate.c b/apps/plugins/test_scanrate.c index 22ec44b7a9..6f3aaad3fb 100644 --- a/apps/plugins/test_scanrate.c +++ b/apps/plugins/test_scanrate.c | |||
@@ -31,7 +31,8 @@ PLUGIN_HEADER | |||
31 | #define SCANRATE_INC BUTTON_RIGHT | 31 | #define SCANRATE_INC BUTTON_RIGHT |
32 | #define SCANRATE_DEC BUTTON_LEFT | 32 | #define SCANRATE_DEC BUTTON_LEFT |
33 | 33 | ||
34 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) | 34 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) \ |
35 | || (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
35 | #define SCANRATE_DONE BUTTON_MENU | 36 | #define SCANRATE_DONE BUTTON_MENU |
36 | #define SCANRATE_FASTINC BUTTON_SCROLL_FWD | 37 | #define SCANRATE_FASTINC BUTTON_SCROLL_FWD |
37 | #define SCANRATE_FASTDEC BUTTON_SCROLL_BACK | 38 | #define SCANRATE_FASTDEC BUTTON_SCROLL_BACK |
@@ -97,7 +98,8 @@ int plugin_main(void) | |||
97 | #if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == ONDIO_PAD) \ | 98 | #if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == ONDIO_PAD) \ |
98 | || (CONFIG_KEYPAD == IRIVER_H100_PAD) | 99 | || (CONFIG_KEYPAD == IRIVER_H100_PAD) |
99 | rb->lcd_putsxy(TEXT_X, 40, "U/D: Coarse"); | 100 | rb->lcd_putsxy(TEXT_X, 40, "U/D: Coarse"); |
100 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) | 101 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) \ |
102 | || (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
101 | rb->lcd_putsxy(TEXT_X, 40, "Scroll: Coarse"); | 103 | rb->lcd_putsxy(TEXT_X, 40, "Scroll: Coarse"); |
102 | #endif | 104 | #endif |
103 | rb->lcd_putsxy(TEXT_X, 48, "L/R: Fine"); | 105 | rb->lcd_putsxy(TEXT_X, 48, "L/R: Fine"); |
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index d3f74e6514..2c543edeeb 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c | |||
@@ -129,9 +129,10 @@ PLUGIN_HEADER | |||
129 | 129 | ||
130 | #define VIEWER_RC_QUIT BUTTON_RC_STOP | 130 | #define VIEWER_RC_QUIT BUTTON_RC_STOP |
131 | 131 | ||
132 | /* iPods with the 4G pad */ | 132 | /* iPods */ |
133 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 133 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
134 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 134 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
135 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
135 | #define VIEWER_QUIT_PRE BUTTON_SELECT | 136 | #define VIEWER_QUIT_PRE BUTTON_SELECT |
136 | #define VIEWER_QUIT (BUTTON_SELECT | BUTTON_MENU) | 137 | #define VIEWER_QUIT (BUTTON_SELECT | BUTTON_MENU) |
137 | #define VIEWER_PAGE_UP BUTTON_SCROLL_BACK | 138 | #define VIEWER_PAGE_UP BUTTON_SCROLL_BACK |
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 64ad8f22b4..308ff74d83 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -64,8 +64,9 @@ PLUGIN_HEADER | |||
64 | 64 | ||
65 | #define VUMETER_RC_QUIT BUTTON_RC_STOP | 65 | #define VUMETER_RC_QUIT BUTTON_RC_STOP |
66 | 66 | ||
67 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 67 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
68 | (CONFIG_KEYPAD == IPOD_4G_PAD) | 68 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
69 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
69 | #define VUMETER_QUIT BUTTON_MENU | 70 | #define VUMETER_QUIT BUTTON_MENU |
70 | #define VUMETER_HELP BUTTON_PLAY | 71 | #define VUMETER_HELP BUTTON_PLAY |
71 | #define VUMETER_MENU BUTTON_SELECT | 72 | #define VUMETER_MENU BUTTON_SELECT |
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index 94cf1bdee3..6abcc43db1 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c | |||
@@ -91,7 +91,8 @@ PLUGIN_HEADER | |||
91 | #define PLAYERS_TEXT "UP/DN" | 91 | #define PLAYERS_TEXT "UP/DN" |
92 | #define WORMS_TEXT "L/R" | 92 | #define WORMS_TEXT "L/R" |
93 | 93 | ||
94 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 94 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
95 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
95 | 96 | ||
96 | #define BTN_DIR_UP BUTTON_MENU | 97 | #define BTN_DIR_UP BUTTON_MENU |
97 | #define BTN_DIR_DOWN BUTTON_PLAY | 98 | #define BTN_DIR_DOWN BUTTON_PLAY |
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index def11b3bb0..616a45605f 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c | |||
@@ -42,8 +42,9 @@ PLUGIN_HEADER | |||
42 | #define UP BUTTON_UP | 42 | #define UP BUTTON_UP |
43 | #define DOWN BUTTON_DOWN | 43 | #define DOWN BUTTON_DOWN |
44 | 44 | ||
45 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 45 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
46 | (CONFIG_KEYPAD == IPOD_4G_PAD) | 46 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
47 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
47 | 48 | ||
48 | #define QUIT (BUTTON_SELECT | BUTTON_MENU) | 49 | #define QUIT (BUTTON_SELECT | BUTTON_MENU) |
49 | #define LEFT BUTTON_LEFT | 50 | #define LEFT BUTTON_LEFT |
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index 9bac74726c..603869d454 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h | |||
@@ -1,8 +1,8 @@ | |||
1 | #ifndef KEYMAPS_H | 1 | #ifndef KEYMAPS_H |
2 | #define KEYMAPS_H | 2 | #define KEYMAPS_H |
3 | 3 | ||
4 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 4 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
5 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 5 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) |
6 | 6 | ||
7 | #define ZX_UP BUTTON_MENU | 7 | #define ZX_UP BUTTON_MENU |
8 | #define ZX_DOWN BUTTON_PLAY | 8 | #define ZX_DOWN BUTTON_PLAY |
diff --git a/apps/plugins/zxbox/zxbox.c b/apps/plugins/zxbox/zxbox.c index 1faec08e69..c7e3d0a5db 100644 --- a/apps/plugins/zxbox/zxbox.c +++ b/apps/plugins/zxbox/zxbox.c | |||
@@ -125,8 +125,8 @@ void spkb_process_events( int evenframe ) | |||
125 | 125 | ||
126 | if(evenframe){ | 126 | if(evenframe){ |
127 | int ki; | 127 | int ki; |
128 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 128 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
129 | (CONFIG_KEYPAD == IPOD_3G_PAD) | 129 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) |
130 | if (rb->button_hold()) | 130 | if (rb->button_hold()) |
131 | { | 131 | { |
132 | #if defined(HAVE_ADJUSTABLE_CPU_FREQ) | 132 | #if defined(HAVE_ADJUSTABLE_CPU_FREQ) |
@@ -143,8 +143,8 @@ void spkb_process_events( int evenframe ) | |||
143 | if ( buttons == previous_state ) | 143 | if ( buttons == previous_state ) |
144 | return; | 144 | return; |
145 | previous_state = buttons; | 145 | previous_state = buttons; |
146 | #if (CONFIG_KEYPAD != IPOD_4G_PAD) && \ | 146 | #if (CONFIG_KEYPAD != IPOD_4G_PAD) && (CONFIG_KEYPAD != IPOD_3G_PAD) && \ |
147 | (CONFIG_KEYPAD != IPOD_3G_PAD) | 147 | (CONFIG_KEYPAD != IPOD_1G2G_PAD) |
148 | if (buttons & ZX_MENU) | 148 | if (buttons & ZX_MENU) |
149 | { | 149 | { |
150 | #if defined(HAVE_ADJUSTABLE_CPU_FREQ) | 150 | #if defined(HAVE_ADJUSTABLE_CPU_FREQ) |
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index 39cbaa9f6f..5bea491a51 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c | |||
@@ -48,7 +48,9 @@ | |||
48 | #define KBD_UP BUTTON_UP | 48 | #define KBD_UP BUTTON_UP |
49 | #define KBD_DOWN BUTTON_DOWN | 49 | #define KBD_DOWN BUTTON_DOWN |
50 | 50 | ||
51 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 51 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
52 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | ||
53 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
52 | 54 | ||
53 | #define KBD_SELECT BUTTON_SELECT | 55 | #define KBD_SELECT BUTTON_SELECT |
54 | #define KBD_ABORT BUTTON_MENU | 56 | #define KBD_ABORT BUTTON_MENU |
diff --git a/firmware/target/arm/ipod/3g/button-3g.c b/firmware/target/arm/ipod/3g/button-3g.c index c034d55936..aa26e30280 100644 --- a/firmware/target/arm/ipod/3g/button-3g.c +++ b/firmware/target/arm/ipod/3g/button-3g.c | |||
@@ -103,11 +103,12 @@ static int ipod_3g_button_read(void) | |||
103 | unsigned char source, state; | 103 | unsigned char source, state; |
104 | static int was_hold = 0; | 104 | static int was_hold = 0; |
105 | int btn = BUTTON_NONE; | 105 | int btn = BUTTON_NONE; |
106 | /* | 106 | |
107 | * we need some delay for g3, cause hold generates several interrupts, | 107 | #ifdef IPOD_3G |
108 | * some of them delayed | 108 | /* we need some delay for g3, cause hold generates several interrupts, |
109 | */ | 109 | * some of them delayed */ |
110 | udelay(250); | 110 | udelay(250); |
111 | #endif | ||
111 | 112 | ||
112 | /* get source of interupts */ | 113 | /* get source of interupts */ |
113 | source = GPIOA_INT_STAT; | 114 | source = GPIOA_INT_STAT; |
@@ -117,6 +118,7 @@ static int ipod_3g_button_read(void) | |||
117 | state = GPIOA_INPUT_VAL; | 118 | state = GPIOA_INPUT_VAL; |
118 | GPIOA_INT_LEV = ~state; | 119 | GPIOA_INT_LEV = ~state; |
119 | 120 | ||
121 | #ifdef IPOD_3G | ||
120 | if (was_hold && source == 0x40 && state == 0xbf) { | 122 | if (was_hold && source == 0x40 && state == 0xbf) { |
121 | /* ack any active interrupts */ | 123 | /* ack any active interrupts */ |
122 | GPIOA_INT_CLR = source; | 124 | GPIOA_INT_CLR = source; |
@@ -124,7 +126,6 @@ static int ipod_3g_button_read(void) | |||
124 | } | 126 | } |
125 | was_hold = 0; | 127 | was_hold = 0; |
126 | 128 | ||
127 | |||
128 | if ((state & 0x20) == 0) { | 129 | if ((state & 0x20) == 0) { |
129 | /* 3g hold switch is active low */ | 130 | /* 3g hold switch is active low */ |
130 | was_hold = 1; | 131 | was_hold = 1; |
@@ -133,6 +134,12 @@ static int ipod_3g_button_read(void) | |||
133 | GPIOA_INT_CLR = source; | 134 | GPIOA_INT_CLR = source; |
134 | return BUTTON_NONE; | 135 | return BUTTON_NONE; |
135 | } | 136 | } |
137 | #elif defined IPOD_1G2G | ||
138 | if (state & 0x20) | ||
139 | was_hold = 1; | ||
140 | else | ||
141 | was_hold = 0; | ||
142 | #endif | ||
136 | if ((state & 0x1) == 0) { | 143 | if ((state & 0x1) == 0) { |
137 | btn |= BUTTON_RIGHT; | 144 | btn |= BUTTON_RIGHT; |
138 | } | 145 | } |
@@ -163,6 +170,7 @@ void button_init_device(void) | |||
163 | { | 170 | { |
164 | GPIOA_INT_LEV = ~GPIOA_INPUT_VAL; | 171 | GPIOA_INT_LEV = ~GPIOA_INPUT_VAL; |
165 | GPIOA_INT_CLR = GPIOA_INT_STAT; | 172 | GPIOA_INT_CLR = GPIOA_INT_STAT; |
173 | /* TODO: put additional G1 code here */ | ||
166 | GPIOA_INT_EN = 0xff; | 174 | GPIOA_INT_EN = 0xff; |
167 | } | 175 | } |
168 | 176 | ||
diff --git a/firmware/target/arm/ipod/adc-ipod.c b/firmware/target/arm/ipod/adc-ipod.c index d351f0ee81..493b98ef74 100644 --- a/firmware/target/arm/ipod/adc-ipod.c +++ b/firmware/target/arm/ipod/adc-ipod.c | |||
@@ -36,6 +36,7 @@ static struct adc_struct adcdata[NUM_ADC_CHANNELS] IDATA_ATTR; | |||
36 | 36 | ||
37 | static unsigned short _adc_read(struct adc_struct *adc) | 37 | static unsigned short _adc_read(struct adc_struct *adc) |
38 | { | 38 | { |
39 | #ifndef IPOD_1G2G | ||
39 | if (adc->timeout < current_tick) { | 40 | if (adc->timeout < current_tick) { |
40 | unsigned char data[2]; | 41 | unsigned char data[2]; |
41 | unsigned short value; | 42 | unsigned short value; |
@@ -54,7 +55,9 @@ static unsigned short _adc_read(struct adc_struct *adc) | |||
54 | } | 55 | } |
55 | adc->data = value; | 56 | adc->data = value; |
56 | return value; | 57 | return value; |
57 | } else { | 58 | } else |
59 | #endif | ||
60 | { | ||
58 | return adc->data; | 61 | return adc->data; |
59 | } | 62 | } |
60 | } | 63 | } |
diff --git a/firmware/target/arm/ipod/power-ipod.c b/firmware/target/arm/ipod/power-ipod.c index 4fde6faac1..1a84cbe022 100644 --- a/firmware/target/arm/ipod/power-ipod.c +++ b/firmware/target/arm/ipod/power-ipod.c | |||
@@ -30,7 +30,9 @@ | |||
30 | 30 | ||
31 | void power_init(void) | 31 | void power_init(void) |
32 | { | 32 | { |
33 | #ifndef IPOD_1G2G | ||
33 | pcf50605_init(); | 34 | pcf50605_init(); |
35 | #endif | ||
34 | } | 36 | } |
35 | 37 | ||
36 | bool charger_inserted(void) | 38 | bool charger_inserted(void) |
@@ -74,7 +76,12 @@ void power_off(void) | |||
74 | #endif | 76 | #endif |
75 | 77 | ||
76 | #ifndef BOOTLOADER | 78 | #ifndef BOOTLOADER |
79 | #ifdef IPOD_1G2G | ||
80 | /* we cannot turn off the 1st gen/ 2nd gen yet. Need to figure out sleep mode. */ | ||
81 | system_reboot(); | ||
82 | #else | ||
77 | /* We don't turn off the ipod, we put it in a deep sleep */ | 83 | /* We don't turn off the ipod, we put it in a deep sleep */ |
78 | pcf50605_standby_mode(); | 84 | pcf50605_standby_mode(); |
79 | #endif | 85 | #endif |
86 | #endif | ||
80 | } | 87 | } |