From 7d0d32dbc65a8332a49aeed3a97e24cb109958b2 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Fri, 23 Apr 2021 11:31:58 -0400 Subject: Nuke the never-functional iriver ifp-7xx port It never worked, and hasn't compiled in something like a decade, Given the HW capabilities (limited onboard flash, no expandability) there's really no point in trying to fix/complete it. Change-Id: I7d175089840396f8891645bd10010d730dd5bfdc --- apps/SOURCES | 2 - apps/keymaps/keymap-ifp7xx.c | 185 --------------------------------- apps/lang/english.lang | 3 - apps/plugins/battery_bench.c | 7 -- apps/plugins/blackjack.c | 16 --- apps/plugins/calendar.c | 10 -- apps/plugins/chessbox/chessbox_pgn.h | 14 --- apps/plugins/chessclock.c | 10 -- apps/plugins/cube.c | 10 -- apps/plugins/fractals/fractal.h | 14 --- apps/plugins/greyscale.c | 8 -- apps/plugins/jewels.c | 10 -- apps/plugins/lib/grey_core.c | 1 - apps/plugins/lib/pluginlib_actions.c | 7 -- apps/plugins/pegbox.c | 17 --- apps/plugins/pictureflow/pictureflow.c | 2 - apps/plugins/rockblox.c | 11 -- apps/plugins/rockboy/rockboy.c | 10 -- apps/plugins/stopwatch.c | 8 -- apps/plugins/text_viewer/tv_button.h | 11 -- apps/plugins/zxbox/keymaps.h | 8 -- apps/plugins/zxbox/zxbox_keyb.c | 11 -- 22 files changed, 375 deletions(-) delete mode 100644 apps/keymaps/keymap-ifp7xx.c (limited to 'apps') diff --git a/apps/SOURCES b/apps/SOURCES index 6c13945904..5c49f0bbbc 100644 --- a/apps/SOURCES +++ b/apps/SOURCES @@ -197,8 +197,6 @@ keymaps/keymap-gigabeat.c keymaps/keymap-gigabeat-s.c #elif CONFIG_KEYPAD == IRIVER_H10_PAD keymaps/keymap-h10.c -#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD -keymaps/keymap-ifp7xx.c #elif CONFIG_KEYPAD == SANSA_E200_PAD keymaps/keymap-e200.c #elif CONFIG_KEYPAD == SANSA_C200_PAD diff --git a/apps/keymaps/keymap-ifp7xx.c b/apps/keymaps/keymap-ifp7xx.c deleted file mode 100644 index c89b60e747..0000000000 --- a/apps/keymaps/keymap-ifp7xx.c +++ /dev/null @@ -1,185 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 Tomasz Malesinski - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -/* Button Code Definitions for iriver iFP7xx target */ - -#include "config.h" -#include "action.h" -#include "button.h" - -/* - * The format of the list is as follows - * { Action Code, Button code, Prereq button code } - * if there's no need to check the previous button's value, use BUTTON_NONE - * Insert LAST_ITEM_IN_LIST at the end of each mapping - */ -static const struct button_mapping button_context_standard[] = { - { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, - { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, - { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - - { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_STD_CANCEL, BUTTON_PLAY, BUTTON_NONE }, - { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT }, - - { ACTION_STD_QUICKSCREEN, BUTTON_MODE|BUTTON_REPEAT, BUTTON_MODE }, - { ACTION_STD_MENU, BUTTON_MODE|BUTTON_REL, BUTTON_MODE }, - { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, - { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, - - LAST_ITEM_IN_LIST -}; /* button_context_standard */ - -static const struct button_mapping button_context_wps[] = { - { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, - { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, - { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, - { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, - { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, - { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_PLAY|BUTTON_RIGHT, BUTTON_PLAY }, - { ACTION_WPS_ABSETA_PREVDIR, BUTTON_PLAY|BUTTON_LEFT, BUTTON_PLAY }, - { ACTION_WPS_STOP, BUTTON_EQ, BUTTON_NONE }, - { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, - { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, - { ACTION_WPS_QUICKSCREEN, BUTTON_MODE|BUTTON_REPEAT, BUTTON_MODE }, - { ACTION_WPS_MENU, BUTTON_MODE|BUTTON_REL, BUTTON_MODE }, - { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, - { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, - { ACTION_WPS_ABRESET, BUTTON_PLAY|BUTTON_SELECT, BUTTON_PLAY }, - { ACTION_WPS_HOTKEY, BUTTON_PLAY|BUTTON_MODE, BUTTON_PLAY }, - - LAST_ITEM_IN_LIST -}; /* button_context_wps */ - -static const struct button_mapping button_context_settings[] = { - { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, - { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, - { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; /* button_context_settings */ - -static const struct button_mapping button_context_settings_r_is_inc[] = { - { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, - { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, - { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; /* button_context_settingsgraphical */ - -static const struct button_mapping button_context_yesno[] = { - { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; /* button_context_settings_yesno */ - -static const struct button_mapping button_context_bmark[] = { - { ACTION_BMS_DELETE, BUTTON_MODE, BUTTON_NONE }, - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), -}; /* button_context_settings_bmark */ - -static const struct button_mapping button_context_quickscreen[] = { - { ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE }, - { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE }, - { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; /* button_context_quickscreen */ - -static const struct button_mapping button_context_pitchscreen[] = { - { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, - { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, - { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, - { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, - { ACTION_PS_RESET, BUTTON_MODE, BUTTON_NONE }, - { ACTION_PS_EXIT, BUTTON_PLAY, BUTTON_NONE }, - { ACTION_PS_SLOWER, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_PS_FASTER, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; /* button_context_pitchcreen */ - -static const struct button_mapping button_context_keyboard[] = { - { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, - { ACTION_KBD_DONE, BUTTON_MODE, BUTTON_NONE }, - { ACTION_KBD_ABORT, BUTTON_PLAY, BUTTON_NONE }, - { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, - { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, - { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - - LAST_ITEM_IN_LIST -}; /* button_context_keyboard */ - -/* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ -const struct button_mapping* get_context_mapping(int context) -{ - switch (context) - { - case CONTEXT_STD: - return button_context_standard; - case CONTEXT_WPS: - return button_context_wps; - case CONTEXT_CUSTOM|CONTEXT_SETTINGS: - case CONTEXT_SETTINGS_EQ: - case CONTEXT_SETTINGS_COLOURCHOOSER: - case CONTEXT_SETTINGS_TIME: - return button_context_settings_r_is_inc; - case CONTEXT_SETTINGS: - return button_context_settings; - case CONTEXT_YESNOSCREEN: - return button_context_yesno; - case CONTEXT_BOOKMARKSCREEN: - return button_context_bmark; - case CONTEXT_QUICKSCREEN: - return button_context_quickscreen; - case CONTEXT_PITCHSCREEN: - return button_context_pitchscreen; - case CONTEXT_KEYBOARD: - return button_context_keyboard; - } - return button_context_standard; -} diff --git a/apps/lang/english.lang b/apps/lang/english.lang index fd90817130..9cd31363c9 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang @@ -57,7 +57,6 @@ # H120/H140 iriverh120 # H320/H340 iriverh300 # H10 iriverh10 -# IFP 7XX iriverifp7xx # iaudio/Cowon # X5 iaudiox5 # M5 iaudiom5 @@ -6069,12 +6068,10 @@ *: "Battery: %d%% %dh %dm" ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm" - iriverifp7xx: "%d%% %dh %dm" *: "Battery: %d%% %dh %dm" ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm" - iriverifp7xx: "%d%% %dh %dm" *: "Battery level" diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index d9c5eae516..2534e3bebe 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c @@ -61,13 +61,6 @@ #define BATTERY_ON_TXT "SELECT - start" #define BATTERY_OFF_TXT "POWER" -#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD - -#define BATTERY_ON BUTTON_SELECT -#define BATTERY_OFF BUTTON_PLAY -#define BATTERY_ON_TXT "SELECT - start" -#define BATTERY_OFF_TXT "PLAY" - #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) || \ (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index 650eaf412a..4242f5a89f 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c @@ -104,22 +104,6 @@ enum { #define BJACK_RIGHT BUTTON_RIGHT #define BJACK_LEFT BUTTON_LEFT -#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD -#define BJACK_SELECT_NAME "MODE" -#define BJACK_STAY_NAME "MODE" -#define BJACK_QUIT_NAME "PLAY" -#define BJACK_DOUBLE_NAME "SELECT" -#define BJACK_SELECT BUTTON_MODE -#define BJACK_QUIT BUTTON_PLAY -#define BJACK_MAX (BUTTON_EQ|BUTTON_UP) -#define BJACK_MIN (BUTTON_EQ|BUTTON_DOWN) -#define BJACK_STAY BUTTON_MODE -#define BJACK_DOUBLEDOWN BUTTON_SELECT -#define BJACK_UP BUTTON_UP -#define BJACK_DOWN BUTTON_DOWN -#define BJACK_RIGHT BUTTON_RIGHT -#define BJACK_LEFT BUTTON_LEFT - #elif CONFIG_KEYPAD == GIGABEAT_PAD #define BJACK_SELECT_NAME "SELECT" #define BJACK_STAY_NAME "VOL-" diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index 54173fde1c..e7f221a3c9 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c @@ -68,16 +68,6 @@ #define CALENDAR_NEXT_MONTH BUTTON_VOL_DOWN #define CALENDAR_PREV_MONTH BUTTON_VOL_UP -#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD -#define CALENDAR_QUIT BUTTON_PLAY -#define CALENDAR_SELECT BUTTON_SELECT -#define CALENDAR_NEXT_WEEK BUTTON_DOWN -#define CALENDAR_PREV_WEEK BUTTON_UP -#define CALENDAR_NEXT_DAY BUTTON_RIGHT -#define CALENDAR_PREV_DAY BUTTON_LEFT -#define CALENDAR_NEXT_MONTH BUTTON_MODE -#define CALENDAR_PREV_MONTH BUTTON_EQ - #elif CONFIG_KEYPAD == SANSA_E200_PAD #define CALENDAR_QUIT BUTTON_POWER #define CALENDAR_SELECT BUTTON_SELECT diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index 5bfce10ec5..827f045a4b 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h @@ -70,20 +70,6 @@ #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) -#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD -#define CB_SELECT BUTTON_SELECT -#define CB_UP BUTTON_UP -#define CB_DOWN BUTTON_DOWN -#define CB_LEFT BUTTON_LEFT -#define CB_RIGHT BUTTON_RIGHT -#define CB_PLAY BUTTON_PLAY -#define CB_LEVEL BUTTON_EQ -#define CB_MENU BUTTON_MODE -#define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) -#define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) -#define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) -#define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) - #elif (CONFIG_KEYPAD == GIGABEAT_PAD) #define CB_SELECT BUTTON_SELECT #define CB_UP BUTTON_UP diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 79daf0987c..91b04e713a 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c @@ -46,16 +46,6 @@ #define CHC_SETTINGS_OK BUTTON_SELECT #define CHC_SETTINGS_CANCEL BUTTON_MENU -#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD -#define CHC_QUIT BUTTON_PLAY -#define CHC_STARTSTOP BUTTON_MODE -#define CHC_RESET BUTTON_EQ -#define CHC_MENU BUTTON_SELECT -#define CHC_SETTINGS_INC BUTTON_RIGHT -#define CHC_SETTINGS_DEC BUTTON_LEFT -#define CHC_SETTINGS_OK BUTTON_SELECT -#define CHC_SETTINGS_CANCEL BUTTON_PLAY - #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD #define CHC_QUIT BUTTON_REC #define CHC_STARTSTOP BUTTON_PLAY diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index cb9d67ec35..857f2415d4 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c @@ -62,16 +62,6 @@ #define CUBE_HIGHSPEED_PRE BUTTON_SELECT #define CUBE_HIGHSPEED (BUTTON_SELECT | BUTTON_REL) -#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD -#define CUBE_QUIT BUTTON_PLAY -#define CUBE_NEXT BUTTON_RIGHT -#define CUBE_PREV BUTTON_LEFT -#define CUBE_INC BUTTON_UP -#define CUBE_DEC BUTTON_DOWN -#define CUBE_MODE BUTTON_MODE -#define CUBE_PAUSE BUTTON_SELECT -#define CUBE_HIGHSPEED BUTTON_EQ - #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) #define CUBE_QUIT BUTTON_POWER #define CUBE_NEXT BUTTON_RIGHT diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h index 28172aed9f..b64bf942fe 100644 --- a/apps/plugins/fractals/fractal.h +++ b/apps/plugins/fractals/fractal.h @@ -155,20 +155,6 @@ #define FRACTAL_PRECISION_DEC BUTTON_REW #define FRACTAL_RESET (BUTTON_PLAY | BUTTON_REW) -#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD -#define FRACTAL_QUIT BUTTON_EQ -#define FRACTAL_UP BUTTON_UP -#define FRACTAL_DOWN BUTTON_DOWN -#define FRACTAL_LEFT BUTTON_LEFT -#define FRACTAL_RIGHT BUTTON_RIGHT -#define FRACTAL_ZOOM_IN_PRE BUTTON_SELECT -#define FRACTAL_ZOOM_IN (BUTTON_SELECT | BUTTON_REL) -#define FRACTAL_ZOOM_OUT_PRE BUTTON_SELECT -#define FRACTAL_ZOOM_OUT (BUTTON_SELECT | BUTTON_REPEAT) -#define FRACTAL_PRECISION_INC (BUTTON_PLAY | BUTTON_RIGHT) -#define FRACTAL_PRECISION_DEC (BUTTON_PLAY | BUTTON_LEFT) -#define FRACTAL_RESET BUTTON_MODE - #elif CONFIG_KEYPAD == GIGABEAT_S_PAD #define FRACTAL_QUIT BUTTON_BACK #define FRACTAL_UP BUTTON_UP diff --git a/apps/plugins/greyscale.c b/apps/plugins/greyscale.c index c44b1f77c0..d9cb7436de 100644 --- a/apps/plugins/greyscale.c +++ b/apps/plugins/greyscale.c @@ -57,14 +57,6 @@ #define GREYSCALE_RIGHT BUTTON_RIGHT #define GREYSCALE_OFF BUTTON_MENU -#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD -#define GREYSCALE_SHIFT BUTTON_PLAY -#define GREYSCALE_UP BUTTON_UP -#define GREYSCALE_DOWN BUTTON_DOWN -#define GREYSCALE_LEFT BUTTON_LEFT -#define GREYSCALE_RIGHT BUTTON_RIGHT -#define GREYSCALE_OFF BUTTON_EQ - #elif CONFIG_KEYPAD == IAUDIO_M3_PAD #define GREYSCALE_SHIFT BUTTON_RC_PLAY /* somewhat dangerous... */ #define GREYSCALE_UP BUTTON_RC_VOL_UP diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index af0189e9db..7f7965b07d 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c @@ -63,16 +63,6 @@ #define HK_SELECT "SELECT" #define HK_CANCEL "MENU" -#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD -#define JEWELS_UP BUTTON_UP -#define JEWELS_DOWN BUTTON_DOWN -#define JEWELS_LEFT BUTTON_LEFT -#define JEWELS_RIGHT BUTTON_RIGHT -#define JEWELS_SELECT BUTTON_SELECT -#define JEWELS_CANCEL BUTTON_PLAY -#define HK_SELECT "SELECT" -#define HK_CANCEL "PLAY" - #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD #define JEWELS_UP BUTTON_UP #define JEWELS_DOWN BUTTON_DOWN diff --git a/apps/plugins/lib/grey_core.c b/apps/plugins/lib/grey_core.c index e3543aeba2..b025ef8eaa 100644 --- a/apps/plugins/lib/grey_core.c +++ b/apps/plugins/lib/grey_core.c @@ -294,7 +294,6 @@ static const unsigned char lcdlinear[256] = { #define LCD_SCANRATE 73 /* Hz */ #else /* not yet calibrated targets - generic linear mapping */ -/* TODO: calibrate iFP7xx */ static const unsigned char lcdlinear[256] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 907cb3ee42..028472d9a8 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c @@ -91,7 +91,6 @@ const struct button_mapping pla_main_ctx[] = || (CONFIG_KEYPAD == IRIVER_H300_PAD) \ || (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \ || (CONFIG_KEYPAD == GIGABEAT_PAD) \ - || (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) \ || (CONFIG_KEYPAD == SANSA_C200_PAD) \ || (CONFIG_KEYPAD == GIGABEAT_S_PAD) \ || (CONFIG_KEYPAD == MROBE100_PAD) \ @@ -348,12 +347,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 == IRIVER_IFP7XX_PAD) - {PLA_CANCEL, BUTTON_EQ|BUTTON_REL, BUTTON_EQ}, - {PLA_EXIT, BUTTON_EQ|BUTTON_REPEAT, BUTTON_NONE}, - {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE}, - {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, - {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, #elif (CONFIG_KEYPAD == MROBE500_PAD) {PLA_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER}, {PLA_EXIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE}, diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index 498aa36357..f089c38023 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c @@ -95,23 +95,6 @@ #define LVL_UP_TEXT "PLAY" #define LVL_DOWN_TEXT "-" -#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD -#define PEGBOX_SELECT BUTTON_MODE -#define PEGBOX_QUIT BUTTON_PLAY -#define PEGBOX_RESTART (BUTTON_EQ|BUTTON_MODE) -#define PEGBOX_LVL_UP (BUTTON_EQ|BUTTON_UP) -#define PEGBOX_LVL_DOWN (BUTTON_EQ|BUTTON_DOWN) -#define PEGBOX_UP BUTTON_UP -#define PEGBOX_DOWN BUTTON_DOWN -#define PEGBOX_RIGHT BUTTON_RIGHT -#define PEGBOX_LEFT BUTTON_LEFT - -#define SELECT_TEXT "MODE" -#define QUIT_TEXT "PLAY" -#define RESTART_TEXT "EQ+MODE" -#define LVL_UP_TEXT "EQ+UP" -#define LVL_DOWN_TEXT "EQ+DOWN" - #elif CONFIG_KEYPAD == IRIVER_H10_PAD #define PEGBOX_SELECT BUTTON_PLAY #define PEGBOX_QUIT BUTTON_POWER diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index 8f59695127..9faf53661e 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c @@ -128,8 +128,6 @@ const struct button_mapping pf_context_buttons[] = #endif #elif CONFIG_KEYPAD == SANSA_E200_PAD {PF_QUIT, BUTTON_POWER, BUTTON_NONE}, -#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD - {PF_QUIT, BUTTON_EQ, BUTTON_NONE}, #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ || (CONFIG_KEYPAD == IPOD_3G_PAD) \ || (CONFIG_KEYPAD == IPOD_4G_PAD) \ diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index e85c6a5eab..07a15bfb62 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c @@ -152,17 +152,6 @@ #define ROCKBLOX_DROP BUTTON_SELECT #define ROCKBLOX_RESTART BUTTON_A -#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD - -#define ROCKBLOX_OFF BUTTON_PLAY -#define ROCKBLOX_ROTATE_CCW BUTTON_UP -#define ROCKBLOX_ROTATE_CW BUTTON_SELECT -#define ROCKBLOX_DOWN BUTTON_DOWN -#define ROCKBLOX_LEFT BUTTON_LEFT -#define ROCKBLOX_RIGHT BUTTON_RIGHT -#define ROCKBLOX_DROP BUTTON_MODE -#define ROCKBLOX_RESTART BUTTON_EQ - #elif CONFIG_KEYPAD == MROBE500_PAD #define ROCKBLOX_OFF BUTTON_POWER diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 6dd010961e..d2c56ff6cc 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c @@ -122,16 +122,6 @@ static void setoptions (void) options.SELECT = BUTTON_NONE; options.MENU = (BUTTON_SELECT | BUTTON_REPEAT); -#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD - options.UP = BUTTON_UP; - options.DOWN = BUTTON_DOWN; - - options.A = BUTTON_PLAY; - options.B = BUTTON_EQ; - options.START = BUTTON_MODE; - options.SELECT = (BUTTON_SELECT | BUTTON_REL); - options.MENU = (BUTTON_SELECT | BUTTON_REPEAT); - #elif CONFIG_KEYPAD == GIGABEAT_PAD options.UP = BUTTON_UP; options.DOWN = BUTTON_DOWN; diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index c5ecfd7a8a..bb96b8a44b 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c @@ -51,14 +51,6 @@ #define STOPWATCH_SCROLL_UP BUTTON_SCROLL_FWD #define STOPWATCH_SCROLL_DOWN BUTTON_SCROLL_BACK -#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD -#define STOPWATCH_QUIT BUTTON_PLAY -#define STOPWATCH_START_STOP BUTTON_MODE -#define STOPWATCH_RESET_TIMER BUTTON_EQ -#define STOPWATCH_LAP_TIMER BUTTON_SELECT -#define STOPWATCH_SCROLL_UP BUTTON_UP -#define STOPWATCH_SCROLL_DOWN BUTTON_DOWN - #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD #define STOPWATCH_QUIT BUTTON_POWER #define STOPWATCH_START_STOP BUTTON_PLAY diff --git a/apps/plugins/text_viewer/tv_button.h b/apps/plugins/text_viewer/tv_button.h index 26bfb7a464..d9a57d114f 100644 --- a/apps/plugins/text_viewer/tv_button.h +++ b/apps/plugins/text_viewer/tv_button.h @@ -75,17 +75,6 @@ #define TV_AUTOSCROLL BUTTON_PLAY #define TV_BOOKMARK BUTTON_SELECT -/* iFP7xx keys */ -#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD -#define TV_QUIT BUTTON_PLAY -#define TV_SCROLL_UP BUTTON_UP -#define TV_SCROLL_DOWN BUTTON_DOWN -#define TV_SCREEN_LEFT BUTTON_LEFT -#define TV_SCREEN_RIGHT BUTTON_RIGHT -#define TV_MENU BUTTON_MODE -#define TV_AUTOSCROLL BUTTON_SELECT -#define TV_BOOKMARK (BUTTON_LEFT|BUTTON_SELECT) - /* iAudio X5/M5 keys */ #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD #define TV_QUIT BUTTON_POWER diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index 1dcb9c9034..e9316a301b 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h @@ -47,14 +47,6 @@ #define ZX_SELECT BUTTON_SELECT #define ZX_MENU BUTTON_PLAY -#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD -#define ZX_SELECT BUTTON_SELECT -#define ZX_MENU BUTTON_PLAY -#define ZX_LEFT BUTTON_LEFT -#define ZX_RIGHT BUTTON_RIGHT -#define ZX_UP BUTTON_UP -#define ZX_DOWN BUTTON_DOWN - #elif CONFIG_KEYPAD == IRIVER_H10_PAD #define ZX_SELECT BUTTON_REW #define ZX_MENU BUTTON_FF diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index 1028836351..6e0997c339 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c @@ -32,17 +32,6 @@ #define KBD_UP BUTTON_SCROLL_BACK #define KBD_DOWN BUTTON_SCROLL_FWD -#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD - -/* TODO: Check keyboard mappings */ - -#define KBD_SELECT BUTTON_SELECT -#define KBD_ABORT BUTTON_PLAY -#define KBD_LEFT BUTTON_LEFT -#define KBD_RIGHT BUTTON_RIGHT -#define KBD_UP BUTTON_UP -#define KBD_DOWN BUTTON_DOWN - #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD /* TODO: Check keyboard mappings */ -- cgit v1.2.3