From 3ba2f6e5c7383c5d7a6f8a1c38b6b5403a8a5dcb Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Fri, 23 Apr 2021 11:09:49 -0400 Subject: Nuke all TCC77x targets: iAudio 7, Sansa C100, M200(v1-3), Logik DAX They were never finished, never saw any release ever, and haven't compiled for the better part of a decade. Given their HW capabilities [1], they are not worth trying to fix. [1] 1-2MB RAM, ~256MB onboard flash, no expandability Change-Id: I7b2a5806d687114c22156bb0458d4a10a9734190 --- apps/plugins/battery_bench.c | 7 ------- apps/plugins/calculator.c | 13 ------------- apps/plugins/chessclock.c | 11 ----------- apps/plugins/chopper.c | 6 ------ apps/plugins/clix.c | 8 -------- apps/plugins/cube.c | 10 ---------- apps/plugins/doom/i_video.c | 10 ---------- apps/plugins/imageviewer/imageviewer_button.h | 11 ----------- apps/plugins/invadrox.c | 7 ------- apps/plugins/jewels.c | 10 ---------- apps/plugins/lib/pluginlib_actions.c | 15 --------------- apps/plugins/midi/midiplay.c | 8 -------- apps/plugins/mp3_encoder.c | 6 ------ apps/plugins/mpegplayer/mpeg_settings.c | 8 -------- apps/plugins/mpegplayer/mpegplayer.c | 9 --------- apps/plugins/pacbox/pacbox.h | 12 ------------ apps/plugins/pictureflow/pictureflow.c | 8 ++------ apps/plugins/plugin.lds | 12 ++++++------ apps/plugins/pong.c | 8 -------- apps/plugins/reversi/reversi-gui.h | 9 --------- apps/plugins/rockblox.c | 11 ----------- apps/plugins/sokoban.c | 14 -------------- apps/plugins/stopwatch.c | 9 --------- apps/plugins/sudoku/sudoku.h | 10 ---------- apps/plugins/text_viewer/tv_button.h | 12 ------------ apps/plugins/xobox.c | 9 --------- apps/plugins/zxbox/keymaps.h | 8 -------- apps/plugins/zxbox/zxbox_keyb.c | 9 --------- 28 files changed, 8 insertions(+), 262 deletions(-) (limited to 'apps/plugins') diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index f8269f5c3b..d9c5eae516 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c @@ -141,13 +141,6 @@ #define BATTERY_OFF BUTTON_POWER #define BATTERY_OFF_TXT "POWER" -#elif CONFIG_KEYPAD == IAUDIO67_PAD - -#define BATTERY_OFF BUTTON_POWER -#define BATTERY_OFF_TXT "POWER" -#define BATTERY_ON BUTTON_PLAY -#define BATTERY_ON_TXT "PLAY - start" - #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define BATTERY_ON BUTTON_PLAY #define BATTERY_ON_TXT "PLAY - start" diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 4d1b6fa594..ebf7098d65 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c @@ -269,19 +269,6 @@ F3: equal to "=" #define CALCULATOR_QUIT BUTTON_POWER #define CALCULATOR_CLEAR BUTTON_MENU -#elif CONFIG_KEYPAD == IAUDIO67_PAD - -#define CALCULATOR_LEFT BUTTON_LEFT -#define CALCULATOR_RIGHT BUTTON_RIGHT -#define CALCULATOR_UP BUTTON_VOLUP -#define CALCULATOR_DOWN BUTTON_VOLDOWN -#define CALCULATOR_QUIT BUTTON_POWER -#define CALCULATOR_INPUT BUTTON_PLAY -#define CALCULATOR_CALC BUTTON_MENU -#define CALCULATOR_CLEAR BUTTON_STOP - -#define CALCULATOR_RC_QUIT (BUTTON_MENU|BUTTON_PLAY) - #elif (CONFIG_KEYPAD == CREATIVEZVM_PAD) #define CALCULATOR_LEFT BUTTON_LEFT diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 9a30dee984..79daf0987c 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c @@ -157,17 +157,6 @@ #define CHC_SETTINGS_DEC BUTTON_MINUS #define CHC_SETTINGS_CANCEL BUTTON_POWER -#elif CONFIG_KEYPAD == IAUDIO67_PAD -#define CHC_QUIT BUTTON_POWER -#define CHC_STARTSTOP BUTTON_PLAY -#define CHC_RESET BUTTON_LEFT -#define CHC_MENU BUTTON_MENU -#define CHC_SETTINGS_INC BUTTON_VOLUP -#define CHC_SETTINGS_DEC BUTTON_VOLDOWN -#define CHC_SETTINGS_OK BUTTON_PLAY -#define CHC_SETTINGS_OK2 BUTTON_LEFT -#define CHC_SETTINGS_CANCEL BUTTON_POWER - #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define CHC_QUIT BUTTON_BACK #define CHC_STARTSTOP BUTTON_PLAY diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index ab8f7b5540..70763a1b67 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c @@ -108,12 +108,6 @@ Still To do: #define QUIT BUTTON_POWER #define ACTION2 BUTTON_PLUS -#elif CONFIG_KEYPAD == IAUDIO67_PAD -#define QUIT BUTTON_POWER -#define ACTION BUTTON_PLAY -#define ACTION2 BUTTON_STOP -#define ACTIONTEXT "PLAY" - #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define QUIT BUTTON_BACK #define ACTION BUTTON_UP diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c index f1f21f6312..c127a300f2 100644 --- a/apps/plugins/clix.c +++ b/apps/plugins/clix.c @@ -100,14 +100,6 @@ #define CLIX_BUTTON_UP BUTTON_SCROLL_UP #define CLIX_BUTTON_DOWN BUTTON_SCROLL_DOWN -#elif CONFIG_KEYPAD == IAUDIO67_PAD -#define CLIX_BUTTON_QUIT BUTTON_POWER -#define CLIX_BUTTON_LEFT BUTTON_LEFT -#define CLIX_BUTTON_RIGHT BUTTON_RIGHT -#define CLIX_BUTTON_CLICK BUTTON_PLAY -#define CLIX_BUTTON_UP BUTTON_STOP -#define CLIX_BUTTON_DOWN BUTTON_PLAY - #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD #define CLIX_BUTTON_QUIT BUTTON_POWER #define CLIX_BUTTON_LEFT BUTTON_LEFT diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 6587fdcb65..cb9d67ec35 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c @@ -171,16 +171,6 @@ #elif CONFIG_KEYPAD == COWON_D2_PAD #define CUBE_QUIT BUTTON_POWER -#elif (CONFIG_KEYPAD == IAUDIO67_PAD) -#define CUBE_QUIT BUTTON_POWER -#define CUBE_NEXT BUTTON_RIGHT -#define CUBE_PREV BUTTON_LEFT -#define CUBE_INC BUTTON_VOLUP -#define CUBE_DEC BUTTON_VOLDOWN -#define CUBE_MODE BUTTON_MENU -#define CUBE_PAUSE BUTTON_PLAY -#define CUBE_HIGHSPEED BUTTON_STOP - #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define CUBE_QUIT BUTTON_BACK #define CUBE_NEXT BUTTON_RIGHT diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index bb04194acc..2381a7614d 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c @@ -316,16 +316,6 @@ void I_ShutdownGraphics(void) #define DOOMBUTTON_ENTER BUTTON_MENU #define DOOMBUTTON_WEAPON BUTTON_DISPLAY -#elif CONFIG_KEYPAD == IAUDIO67_PAD -#define DOOMBUTTON_ESC BUTTON_POWER -#define DOOMBUTTON_UP BUTTON_STOP -#define DOOMBUTTON_DOWN BUTTON_PLAY -#define DOOMBUTTON_LEFT BUTTON_LEFT -#define DOOMBUTTON_RIGHT BUTTON_RIGHT -#define DOOMBUTTON_SHOOT BUTTON_VOLUP -#define DOOMBUTTON_OPEN BUTTON_VOLDOWN -#define DOOMBUTTON_ENTER BUTTON_MENU - #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h index cfb9a2969b..d588de95ca 100644 --- a/apps/plugins/imageviewer/imageviewer_button.h +++ b/apps/plugins/imageviewer/imageviewer_button.h @@ -207,17 +207,6 @@ #elif CONFIG_KEYPAD == COWON_D2_PAD -#elif CONFIG_KEYPAD == IAUDIO67_PAD -#define IMGVIEW_ZOOM_IN BUTTON_VOLUP -#define IMGVIEW_ZOOM_OUT BUTTON_VOLDOWN -#define IMGVIEW_UP BUTTON_STOP -#define IMGVIEW_DOWN BUTTON_PLAY -#define IMGVIEW_LEFT BUTTON_LEFT -#define IMGVIEW_RIGHT BUTTON_RIGHT -#define IMGVIEW_NEXT (BUTTON_PLAY|BUTTON_VOLUP) -#define IMGVIEW_PREVIOUS (BUTTON_PLAY|BUTTON_VOLDOWN) -#define IMGVIEW_MENU BUTTON_MENU - #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define IMGVIEW_ZOOM_IN BUTTON_PLAY diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index 8b0519d9d0..c28ab7e830 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c @@ -163,13 +163,6 @@ #define RIGHT BUTTON_PLUS #define FIRE BUTTON_MENU -#elif CONFIG_KEYPAD == IAUDIO67_PAD - -#define QUIT BUTTON_POWER -#define LEFT BUTTON_LEFT -#define RIGHT BUTTON_RIGHT -#define FIRE BUTTON_PLAY - #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define QUIT BUTTON_BACK diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 83a44eea02..af0189e9db 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c @@ -201,16 +201,6 @@ CONFIG_KEYPAD == SANSA_M200_PAD #define JEWELS_CANCEL BUTTON_POWER #define HK_CANCEL "POWER" -#elif CONFIG_KEYPAD == IAUDIO67_PAD -#define JEWELS_UP BUTTON_STOP -#define JEWELS_DOWN BUTTON_PLAY -#define JEWELS_LEFT BUTTON_LEFT -#define JEWELS_RIGHT BUTTON_RIGHT -#define JEWELS_SELECT BUTTON_MENU -#define JEWELS_CANCEL BUTTON_POWER -#define HK_SELECT "MENU" -#define HK_CANCEL "POWER" - #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define JEWELS_UP BUTTON_UP #define JEWELS_DOWN BUTTON_DOWN diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index b1bcd06ee6..907cb3ee42 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c @@ -161,15 +161,6 @@ const struct button_mapping pla_main_ctx[] = { PLA_DOWN_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { PLA_LEFT_REPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, { PLA_RIGHT_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, -#elif (CONFIG_KEYPAD == IAUDIO67_PAD) - { PLA_UP, BUTTON_STOP, BUTTON_NONE }, - { PLA_DOWN, BUTTON_PLAY, BUTTON_NONE }, - { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE }, - { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, - { PLA_UP_REPEAT, BUTTON_STOP|BUTTON_REPEAT, BUTTON_NONE }, - { PLA_DOWN_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, - { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, #elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD) { PLA_UP, BUTTON_UP, BUTTON_NONE}, { PLA_DOWN, BUTTON_DOWN, BUTTON_NONE}, @@ -394,12 +385,6 @@ const struct button_mapping pla_main_ctx[] = {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, -#elif (CONFIG_KEYPAD == IAUDIO67_PAD) - {PLA_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER}, - {PLA_EXIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE}, - {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, - {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, - {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT BUTTON_NONE}, #elif (CONFIG_KEYPAD == CREATIVEZVM_PAD) {PLA_CANCEL, BUTTON_BACK|BUTTON_REL, BUTTON_BACK}, {PLA_EXIT, BUTTON_BACK|BUTTON_REPEAT, BUTTON_NONE}, diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c index f07cdd4dcf..a28d1d3862 100644 --- a/apps/plugins/midi/midiplay.c +++ b/apps/plugins/midi/midiplay.c @@ -140,14 +140,6 @@ #elif CONFIG_KEYPAD == COWON_D2_PAD #define MIDI_QUIT BUTTON_POWER -#elif CONFIG_KEYPAD == IAUDIO67_PAD -#define MIDI_QUIT BUTTON_POWER -#define MIDI_FFWD BUTTON_RIGHT -#define MIDI_REWIND BUTTON_LEFT -#define MIDI_VOL_UP BUTTON_STOP -#define MIDI_VOL_DOWN BUTTON_PLAY -#define MIDI_PLAYPAUSE BUTTON_MENU - #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define MIDI_QUIT BUTTON_BACK #define MIDI_FFWD BUTTON_RIGHT diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index 7c5084529b..db10185c91 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c @@ -2443,12 +2443,6 @@ static void get_mp3_filename(const char *wav_name) #elif CONFIG_KEYPAD == COWON_D2_PAD #define MP3ENC_DONE BUTTON_POWER -#elif CONFIG_KEYPAD == IAUDIO67_PAD -#define MP3ENC_PREV BUTTON_LEFT -#define MP3ENC_NEXT BUTTON_RIGHT -#define MP3ENC_DONE BUTTON_POWER -#define MP3ENC_SELECT BUTTON_PLAY - #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define MP3ENC_PREV BUTTON_UP #define MP3ENC_NEXT BUTTON_DOWN diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index d59797eaa7..505f3aa33d 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c @@ -142,14 +142,6 @@ struct mpeg_settings settings; #elif CONFIG_KEYPAD == COWON_D2_PAD #define MPEG_START_TIME_EXIT BUTTON_POWER -#elif CONFIG_KEYPAD == IAUDIO67_PAD -#define MPEG_START_TIME_SELECT BUTTON_MENU -#define MPEG_START_TIME_LEFT BUTTON_LEFT -#define MPEG_START_TIME_RIGHT BUTTON_RIGHT -#define MPEG_START_TIME_UP BUTTON_STOP -#define MPEG_START_TIME_DOWN BUTTON_PLAY -#define MPEG_START_TIME_EXIT BUTTON_POWER - #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define MPEG_START_TIME_SELECT BUTTON_SELECT #define MPEG_START_TIME_LEFT BUTTON_LEFT diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 6b18e4fa3a..34eafd5d9c 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c @@ -254,15 +254,6 @@ CONFIG_KEYPAD == SANSA_M200_PAD #define MPEG_VOLDOWN BUTTON_MINUS #define MPEG_VOLUP BUTTON_PLUS -#elif CONFIG_KEYPAD == IAUDIO67_PAD -#define MPEG_MENU BUTTON_MENU -#define MPEG_STOP BUTTON_STOP -#define MPEG_PAUSE BUTTON_PLAY -#define MPEG_VOLDOWN BUTTON_VOLDOWN -#define MPEG_VOLUP BUTTON_VOLUP -#define MPEG_RW BUTTON_LEFT -#define MPEG_FF BUTTON_RIGHT - #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define MPEG_MENU BUTTON_MENU #define MPEG_STOP BUTTON_BACK diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index c1a1c6b9e5..a3d42b099c 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h @@ -169,18 +169,6 @@ #define PACMAN_MENU (BUTTON_MENU|BUTTON_REL) -#elif CONFIG_KEYPAD == IAUDIO67_PAD - -#define PACMAN_UP BUTTON_STOP -#define PACMAN_DOWN BUTTON_PLAY -#define PACMAN_LEFT BUTTON_LEFT -#define PACMAN_RIGHT BUTTON_RIGHT -#define PACMAN_1UP BUTTON_VOLDOWN -#define PACMAN_2UP BUTTON_VOLUP -#define PACMAN_COIN_PRE BUTTON_MENU -#define PACMAN_COIN (BUTTON_MENU | BUTTON_PLAY) -#define PACMAN_MENU BUTTON_POWER - #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define PACMAN_UP BUTTON_UP diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index 42930f0ff6..8f59695127 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c @@ -103,10 +103,8 @@ const struct button_mapping pf_context_buttons[] = {PF_SELECT, BUTTON_CENTER, BUTTON_NONE}, {PF_BACK, BUTTON_BOTTOMRIGHT, BUTTON_NONE}, #endif -#if CONFIG_KEYPAD == SANSA_C100_PAD - {PF_QUIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU}, -#elif CONFIG_KEYPAD == CREATIVEZV_PAD || CONFIG_KEYPAD == CREATIVEZVM_PAD || \ - CONFIG_KEYPAD == PHILIPS_HDD1630_PAD || CONFIG_KEYPAD == IAUDIO67_PAD || \ +#if CONFIG_KEYPAD == CREATIVEZV_PAD || CONFIG_KEYPAD == CREATIVEZVM_PAD || \ + CONFIG_KEYPAD == PHILIPS_HDD1630_PAD || \ CONFIG_KEYPAD == GIGABEAT_PAD || CONFIG_KEYPAD == GIGABEAT_S_PAD || \ CONFIG_KEYPAD == MROBE100_PAD || CONFIG_KEYPAD == MROBE500_PAD || \ CONFIG_KEYPAD == PHILIPS_SA9200_PAD || CONFIG_KEYPAD == SANSA_CLIP_PAD || \ @@ -137,8 +135,6 @@ const struct button_mapping pf_context_buttons[] = || (CONFIG_KEYPAD == IPOD_4G_PAD) \ || (CONFIG_KEYPAD == MPIO_HD300_PAD) {PF_QUIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU}, -#elif CONFIG_KEYPAD == LOGIK_DAX_PAD - {PF_QUIT, BUTTON_POWERPLAY|BUTTON_REPEAT, BUTTON_POWERPLAY}, #elif CONFIG_KEYPAD == IAUDIO_M3_PAD {PF_QUIT, BUTTON_RC_REC, BUTTON_NONE}, #elif CONFIG_KEYPAD == MEIZU_M6SL_PAD diff --git a/apps/plugins/plugin.lds b/apps/plugins/plugin.lds index 5931b6b0a5..7033d023f3 100644 --- a/apps/plugins/plugin.lds +++ b/apps/plugins/plugin.lds @@ -54,7 +54,7 @@ OUTPUT_FORMAT(elf32-littlemips) #elif CONFIG_CPU==S3C2440 #include "cpu.h" /* must be 16Kb (0x4000) aligned */ -#define TTB_SIZE (0x4000) +#define TTB_SIZE (0x4000) #define DRAMSIZE (MEMORYSIZE * 0x100000) - STUBOFFSET - PLUGIN_BUFFER_SIZE - CODEC_SIZE - LCD_BUFFER_SIZE - TTB_SIZE #elif CONFIG_CPU==TCC7801 @@ -127,7 +127,7 @@ OUTPUT_FORMAT(elf32-littlemips) /* The bit of IRAM that is available is used in the core */ #define IRAMSIZE 0 -#elif defined(CPU_TCC780X) || defined(CPU_TCC77X) +#elif defined(CPU_TCC780X) #define DRAMORIG 0x20000000 #if CONFIG_CPU==TCC7801 #define IRAMORIG 0x1000c000 @@ -272,7 +272,7 @@ SECTIONS *(.idata) #endif } > PLUGIN_RAM - + #if NOCACHE_BASE != 0 .ncdata . + NOCACHE_BASE : { @@ -281,7 +281,7 @@ SECTIONS . = ALIGN(CACHEALIGN_SIZE); /* EABI currently needs these defined here, otherwise .iram and .bss can sometimes have an incorrect load address, breaking codecs and plugins. */ - bssaddr = . - NOCACHE_BASE; + bssaddr = . - NOCACHE_BASE; #if defined(IRAMSIZE) && IRAMSIZE != 0 iramcopy = . - NOCACHE_BASE; #endif @@ -314,7 +314,7 @@ SECTIONS *(COMMON) . = ALIGN(0x4); } > PLUGIN_RAM - + #if NOCACHE_BASE != 0 .ncbss . + NOCACHE_BASE (NOLOAD) : { @@ -354,7 +354,7 @@ SECTIONS . = ALIGN(0x4); iend = .; } > PLUGIN_IRAM - + loadendaddr = MAX(plugin_end_addr, LOADADDR(.iram) + SIZEOF(.iram)); #else loadendaddr = plugin_end_addr; diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index b06789af6b..22484d0bc9 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c @@ -139,14 +139,6 @@ #elif (CONFIG_KEYPAD == COWON_D2_PAD) #define PONG_QUIT BUTTON_POWER -#elif CONFIG_KEYPAD == IAUDIO67_PAD -#define PONG_QUIT BUTTON_POWER -#define PONG_PAUSE BUTTON_MENU -#define PONG_LEFT_UP BUTTON_VOLUP -#define PONG_LEFT_DOWN BUTTON_VOLDOWN -#define PONG_RIGHT_UP BUTTON_RIGHT -#define PONG_RIGHT_DOWN BUTTON_LEFT - #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define PONG_QUIT BUTTON_BACK #define PONG_LEFT_UP BUTTON_UP diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h index fd60b23927..7e031e6103 100644 --- a/apps/plugins/reversi/reversi-gui.h +++ b/apps/plugins/reversi/reversi-gui.h @@ -136,15 +136,6 @@ #define REVERSI_BUTTON_QUIT BUTTON_POWER #define REVERSI_BUTTON_MENU BUTTON_MENU -#elif CONFIG_KEYPAD == IAUDIO67_PAD -#define REVERSI_BUTTON_QUIT BUTTON_POWER -#define REVERSI_BUTTON_UP BUTTON_STOP -#define REVERSI_BUTTON_DOWN BUTTON_PLAY -#define REVERSI_BUTTON_LEFT BUTTON_LEFT -#define REVERSI_BUTTON_RIGHT BUTTON_RIGHT -#define REVERSI_BUTTON_MAKE_MOVE BUTTON_VOLUP -#define REVERSI_BUTTON_MENU BUTTON_MENU - #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define REVERSI_BUTTON_QUIT BUTTON_BACK #define REVERSI_BUTTON_UP BUTTON_UP diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index 9c36f8f62f..e85c6a5eab 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c @@ -205,17 +205,6 @@ #define ROCKBLOX_OFF BUTTON_POWER #define ROCKBLOX_RESTART BUTTON_MENU -#elif CONFIG_KEYPAD == IAUDIO67_PAD - -#define ROCKBLOX_OFF BUTTON_POWER -#define ROCKBLOX_ROTATE_CCW BUTTON_VOLDOWN -#define ROCKBLOX_ROTATE_CW BUTTON_VOLUP -#define ROCKBLOX_DOWN BUTTON_STOP -#define ROCKBLOX_LEFT BUTTON_LEFT -#define ROCKBLOX_RIGHT BUTTON_RIGHT -#define ROCKBLOX_DROP BUTTON_PLAY -#define ROCKBLOX_RESTART BUTTON_MENU - #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define ROCKBLOX_OFF BUTTON_BACK #define ROCKBLOX_ROTATE_CCW BUTTON_UP diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 9d57d7428c..41c671a38c 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c @@ -312,20 +312,6 @@ #define SOKOBAN_LEVEL_UP BUTTON_PLUS #define SOKOBAN_MENU_NAME "[MENU]" -#elif CONFIG_KEYPAD == IAUDIO67_PAD -#define SOKOBAN_LEFT BUTTON_LEFT -#define SOKOBAN_RIGHT BUTTON_RIGHT -#define SOKOBAN_UP BUTTON_STOP -#define SOKOBAN_DOWN BUTTON_PLAY -#define SOKOBAN_MENU BUTTON_MENU -#define SOKOBAN_UNDO BUTTON_VOLDOWN -#define SOKOBAN_REDO BUTTON_VOLUP -#define SOKOBAN_PAUSE (BUTTON_MENU|BUTTON_LEFT) -#define BUTTON_SAVE (BUTTON_MENU|BUTTON_PLAY) -#define BUTTON_SAVE_NAME "MENU+PLAY" - -#define SOKOBAN_RC_MENU (BUTTON_MENU|BUTTON_STOP) - #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define SOKOBAN_LEFT BUTTON_LEFT #define SOKOBAN_RIGHT BUTTON_RIGHT diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index 5259d0d616..c5ecfd7a8a 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c @@ -133,15 +133,6 @@ #elif CONFIG_KEYPAD == COWON_D2_PAD #define STOPWATCH_QUIT BUTTON_POWER -#elif CONFIG_KEYPAD == IAUDIO67_PAD -#define STOPWATCH_QUIT BUTTON_MENU -#define STOPWATCH_START_STOP BUTTON_PLAY -#define STOPWATCH_RESET_TIMER BUTTON_STOP -#define STOPWATCH_LAP_TIMER BUTTON_LEFT -#define STOPWATCH_SCROLL_UP BUTTON_VOLUP -#define STOPWATCH_SCROLL_DOWN BUTTON_VOLDOWN -#define STOPWATCH_RC_QUIT BUTTON_POWER - #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define STOPWATCH_QUIT BUTTON_BACK #define STOPWATCH_START_STOP BUTTON_PLAY diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 6ee3eb33ee..1332a9a80f 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h @@ -181,16 +181,6 @@ #define SUDOKU_BUTTON_QUIT BUTTON_POWER #define SUDOKU_BUTTON_MENU BUTTON_MENU -#elif CONFIG_KEYPAD == IAUDIO67_PAD -#define SUDOKU_BUTTON_QUIT BUTTON_POWER -#define SUDOKU_BUTTON_UP BUTTON_STOP -#define SUDOKU_BUTTON_DOWN BUTTON_PLAY -#define SUDOKU_BUTTON_LEFT BUTTON_LEFT -#define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT -#define SUDOKU_BUTTON_TOGGLE BUTTON_VOLUP -#define SUDOKU_BUTTON_MENU BUTTON_MENU -#define SUDOKU_BUTTON_POSSIBLE BUTTON_VOLDOWN - #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define SUDOKU_BUTTON_QUIT BUTTON_BACK #define SUDOKU_BUTTON_UP BUTTON_UP diff --git a/apps/plugins/text_viewer/tv_button.h b/apps/plugins/text_viewer/tv_button.h index bea8f829ef..26bfb7a464 100644 --- a/apps/plugins/text_viewer/tv_button.h +++ b/apps/plugins/text_viewer/tv_button.h @@ -247,18 +247,6 @@ #define TV_SCROLL_DOWN BUTTON_PLUS #define TV_BOOKMARK (BUTTON_MENU|BUTTON_PLUS) -/* Cowon iAudio 7 keys */ -#elif CONFIG_KEYPAD == IAUDIO67_PAD -#define TV_QUIT BUTTON_POWER -#define TV_SCROLL_UP BUTTON_VOLUP -#define TV_SCROLL_DOWN BUTTON_VOLDOWN -#define TV_SCREEN_LEFT BUTTON_LEFT -#define TV_SCREEN_RIGHT BUTTON_RIGHT -#define TV_MENU BUTTON_MENU -#define TV_AUTOSCROLL BUTTON_PLAY -#define TV_RC_QUIT BUTTON_STOP -#define TV_BOOKMARK (BUTTON_LEFT|BUTTON_PLAY) - /* Creative Zen Vision:M keys */ #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define TV_QUIT BUTTON_BACK diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index 36aae071cb..cf959ad7f5 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c @@ -146,15 +146,6 @@ #define QUIT BUTTON_POWER -#elif CONFIG_KEYPAD == IAUDIO67_PAD - -#define QUIT BUTTON_POWER -#define LEFT BUTTON_LEFT -#define RIGHT BUTTON_RIGHT -#define UP BUTTON_STOP -#define DOWN BUTTON_PLAY -#define PAUSE BUTTON_MENU - #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define QUIT BUTTON_BACK diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index dbebc3b1d9..1dcb9c9034 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h @@ -110,14 +110,6 @@ #elif CONFIG_KEYPAD == COWON_D2_PAD #define ZX_MENU (BUTTON_MENU|BUTTON_REL) -#elif CONFIG_KEYPAD == IAUDIO67_PAD -#define ZX_UP BUTTON_STOP -#define ZX_DOWN BUTTON_PLAY -#define ZX_LEFT BUTTON_LEFT -#define ZX_RIGHT BUTTON_RIGHT -#define ZX_SELECT BUTTON_VOLUP -#define ZX_MENU BUTTON_MENU - #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define ZX_UP BUTTON_UP #define ZX_DOWN BUTTON_DOWN diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index 63f74c7664..1028836351 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c @@ -113,15 +113,6 @@ #define KBD_ABORT BUTTON_POWER -#elif CONFIG_KEYPAD == IAUDIO67_PAD - -#define KBD_SELECT BUTTON_MENU -#define KBD_ABORT BUTTON_POWER -#define KBD_LEFT BUTTON_LEFT -#define KBD_RIGHT BUTTON_RIGHT -#define KBD_UP BUTTON_STOP -#define KBD_DOWN BUTTON_PLAY - #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define KBD_SELECT BUTTON_SELECT -- cgit v1.2.3