diff options
-rw-r--r-- | apps/codecs/libmad/mad_iram.h | 4 | ||||
-rw-r--r-- | apps/plugins/SUBDIRS | 2 | ||||
-rw-r--r-- | apps/plugins/chessbox/chessbox_pgn.h | 15 | ||||
-rw-r--r-- | apps/plugins/doom/i_video.c | 11 | ||||
-rw-r--r-- | apps/plugins/midi/midiplay.c | 9 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/mpeg_settings.c | 10 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/mpegplayer.c | 12 | ||||
-rw-r--r-- | apps/plugins/pacbox/pacbox.h | 11 | ||||
-rw-r--r-- | apps/plugins/plugin.lds | 5 | ||||
-rw-r--r-- | apps/plugins/reversi/reversi-gui.h | 9 | ||||
-rw-r--r-- | apps/plugins/rockboy/rockboy.c | 9 | ||||
-rw-r--r-- | apps/plugins/sudoku/sudoku.h | 10 | ||||
-rw-r--r-- | apps/plugins/zxbox/keymaps.h | 9 | ||||
-rw-r--r-- | apps/plugins/zxbox/zxbox_keyb.c | 9 |
14 files changed, 120 insertions, 5 deletions
diff --git a/apps/codecs/libmad/mad_iram.h b/apps/codecs/libmad/mad_iram.h index b4dadd8a23..ffa6be8881 100644 --- a/apps/codecs/libmad/mad_iram.h +++ b/apps/codecs/libmad/mad_iram.h | |||
@@ -31,7 +31,7 @@ | |||
31 | mpegplayer on the PP5002. S3C2440 doesn't have any IRAM available for | 31 | mpegplayer on the PP5002. S3C2440 doesn't have any IRAM available for |
32 | codecs */ | 32 | codecs */ |
33 | #if defined(CPU_PP502x) || (CONFIG_CPU == PP5002 && defined(MPEGPLAYER)) || \ | 33 | #if defined(CPU_PP502x) || (CONFIG_CPU == PP5002 && defined(MPEGPLAYER)) || \ |
34 | (CONFIG_CPU==S3C2440) | 34 | (CONFIG_CPU==S3C2440) || (CONFIG_CPU==IMX31L) |
35 | #define ICODE_SECTION_MPA_ARM .text | 35 | #define ICODE_SECTION_MPA_ARM .text |
36 | #define ICODE_ATTR_MPA_SYNTH | 36 | #define ICODE_ATTR_MPA_SYNTH |
37 | #else | 37 | #else |
@@ -39,7 +39,7 @@ | |||
39 | #define ICODE_ATTR_MPA_SYNTH ICODE_ATTR | 39 | #define ICODE_ATTR_MPA_SYNTH ICODE_ATTR |
40 | #endif | 40 | #endif |
41 | 41 | ||
42 | #if CONFIG_CPU == S3C2440 | 42 | #if CONFIG_CPU == S3C2440 || CONFIG_CPU == IMX31L |
43 | #define IBSS_SECTION_MPA_ARM .bss | 43 | #define IBSS_SECTION_MPA_ARM .bss |
44 | #else | 44 | #else |
45 | #define IBSS_SECTION_MPA_ARM .ibss | 45 | #define IBSS_SECTION_MPA_ARM .ibss |
diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS index d3d92f5344..ca162f4047 100644 --- a/apps/plugins/SUBDIRS +++ b/apps/plugins/SUBDIRS | |||
@@ -1,4 +1,4 @@ | |||
1 | #if !defined(IRIVER_IFP7XX_SERIES) && !defined(GIGABEAT_S) | 1 | #if !defined(IRIVER_IFP7XX_SERIES) |
2 | 2 | ||
3 | /* For all targets */ | 3 | /* For all targets */ |
4 | shortcuts | 4 | shortcuts |
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index 7a7baf6ad8..672bacaf6e 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h | |||
@@ -152,6 +152,21 @@ | |||
152 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 152 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
153 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | 153 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) |
154 | 154 | ||
155 | #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) | ||
156 | #define CB_SELECT BUTTON_SELECT | ||
157 | #define CB_UP BUTTON_UP | ||
158 | #define CB_DOWN BUTTON_DOWN | ||
159 | #define CB_LEFT BUTTON_LEFT | ||
160 | #define CB_RIGHT BUTTON_RIGHT | ||
161 | #define CB_PLAY BUTTON_PLAY | ||
162 | #define CB_LEVEL BUTTON_MENU | ||
163 | #define CB_MENU BUTTON_POWER | ||
164 | |||
165 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | ||
166 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | ||
167 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | ||
168 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | ||
169 | |||
155 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 170 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
156 | #define CB_SELECT BUTTON_REW | 171 | #define CB_SELECT BUTTON_REW |
157 | #define CB_UP BUTTON_SCROLL_UP | 172 | #define CB_UP BUTTON_SCROLL_UP |
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 117c2b921b..cb6d967b0c 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -214,6 +214,17 @@ void I_ShutdownGraphics(void) | |||
214 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 214 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
215 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN | 215 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN |
216 | #define DOOMBUTTON_MAP BUTTON_VOL_UP | 216 | #define DOOMBUTTON_MAP BUTTON_VOL_UP |
217 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD | ||
218 | #define DOOMBUTTON_UP BUTTON_UP | ||
219 | #define DOOMBUTTON_DOWN BUTTON_DOWN | ||
220 | #define DOOMBUTTON_LEFT BUTTON_LEFT | ||
221 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT | ||
222 | #define DOOMBUTTON_SHOOT BUTTON_PLAY | ||
223 | #define DOOMBUTTON_OPEN BUTTON_MENU | ||
224 | #define DOOMBUTTON_ESC BUTTON_POWER | ||
225 | #define DOOMBUTTON_ENTER BUTTON_SELECT | ||
226 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN | ||
227 | #define DOOMBUTTON_MAP BUTTON_VOL_UP | ||
217 | #elif CONFIG_KEYPAD == MROBE500_PAD | 228 | #elif CONFIG_KEYPAD == MROBE500_PAD |
218 | #define DOOMBUTTON_ESC BUTTON_POWER | 229 | #define DOOMBUTTON_ESC BUTTON_POWER |
219 | #define DOOMBUTTON_UP BUTTON_RC_PLAY | 230 | #define DOOMBUTTON_UP BUTTON_RC_PLAY |
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c index f99fafcb2d..e97d7acf1c 100644 --- a/apps/plugins/midi/midiplay.c +++ b/apps/plugins/midi/midiplay.c | |||
@@ -72,6 +72,15 @@ PLUGIN_IRAM_DECLARE | |||
72 | #define BTN_PLAY BUTTON_A | 72 | #define BTN_PLAY BUTTON_A |
73 | 73 | ||
74 | 74 | ||
75 | #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) | ||
76 | #define BTN_QUIT BUTTON_POWER | ||
77 | #define BTN_RIGHT BUTTON_RIGHT | ||
78 | #define BTN_LEFT BUTTON_LEFT | ||
79 | #define BTN_UP BUTTON_UP | ||
80 | #define BTN_DOWN BUTTON_DOWN | ||
81 | #define BTN_PLAY BUTTON_PLAY | ||
82 | |||
83 | |||
75 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) | 84 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) |
76 | #define BTN_QUIT BUTTON_POWER | 85 | #define BTN_QUIT BUTTON_POWER |
77 | #define BTN_RIGHT BUTTON_RIGHT | 86 | #define BTN_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 4d9e5625f9..06083dfe10 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c | |||
@@ -54,6 +54,16 @@ struct mpeg_settings settings; | |||
54 | #define MPEG_START_TIME_RC_DOWN BUTTON_RC_VOL_DOWN | 54 | #define MPEG_START_TIME_RC_DOWN BUTTON_RC_VOL_DOWN |
55 | #define MPEG_START_TIME_RC_EXIT (BUTTON_RC_PLAY | BUTTON_REPEAT) | 55 | #define MPEG_START_TIME_RC_EXIT (BUTTON_RC_PLAY | BUTTON_REPEAT) |
56 | 56 | ||
57 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD | ||
58 | #define MPEG_START_TIME_SELECT BUTTON_SELECT | ||
59 | #define MPEG_START_TIME_LEFT BUTTON_LEFT | ||
60 | #define MPEG_START_TIME_RIGHT BUTTON_RIGHT | ||
61 | #define MPEG_START_TIME_UP BUTTON_UP | ||
62 | #define MPEG_START_TIME_DOWN BUTTON_DOWN | ||
63 | #define MPEG_START_TIME_SCROLL_DOWN BUTTON_VOL_DOWN | ||
64 | #define MPEG_START_TIME_SCROLL_UP BUTTON_VOL_UP | ||
65 | #define MPEG_START_TIME_EXIT BUTTON_POWER | ||
66 | |||
57 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 67 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
58 | #define MPEG_START_TIME_SELECT BUTTON_PLAY | 68 | #define MPEG_START_TIME_SELECT BUTTON_PLAY |
59 | #define MPEG_START_TIME_LEFT BUTTON_LEFT | 69 | #define MPEG_START_TIME_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index e63246b648..8e46b24eee 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -157,6 +157,18 @@ PLUGIN_IRAM_DECLARE | |||
157 | #define MPEG_RC_RW BUTTON_RC_REW | 157 | #define MPEG_RC_RW BUTTON_RC_REW |
158 | #define MPEG_RC_FF BUTTON_RC_FF | 158 | #define MPEG_RC_FF BUTTON_RC_FF |
159 | 159 | ||
160 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD | ||
161 | #define MPEG_MENU BUTTON_MENU | ||
162 | #define MPEG_STOP BUTTON_POWER | ||
163 | #define MPEG_PAUSE BUTTON_SELECT | ||
164 | #define MPEG_PAUSE2 BUTTON_PLAY | ||
165 | #define MPEG_VOLDOWN BUTTON_LEFT | ||
166 | #define MPEG_VOLUP BUTTON_RIGHT | ||
167 | #define MPEG_VOLDOWN2 BUTTON_VOL_DOWN | ||
168 | #define MPEG_VOLUP2 BUTTON_VOL_UP | ||
169 | #define MPEG_RW BUTTON_UP | ||
170 | #define MPEG_FF BUTTON_DOWN | ||
171 | |||
160 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 172 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
161 | #define MPEG_MENU BUTTON_LEFT | 173 | #define MPEG_MENU BUTTON_LEFT |
162 | #define MPEG_STOP BUTTON_POWER | 174 | #define MPEG_STOP BUTTON_POWER |
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index 8350e4e939..55ae5b88c6 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h | |||
@@ -76,6 +76,17 @@ | |||
76 | #define PACMAN_COIN BUTTON_A | 76 | #define PACMAN_COIN BUTTON_A |
77 | #define PACMAN_MENU BUTTON_MENU | 77 | #define PACMAN_MENU BUTTON_MENU |
78 | 78 | ||
79 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD | ||
80 | |||
81 | #define PACMAN_UP BUTTON_UP | ||
82 | #define PACMAN_DOWN BUTTON_DOWN | ||
83 | #define PACMAN_LEFT BUTTON_LEFT | ||
84 | #define PACMAN_RIGHT BUTTON_RIGHT | ||
85 | #define PACMAN_1UP BUTTON_SELECT | ||
86 | #define PACMAN_2UP BUTTON_POWER | ||
87 | #define PACMAN_COIN BUTTON_PLAY | ||
88 | #define PACMAN_MENU BUTTON_MENU | ||
89 | |||
79 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD | 90 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
80 | 91 | ||
81 | #define PACMAN_UP BUTTON_RIGHT | 92 | #define PACMAN_UP BUTTON_RIGHT |
diff --git a/apps/plugins/plugin.lds b/apps/plugins/plugin.lds index 4a0ad7326e..92365c6269 100644 --- a/apps/plugins/plugin.lds +++ b/apps/plugins/plugin.lds | |||
@@ -67,9 +67,10 @@ OUTPUT_FORMAT(elf32-sh) | |||
67 | #define IRAMSIZE 4K | 67 | #define IRAMSIZE 4K |
68 | #define IRAM DRAM | 68 | #define IRAM DRAM |
69 | #elif CONFIG_CPU == IMX31L | 69 | #elif CONFIG_CPU == IMX31L |
70 | #define DRAMORIG 0x0 | 70 | #define DRAMORIG 0x0 + STUBOFFSET |
71 | #define IRAMORIG 0x1FFFC000 | 71 | #define IRAMORIG DRAMORIG |
72 | #define IRAMSIZE 0x4000 | 72 | #define IRAMSIZE 0x4000 |
73 | #define IRAM DRAM | ||
73 | #elif CONFIG_CPU==DM320 | 74 | #elif CONFIG_CPU==DM320 |
74 | #define DRAMORIG 0x00900000 + STUBOFFSET | 75 | #define DRAMORIG 0x00900000 + STUBOFFSET |
75 | #define IRAMORIG DRAMORIG | 76 | #define IRAMORIG DRAMORIG |
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h index d1cea9c2bf..4bfb86121d 100644 --- a/apps/plugins/reversi/reversi-gui.h +++ b/apps/plugins/reversi/reversi-gui.h | |||
@@ -86,6 +86,15 @@ | |||
86 | #define REVERSI_BUTTON_MAKE_MOVE BUTTON_SELECT | 86 | #define REVERSI_BUTTON_MAKE_MOVE BUTTON_SELECT |
87 | #define REVERSI_BUTTON_MENU BUTTON_MENU | 87 | #define REVERSI_BUTTON_MENU BUTTON_MENU |
88 | 88 | ||
89 | #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) | ||
90 | #define REVERSI_BUTTON_QUIT BUTTON_POWER | ||
91 | #define REVERSI_BUTTON_UP BUTTON_UP | ||
92 | #define REVERSI_BUTTON_DOWN BUTTON_DOWN | ||
93 | #define REVERSI_BUTTON_LEFT BUTTON_LEFT | ||
94 | #define REVERSI_BUTTON_RIGHT BUTTON_RIGHT | ||
95 | #define REVERSI_BUTTON_MAKE_MOVE BUTTON_SELECT | ||
96 | #define REVERSI_BUTTON_MENU BUTTON_MENU | ||
97 | |||
89 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) | 98 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) |
90 | #define REVERSI_BUTTON_QUIT BUTTON_POWER | 99 | #define REVERSI_BUTTON_QUIT BUTTON_POWER |
91 | #define REVERSI_BUTTON_UP BUTTON_SCROLL_UP | 100 | #define REVERSI_BUTTON_UP BUTTON_SCROLL_UP |
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 44a1aecd69..58696a1f61 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -204,6 +204,15 @@ static void setoptions (void) | |||
204 | options.MENU=BUTTON_POWER; | 204 | options.MENU=BUTTON_POWER; |
205 | #elif CONFIG_KEYPAD == COWOND2_PAD | 205 | #elif CONFIG_KEYPAD == COWOND2_PAD |
206 | 206 | ||
207 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD | ||
208 | options.UP=BUTTON_UP; | ||
209 | options.DOWN=BUTTON_DOWN; | ||
210 | |||
211 | options.A=BUTTON_VOL_UP; | ||
212 | options.B=BUTTON_VOL_DOWN; | ||
213 | options.START=BUTTON_PLAY; | ||
214 | options.SELECT=BUTTON_SELECT; | ||
215 | options.MENU=BUTTON_MENU; | ||
207 | #else | 216 | #else |
208 | #error No Keymap Defined! | 217 | #error No Keymap Defined! |
209 | #endif | 218 | #endif |
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 2cd9198af9..f9737a9785 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -101,6 +101,16 @@ | |||
101 | #define SUDOKU_BUTTON_MENU BUTTON_MENU | 101 | #define SUDOKU_BUTTON_MENU BUTTON_MENU |
102 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_A | 102 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_A |
103 | 103 | ||
104 | #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) | ||
105 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER | ||
106 | #define SUDOKU_BUTTON_UP BUTTON_UP | ||
107 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN | ||
108 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT | ||
109 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT | ||
110 | #define SUDOKU_BUTTON_TOGGLE BUTTON_SELECT | ||
111 | #define SUDOKU_BUTTON_MENU BUTTON_MENU | ||
112 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAY | ||
113 | |||
104 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) | 114 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) |
105 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER | 115 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER |
106 | #define SUDOKU_BUTTON_UP BUTTON_SCROLL_UP | 116 | #define SUDOKU_BUTTON_UP BUTTON_SCROLL_UP |
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index 49156c2f11..ca9d2093b5 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h | |||
@@ -28,6 +28,15 @@ | |||
28 | #define ZX_SELECT BUTTON_SELECT | 28 | #define ZX_SELECT BUTTON_SELECT |
29 | #define ZX_MENU BUTTON_MENU | 29 | #define ZX_MENU BUTTON_MENU |
30 | 30 | ||
31 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD | ||
32 | |||
33 | #define ZX_UP BUTTON_UP | ||
34 | #define ZX_DOWN BUTTON_DOWN | ||
35 | #define ZX_LEFT BUTTON_LEFT | ||
36 | #define ZX_RIGHT BUTTON_RIGHT | ||
37 | #define ZX_SELECT BUTTON_SELECT | ||
38 | #define ZX_MENU BUTTON_MENU | ||
39 | |||
31 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD | 40 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
32 | 41 | ||
33 | #define ZX_RIGHT BUTTON_RIGHT | 42 | #define ZX_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index 33d44512a7..b1abab3d90 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c | |||
@@ -90,6 +90,15 @@ | |||
90 | #define KBD_UP BUTTON_UP | 90 | #define KBD_UP BUTTON_UP |
91 | #define KBD_DOWN BUTTON_DOWN | 91 | #define KBD_DOWN BUTTON_DOWN |
92 | 92 | ||
93 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD | ||
94 | |||
95 | #define KBD_SELECT BUTTON_SELECT | ||
96 | #define KBD_ABORT BUTTON_POWER | ||
97 | #define KBD_LEFT BUTTON_LEFT | ||
98 | #define KBD_RIGHT BUTTON_RIGHT | ||
99 | #define KBD_UP BUTTON_UP | ||
100 | #define KBD_DOWN BUTTON_DOWN | ||
101 | |||
93 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 102 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
94 | 103 | ||
95 | /* TODO: Check keyboard mappings */ | 104 | /* TODO: Check keyboard mappings */ |