diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/debug_menu.c | 43 | ||||
-rw-r--r-- | apps/gui/gwps.h | 18 | ||||
-rw-r--r-- | apps/menu.h | 7 | ||||
-rw-r--r-- | apps/plugins/zxbox/keymaps.h | 8 | ||||
-rw-r--r-- | apps/plugins/zxbox/zxbox_keyb.c | 8 |
5 files changed, 8 insertions, 76 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 26b9f18824..4620adaaec 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -370,26 +370,6 @@ bool dbg_audio_thread(void) | |||
370 | #endif /* HAVE_LCD_BITMAP */ | 370 | #endif /* HAVE_LCD_BITMAP */ |
371 | 371 | ||
372 | 372 | ||
373 | #if CONFIG_CPU == TCC730 | ||
374 | static unsigned flash_word_temp IDATA_ATTR; | ||
375 | |||
376 | static void flash_write_word(unsigned addr, unsigned value) ICODE_ATTR; | ||
377 | static void flash_write_word(unsigned addr, unsigned value) { | ||
378 | flash_word_temp = value; | ||
379 | |||
380 | long extAddr = (long)addr << 1; | ||
381 | ddma_transfer(1, 1, &flash_word_temp, extAddr, 2); | ||
382 | } | ||
383 | |||
384 | static unsigned flash_read_word(unsigned addr) ICODE_ATTR; | ||
385 | static unsigned flash_read_word(unsigned addr) { | ||
386 | long extAddr = (long)addr << 1; | ||
387 | ddma_transfer(1, 1, &flash_word_temp, extAddr, 2); | ||
388 | return flash_word_temp; | ||
389 | } | ||
390 | |||
391 | #endif | ||
392 | |||
393 | #ifndef SIMULATOR | 373 | #ifndef SIMULATOR |
394 | /* Tool function to read the flash manufacturer and type, if available. | 374 | /* Tool function to read the flash manufacturer and type, if available. |
395 | Only chips which could be reprogrammed in system will return values. | 375 | Only chips which could be reprogrammed in system will return values. |
@@ -423,37 +403,30 @@ bool dbg_flash_id(unsigned* p_manufacturer, unsigned* p_device, | |||
423 | #else | 403 | #else |
424 | unsigned not_manu, not_id; /* read values before switching to ID mode */ | 404 | unsigned not_manu, not_id; /* read values before switching to ID mode */ |
425 | unsigned manu, id; /* read values when in ID mode */ | 405 | unsigned manu, id; /* read values when in ID mode */ |
426 | #if CONFIG_CPU == TCC730 | ||
427 | #define FLASH(addr) (flash_read_word(addr)) | ||
428 | #define SET_FLASH(addr, val) (flash_write_word((addr), (val))) | ||
429 | 406 | ||
430 | #else /* memory mapped */ | ||
431 | #if CONFIG_CPU == SH7034 | 407 | #if CONFIG_CPU == SH7034 |
432 | volatile unsigned char* flash = (unsigned char*)0x2000000; /* flash mapping */ | 408 | volatile unsigned char* flash = (unsigned char*)0x2000000; /* flash mapping */ |
433 | #elif defined(CPU_COLDFIRE) | 409 | #elif defined(CPU_COLDFIRE) |
434 | volatile unsigned short* flash = (unsigned short*)0; /* flash mapping */ | 410 | volatile unsigned short* flash = (unsigned short*)0; /* flash mapping */ |
435 | #endif | 411 | #endif |
436 | #define FLASH(addr) (flash[addr]) | ||
437 | #define SET_FLASH(addr, val) (flash[addr] = val) | ||
438 | #endif | ||
439 | int old_level; /* saved interrupt level */ | 412 | int old_level; /* saved interrupt level */ |
440 | 413 | ||
441 | not_manu = FLASH(0); /* read the normal content */ | 414 | not_manu = flash[0]; /* read the normal content */ |
442 | not_id = FLASH(1); /* should be 'A' (0x41) and 'R' (0x52) from the "ARCH" marker */ | 415 | not_id = flash[1]; /* should be 'A' (0x41) and 'R' (0x52) from the "ARCH" marker */ |
443 | 416 | ||
444 | /* disable interrupts, prevent any stray flash access */ | 417 | /* disable interrupts, prevent any stray flash access */ |
445 | old_level = set_irq_level(HIGHEST_IRQ_LEVEL); | 418 | old_level = set_irq_level(HIGHEST_IRQ_LEVEL); |
446 | 419 | ||
447 | SET_FLASH(addr1, 0xAA); /* enter command mode */ | 420 | flash[addr1] = 0xAA; /* enter command mode */ |
448 | SET_FLASH(addr2, 0x55); | 421 | flash[addr2] = 0x55; |
449 | SET_FLASH(addr1, 0x90); /* ID command */ | 422 | flash[addr1] = 0x90; /* ID command */ |
450 | /* Atmel wants 20ms pause here */ | 423 | /* Atmel wants 20ms pause here */ |
451 | /* sleep(HZ/50); no sleeping possible while interrupts are disabled */ | 424 | /* sleep(HZ/50); no sleeping possible while interrupts are disabled */ |
452 | 425 | ||
453 | manu = FLASH(0); /* read the IDs */ | 426 | manu = flash[0]; /* read the IDs */ |
454 | id = FLASH(1); | 427 | id = flash[1]; |
455 | 428 | ||
456 | SET_FLASH(0, 0xF0); /* reset flash (back to normal read mode) */ | 429 | flash[0] = 0xF0; /* reset flash (back to normal read mode) */ |
457 | /* Atmel wants 20ms pause here */ | 430 | /* Atmel wants 20ms pause here */ |
458 | /* sleep(HZ/50); no sleeping possible while interrupts are disabled */ | 431 | /* sleep(HZ/50); no sleeping possible while interrupts are disabled */ |
459 | 432 | ||
diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h index 39ce80845c..0e298bca74 100644 --- a/apps/gui/gwps.h +++ b/apps/gui/gwps.h | |||
@@ -161,24 +161,6 @@ | |||
161 | #define WPS_EXIT (BUTTON_OFF | BUTTON_REPEAT) | 161 | #define WPS_EXIT (BUTTON_OFF | BUTTON_REPEAT) |
162 | #define WPS_CONTEXT (BUTTON_MENU | BUTTON_REPEAT) | 162 | #define WPS_CONTEXT (BUTTON_MENU | BUTTON_REPEAT) |
163 | 163 | ||
164 | #elif CONFIG_KEYPAD == GMINI100_PAD | ||
165 | #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) | ||
166 | #define WPS_NEXT_PRE BUTTON_RIGHT | ||
167 | #define WPS_PREV (BUTTON_LEFT | BUTTON_REL) | ||
168 | #define WPS_PREV_PRE BUTTON_LEFT | ||
169 | #define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT) | ||
170 | #define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT) | ||
171 | #define WPS_INCVOL BUTTON_UP | ||
172 | #define WPS_DECVOL BUTTON_DOWN | ||
173 | #define WPS_PAUSE BUTTON_PLAY | ||
174 | #define WPS_MENU (BUTTON_MENU | BUTTON_REL) | ||
175 | #define WPS_MENU_PRE BUTTON_MENU | ||
176 | #define WPS_BROWSE (BUTTON_ON | BUTTON_REL) | ||
177 | #define WPS_BROWSE_PRE BUTTON_ON | ||
178 | #define WPS_EXIT BUTTON_OFF | ||
179 | #define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN) | ||
180 | #define WPS_ID3 (BUTTON_MENU | BUTTON_ON) | ||
181 | |||
182 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 164 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) |
183 | 165 | ||
184 | /* TODO: Check WPS button assignments */ | 166 | /* TODO: Check WPS button assignments */ |
diff --git a/apps/menu.h b/apps/menu.h index c43889b217..f9a3d1ffd8 100644 --- a/apps/menu.h +++ b/apps/menu.h | |||
@@ -61,13 +61,6 @@ | |||
61 | #define MENU_EXIT_MENU BUTTON_MENU | 61 | #define MENU_EXIT_MENU BUTTON_MENU |
62 | #define MENU_ENTER BUTTON_RIGHT | 62 | #define MENU_ENTER BUTTON_RIGHT |
63 | 63 | ||
64 | #elif CONFIG_KEYPAD == GMINI100_PAD | ||
65 | #define MENU_EXIT BUTTON_LEFT | ||
66 | #define MENU_EXIT2 BUTTON_OFF | ||
67 | #define MENU_EXIT_MENU BUTTON_MENU | ||
68 | #define MENU_ENTER BUTTON_RIGHT | ||
69 | #define MENU_ENTER2 BUTTON_PLAY | ||
70 | |||
71 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 64 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) |
72 | 65 | ||
73 | /* TODO: Check menu button assignments */ | 66 | /* TODO: Check menu button assignments */ |
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index 54218dbf51..b7de0cb6a7 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h | |||
@@ -53,14 +53,6 @@ | |||
53 | #define ZX_UP BUTTON_UP | 53 | #define ZX_UP BUTTON_UP |
54 | #define ZX_DOWN BUTTON_DOWN | 54 | #define ZX_DOWN BUTTON_DOWN |
55 | 55 | ||
56 | #elif CONFIG_KEYPAD == GMINI100_PAD | ||
57 | #define ZX_SELECT BUTTON_PLAY | ||
58 | #define ZX_MENU BUTTON_OFF | ||
59 | #define ZX_LEFT BUTTON_LEFT | ||
60 | #define ZX_RIGHT BUTTON_RIGHT | ||
61 | #define ZX_UP BUTTON_UP | ||
62 | #define ZX_DOWN BUTTON_DOWN | ||
63 | |||
64 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | 56 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD |
65 | #define ZX_SELECT BUTTON_SELECT | 57 | #define ZX_SELECT BUTTON_SELECT |
66 | #define ZX_MENU BUTTON_PLAY | 58 | #define ZX_MENU BUTTON_PLAY |
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index ea4abae618..4dcdc80110 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c | |||
@@ -40,14 +40,6 @@ | |||
40 | #define KBD_UP BUTTON_UP | 40 | #define KBD_UP BUTTON_UP |
41 | #define KBD_DOWN BUTTON_DOWN | 41 | #define KBD_DOWN BUTTON_DOWN |
42 | 42 | ||
43 | #elif CONFIG_KEYPAD == GMINI100_PAD | ||
44 | #define KBD_SELECT BUTTON_PLAY | ||
45 | #define KBD_ABORT BUTTON_OFF | ||
46 | #define KBD_LEFT BUTTON_LEFT | ||
47 | #define KBD_RIGHT BUTTON_RIGHT | ||
48 | #define KBD_UP BUTTON_UP | ||
49 | #define KBD_DOWN BUTTON_DOWN | ||
50 | |||
51 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 43 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) |
52 | 44 | ||
53 | #define KBD_SELECT BUTTON_SELECT | 45 | #define KBD_SELECT BUTTON_SELECT |