diff options
-rw-r--r-- | apps/keymaps/keymap-gigabeat-s.c | 32 | ||||
-rw-r--r-- | apps/lang/english.lang | 4 | ||||
-rw-r--r-- | apps/plugins/jewels.c | 10 | ||||
-rw-r--r-- | firmware/export/config-gigabeat-s.h | 1 | ||||
-rw-r--r-- | firmware/rolo.c | 4 | ||||
-rw-r--r-- | tools/mknkboot.c | 4 |
6 files changed, 33 insertions, 22 deletions
diff --git a/apps/keymaps/keymap-gigabeat-s.c b/apps/keymaps/keymap-gigabeat-s.c index 09d9f62376..42d5b4640a 100644 --- a/apps/keymaps/keymap-gigabeat-s.c +++ b/apps/keymaps/keymap-gigabeat-s.c | |||
@@ -66,8 +66,8 @@ static const struct button_mapping button_context_standard[] = { | |||
66 | 66 | ||
67 | 67 | ||
68 | static const struct button_mapping button_context_wps[] = { | 68 | static const struct button_mapping button_context_wps[] = { |
69 | { ACTION_WPS_PLAY, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 69 | { ACTION_WPS_PLAY, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
70 | { ACTION_WPS_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 70 | { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, |
71 | 71 | ||
72 | { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | 72 | { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
73 | { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | 73 | { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
@@ -84,21 +84,21 @@ static const struct button_mapping button_context_wps[] = { | |||
84 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 84 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
85 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, | 85 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, |
86 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, | 86 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, |
87 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 87 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
88 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 88 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
89 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, | 89 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, |
90 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 90 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
91 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | 91 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, |
92 | 92 | ||
93 | { ACTION_WPS_PITCHSCREEN, BUTTON_BACK|BUTTON_UP, BUTTON_BACK }, | 93 | { ACTION_WPS_PITCHSCREEN, BUTTON_BACK|BUTTON_UP, BUTTON_BACK }, |
94 | { ACTION_WPS_PITCHSCREEN, BUTTON_BACK|BUTTON_DOWN, BUTTON_BACK }, | 94 | { ACTION_WPS_PITCHSCREEN, BUTTON_BACK|BUTTON_DOWN, BUTTON_BACK }, |
95 | 95 | ||
96 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 96 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
97 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 97 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
98 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 98 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
99 | 99 | ||
100 | { ACTION_WPS_ID3SCREEN, BUTTON_BACK|BUTTON_MENU, BUTTON_NONE }, | 100 | { ACTION_WPS_ID3SCREEN, BUTTON_BACK|BUTTON_MENU, BUTTON_NONE }, |
101 | { ACTION_WPS_BROWSE, BUTTON_BACK|BUTTON_REL, BUTTON_BACK }, | 101 | { ACTION_WPS_BROWSE, BUTTON_BACK|BUTTON_REL, BUTTON_BACK }, |
102 | 102 | ||
103 | LAST_ITEM_IN_LIST | 103 | LAST_ITEM_IN_LIST |
104 | }; /* button_context_wps */ | 104 | }; /* button_context_wps */ |
@@ -207,8 +207,8 @@ static const struct button_mapping button_context_bmark[] = { | |||
207 | }; /* button_context_bmark */ | 207 | }; /* button_context_bmark */ |
208 | 208 | ||
209 | static const struct button_mapping button_context_time[] = { | 209 | static const struct button_mapping button_context_time[] = { |
210 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, | 210 | { ACTION_STD_CANCEL, BUTTON_BACK, BUTTON_NONE }, |
211 | { ACTION_STD_OK, BUTTON_BACK, BUTTON_NONE }, | 211 | { ACTION_STD_OK, BUTTON_PLAY, BUTTON_NONE }, |
212 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), | 212 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), |
213 | }; /* button_context_time */ | 213 | }; /* button_context_time */ |
214 | 214 | ||
@@ -236,8 +236,8 @@ static const struct button_mapping button_context_pitchscreen[] = { | |||
236 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 236 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
237 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, | 237 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, |
238 | { ACTION_PS_TOGGLE_MODE, BUTTON_MENU, BUTTON_NONE }, | 238 | { ACTION_PS_TOGGLE_MODE, BUTTON_MENU, BUTTON_NONE }, |
239 | { ACTION_PS_RESET, BUTTON_BACK, BUTTON_NONE }, | 239 | { ACTION_PS_RESET, BUTTON_PLAY, BUTTON_NONE }, |
240 | { ACTION_PS_EXIT, BUTTON_POWER, BUTTON_NONE }, | 240 | { ACTION_PS_EXIT, BUTTON_BACK, BUTTON_NONE }, |
241 | 241 | ||
242 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 242 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
243 | }; /* button_context_pitchcreen */ | 243 | }; /* button_context_pitchcreen */ |
@@ -250,18 +250,18 @@ static const struct button_mapping button_context_keyboard[] = { | |||
250 | { ACTION_KBD_CURSOR_LEFT, BUTTON_PREV, BUTTON_NONE }, | 250 | { ACTION_KBD_CURSOR_LEFT, BUTTON_PREV, BUTTON_NONE }, |
251 | { ACTION_KBD_CURSOR_LEFT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, | 251 | { ACTION_KBD_CURSOR_LEFT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, |
252 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_NEXT, BUTTON_NONE }, | 252 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_NEXT, BUTTON_NONE }, |
253 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 253 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, |
254 | { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE }, | 254 | { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE }, |
255 | { ACTION_KBD_PAGE_FLIP, BUTTON_BACK|BUTTON_MENU, BUTTON_NONE }, | 255 | { ACTION_KBD_PAGE_FLIP, BUTTON_BACK|BUTTON_MENU, BUTTON_NONE }, |
256 | { ACTION_KBD_DONE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 256 | { ACTION_KBD_DONE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
257 | { ACTION_KBD_ABORT, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 257 | { ACTION_KBD_ABORT, BUTTON_BACK|BUTTON_REL, BUTTON_BACK }, |
258 | { ACTION_KBD_BACKSPACE, BUTTON_MENU, BUTTON_NONE }, | 258 | { ACTION_KBD_BACKSPACE, BUTTON_MENU, BUTTON_NONE }, |
259 | { ACTION_KBD_BACKSPACE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, | 259 | { ACTION_KBD_BACKSPACE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, |
260 | { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, | 260 | { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, |
261 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 261 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
262 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, | 262 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, |
263 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 263 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
264 | { ACTION_KBD_MORSE_INPUT, BUTTON_BACK|BUTTON_POWER, BUTTON_NONE }, | 264 | { ACTION_KBD_MORSE_INPUT, BUTTON_BACK|BUTTON_VOL_UP, BUTTON_NONE }, |
265 | { ACTION_KBD_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | 265 | { ACTION_KBD_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, |
266 | 266 | ||
267 | LAST_ITEM_IN_LIST | 267 | LAST_ITEM_IN_LIST |
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index f43df0dbad..e3b632f790 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -322,13 +322,13 @@ | |||
322 | <source> | 322 | <source> |
323 | *: "PLAY = Yes" | 323 | *: "PLAY = Yes" |
324 | h100,h120,h300: "NAVI = Yes" | 324 | h100,h120,h300: "NAVI = Yes" |
325 | ipod*,x5,m5,gigabeatf,e200,c200,h10,h10_5gb,mrobe100: "SELECT = Yes" | 325 | ipod*,x5,m5,gigabeatf,e200,c200,h10,h10_5gb,mrobe100,gigabeats: "SELECT = Yes" |
326 | player: "(PLAY/STOP)" | 326 | player: "(PLAY/STOP)" |
327 | </source> | 327 | </source> |
328 | <dest> | 328 | <dest> |
329 | *: "PLAY = Yes" | 329 | *: "PLAY = Yes" |
330 | h100,h120,h300: "NAVI = Yes" | 330 | h100,h120,h300: "NAVI = Yes" |
331 | ipod*,x5,m5,gigabeatf,e200,c200,h10,h10_5gb,mrobe100: "SELECT = Yes" | 331 | ipod*,x5,m5,gigabeatf,e200,c200,h10,h10_5gb,mrobe100,gigabeats: "SELECT = Yes" |
332 | player: "(PLAY/STOP)" | 332 | player: "(PLAY/STOP)" |
333 | </dest> | 333 | </dest> |
334 | <voice> | 334 | <voice> |
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 0355bf6287..eb8e70072e 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -1573,6 +1573,16 @@ static int jewels_main(struct game_context* bj) { | |||
1573 | rb->lcd_puts(0, 9, "SELECT to select"); | 1573 | rb->lcd_puts(0, 9, "SELECT to select"); |
1574 | rb->lcd_puts(0, 10, "Long SELECT to show menu"); | 1574 | rb->lcd_puts(0, 10, "Long SELECT to show menu"); |
1575 | rb->lcd_puts(0, 11, "POWER to cancel"); | 1575 | rb->lcd_puts(0, 11, "POWER to cancel"); |
1576 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD | ||
1577 | rb->lcd_puts(0, 2, "Swap pairs of jewels to"); | ||
1578 | rb->lcd_puts(0, 3, "form connected segments"); | ||
1579 | rb->lcd_puts(0, 4, "of three or more of the"); | ||
1580 | rb->lcd_puts(0, 5, "same type."); | ||
1581 | rb->lcd_puts(0, 7, "Controls:"); | ||
1582 | rb->lcd_puts(0, 8, "Directions to move"); | ||
1583 | rb->lcd_puts(0, 9, "SELECT to select"); | ||
1584 | rb->lcd_puts(0, 10, "Long SELECT to show menu"); | ||
1585 | rb->lcd_puts(0, 11, "BACK to cancel"); | ||
1576 | #else | 1586 | #else |
1577 | #warning: missing help text. | 1587 | #warning: missing help text. |
1578 | #endif | 1588 | #endif |
diff --git a/firmware/export/config-gigabeat-s.h b/firmware/export/config-gigabeat-s.h index 3fc226ae59..353055f2cb 100644 --- a/firmware/export/config-gigabeat-s.h +++ b/firmware/export/config-gigabeat-s.h | |||
@@ -133,6 +133,7 @@ | |||
133 | #define FIRMWARE_OFFSET_FILE_DATA 8 | 133 | #define FIRMWARE_OFFSET_FILE_DATA 8 |
134 | 134 | ||
135 | #define HAVE_SERIAL | 135 | #define HAVE_SERIAL |
136 | #define HAVE_VOLUME_IN_LIST | ||
136 | 137 | ||
137 | /*Remove Comments from UART_INT to enable the UART interrupts,*/ | 138 | /*Remove Comments from UART_INT to enable the UART interrupts,*/ |
138 | /*otherwise iterrupts will be disabled. For now we will test */ | 139 | /*otherwise iterrupts will be disabled. For now we will test */ |
diff --git a/firmware/rolo.c b/firmware/rolo.c index 848b35b056..a18a0737c7 100644 --- a/firmware/rolo.c +++ b/firmware/rolo.c | |||
@@ -168,7 +168,7 @@ void rolo_restart(const unsigned char* source, unsigned char* dest, | |||
168 | "mov pc, r0 \n" | 168 | "mov pc, r0 \n" |
169 | ); | 169 | ); |
170 | 170 | ||
171 | #elif defined(CPU_TCC780X) | 171 | #elif defined(CPU_TCC780X) || (CONFIG_CPU==IMX31L) |
172 | /* Flush cache */ | 172 | /* Flush cache */ |
173 | flush_icache(); | 173 | flush_icache(); |
174 | 174 | ||
@@ -226,7 +226,7 @@ int rolo_load(const char* filename) | |||
226 | length = filesize(fd) - FIRMWARE_OFFSET_FILE_DATA; | 226 | length = filesize(fd) - FIRMWARE_OFFSET_FILE_DATA; |
227 | 227 | ||
228 | #if defined(CPU_COLDFIRE) || defined(CPU_PP) || (CONFIG_CPU==DM320) \ | 228 | #if defined(CPU_COLDFIRE) || defined(CPU_PP) || (CONFIG_CPU==DM320) \ |
229 | || defined(CPU_TCC780X) | 229 | || defined(CPU_TCC780X) || (CONFIG_CPU==IMX31L) |
230 | /* Read and save checksum */ | 230 | /* Read and save checksum */ |
231 | lseek(fd, FIRMWARE_OFFSET_FILE_CRC, SEEK_SET); | 231 | lseek(fd, FIRMWARE_OFFSET_FILE_CRC, SEEK_SET); |
232 | if (read(fd, &file_checksum, 4) != 4) { | 232 | if (read(fd, &file_checksum, 4) != 4) { |
diff --git a/tools/mknkboot.c b/tools/mknkboot.c index dfb3c99767..600f1adb1a 100644 --- a/tools/mknkboot.c +++ b/tools/mknkboot.c | |||
@@ -219,13 +219,13 @@ int main(int argc, char *argv[]) | |||
219 | boot2 = boot + bootlength + 12; | 219 | boot2 = boot + bootlength + 12; |
220 | 220 | ||
221 | /* Copy dual-boot code in an endian-safe way */ | 221 | /* Copy dual-boot code in an endian-safe way */ |
222 | for (i = 0; i < sizeof(dualboot) / 4; i++) { | 222 | for (i = 0; i < (signed int)sizeof(dualboot) / 4; i++) { |
223 | put_uint32le(dualboot[i], boot2 + 12 + i*4); | 223 | put_uint32le(dualboot[i], boot2 + 12 + i*4); |
224 | } | 224 | } |
225 | 225 | ||
226 | /* Calculate checksum */ | 226 | /* Calculate checksum */ |
227 | sum = 0; | 227 | sum = 0; |
228 | for (i = 0; i < sizeof(dualboot); i++) { | 228 | for (i = 0; i < (signed int)sizeof(dualboot); i++) { |
229 | sum += boot2[i+12]; | 229 | sum += boot2[i+12]; |
230 | } | 230 | } |
231 | 231 | ||