From 780f79e7a4028a57e4bf591539a540dbfae2496d Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Fri, 10 Nov 2006 20:26:01 +0000 Subject: Removed the Gmini 120 and Gmini SP code. These ports are dead, unfortunately. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11504 a1c6a512-1295-4272-9138-f99709370657 --- apps/debug_menu.c | 43 ++++++++--------------------------------- apps/gui/gwps.h | 18 ----------------- apps/menu.h | 7 ------- apps/plugins/zxbox/keymaps.h | 8 -------- apps/plugins/zxbox/zxbox_keyb.c | 8 -------- 5 files changed, 8 insertions(+), 76 deletions(-) (limited to 'apps') 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) #endif /* HAVE_LCD_BITMAP */ -#if CONFIG_CPU == TCC730 -static unsigned flash_word_temp IDATA_ATTR; - -static void flash_write_word(unsigned addr, unsigned value) ICODE_ATTR; -static void flash_write_word(unsigned addr, unsigned value) { - flash_word_temp = value; - - long extAddr = (long)addr << 1; - ddma_transfer(1, 1, &flash_word_temp, extAddr, 2); -} - -static unsigned flash_read_word(unsigned addr) ICODE_ATTR; -static unsigned flash_read_word(unsigned addr) { - long extAddr = (long)addr << 1; - ddma_transfer(1, 1, &flash_word_temp, extAddr, 2); - return flash_word_temp; -} - -#endif - #ifndef SIMULATOR /* Tool function to read the flash manufacturer and type, if available. 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, #else unsigned not_manu, not_id; /* read values before switching to ID mode */ unsigned manu, id; /* read values when in ID mode */ -#if CONFIG_CPU == TCC730 -#define FLASH(addr) (flash_read_word(addr)) -#define SET_FLASH(addr, val) (flash_write_word((addr), (val))) -#else /* memory mapped */ #if CONFIG_CPU == SH7034 volatile unsigned char* flash = (unsigned char*)0x2000000; /* flash mapping */ #elif defined(CPU_COLDFIRE) volatile unsigned short* flash = (unsigned short*)0; /* flash mapping */ -#endif -#define FLASH(addr) (flash[addr]) -#define SET_FLASH(addr, val) (flash[addr] = val) #endif int old_level; /* saved interrupt level */ - not_manu = FLASH(0); /* read the normal content */ - not_id = FLASH(1); /* should be 'A' (0x41) and 'R' (0x52) from the "ARCH" marker */ + not_manu = flash[0]; /* read the normal content */ + not_id = flash[1]; /* should be 'A' (0x41) and 'R' (0x52) from the "ARCH" marker */ /* disable interrupts, prevent any stray flash access */ old_level = set_irq_level(HIGHEST_IRQ_LEVEL); - SET_FLASH(addr1, 0xAA); /* enter command mode */ - SET_FLASH(addr2, 0x55); - SET_FLASH(addr1, 0x90); /* ID command */ + flash[addr1] = 0xAA; /* enter command mode */ + flash[addr2] = 0x55; + flash[addr1] = 0x90; /* ID command */ /* Atmel wants 20ms pause here */ /* sleep(HZ/50); no sleeping possible while interrupts are disabled */ - manu = FLASH(0); /* read the IDs */ - id = FLASH(1); + manu = flash[0]; /* read the IDs */ + id = flash[1]; - SET_FLASH(0, 0xF0); /* reset flash (back to normal read mode) */ + flash[0] = 0xF0; /* reset flash (back to normal read mode) */ /* Atmel wants 20ms pause here */ /* sleep(HZ/50); no sleeping possible while interrupts are disabled */ 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 @@ #define WPS_EXIT (BUTTON_OFF | BUTTON_REPEAT) #define WPS_CONTEXT (BUTTON_MENU | BUTTON_REPEAT) -#elif CONFIG_KEYPAD == GMINI100_PAD -#define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) -#define WPS_NEXT_PRE BUTTON_RIGHT -#define WPS_PREV (BUTTON_LEFT | BUTTON_REL) -#define WPS_PREV_PRE BUTTON_LEFT -#define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT) -#define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT) -#define WPS_INCVOL BUTTON_UP -#define WPS_DECVOL BUTTON_DOWN -#define WPS_PAUSE BUTTON_PLAY -#define WPS_MENU (BUTTON_MENU | BUTTON_REL) -#define WPS_MENU_PRE BUTTON_MENU -#define WPS_BROWSE (BUTTON_ON | BUTTON_REL) -#define WPS_BROWSE_PRE BUTTON_ON -#define WPS_EXIT BUTTON_OFF -#define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN) -#define WPS_ID3 (BUTTON_MENU | BUTTON_ON) - #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) /* 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 @@ #define MENU_EXIT_MENU BUTTON_MENU #define MENU_ENTER BUTTON_RIGHT -#elif CONFIG_KEYPAD == GMINI100_PAD -#define MENU_EXIT BUTTON_LEFT -#define MENU_EXIT2 BUTTON_OFF -#define MENU_EXIT_MENU BUTTON_MENU -#define MENU_ENTER BUTTON_RIGHT -#define MENU_ENTER2 BUTTON_PLAY - #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) /* 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 @@ #define ZX_UP BUTTON_UP #define ZX_DOWN BUTTON_DOWN -#elif CONFIG_KEYPAD == GMINI100_PAD -#define ZX_SELECT BUTTON_PLAY -#define ZX_MENU BUTTON_OFF -#define ZX_LEFT BUTTON_LEFT -#define ZX_RIGHT BUTTON_RIGHT -#define ZX_UP BUTTON_UP -#define ZX_DOWN BUTTON_DOWN - #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD #define ZX_SELECT BUTTON_SELECT #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 @@ #define KBD_UP BUTTON_UP #define KBD_DOWN BUTTON_DOWN -#elif CONFIG_KEYPAD == GMINI100_PAD -#define KBD_SELECT BUTTON_PLAY -#define KBD_ABORT BUTTON_OFF -#define KBD_LEFT BUTTON_LEFT -#define KBD_RIGHT BUTTON_RIGHT -#define KBD_UP BUTTON_UP -#define KBD_DOWN BUTTON_DOWN - #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) #define KBD_SELECT BUTTON_SELECT -- cgit v1.2.3