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/SOURCES | 6 - apps/keymaps/keymap-c100.c | 400 -------------------------- apps/keymaps/keymap-iaudio67.c | 330 --------------------- apps/keymaps/keymap-logikdax.c | 318 -------------------- apps/lang/english-us.lang | 6 +- apps/lang/english.lang | 6 +- apps/lang/italiano.lang | 6 +- apps/lang/nederlands.lang | 6 +- apps/lang/polski.lang | 6 +- apps/lang/russian.lang | 6 +- apps/lang/slovak.lang | 6 +- apps/lang/srpski.lang | 6 +- 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 - 40 files changed, 32 insertions(+), 1340 deletions(-) delete mode 100644 apps/keymaps/keymap-c100.c delete mode 100644 apps/keymaps/keymap-iaudio67.c delete mode 100644 apps/keymaps/keymap-logikdax.c (limited to 'apps') diff --git a/apps/SOURCES b/apps/SOURCES index 80133ebd27..6c13945904 100644 --- a/apps/SOURCES +++ b/apps/SOURCES @@ -231,12 +231,6 @@ keymaps/keymap-sa9200.c keymaps/keymap-hdd1630.c #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD keymaps/keymap-hdd6330.c -#elif CONFIG_KEYPAD == IAUDIO67_PAD -keymaps/keymap-iaudio67.c -#elif CONFIG_KEYPAD == SANSA_C100_PAD -keymaps/keymap-c100.c -#elif CONFIG_KEYPAD == LOGIK_DAX_PAD -keymaps/keymap-logikdax.c #elif CONFIG_KEYPAD == SANSA_FUZE_PAD keymaps/keymap-fuze.c #elif CONFIG_KEYPAD == ONDAVX747_PAD diff --git a/apps/keymaps/keymap-c100.c b/apps/keymaps/keymap-c100.c deleted file mode 100644 index 9949f0c1c2..0000000000 --- a/apps/keymaps/keymap-c100.c +++ /dev/null @@ -1,400 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2007 Mark Arigo - * - * 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 Sandisk c100 target */ - -#include "config.h" -#include "action.h" -#include "button.h" -#include "settings.h" - -/* {Action Code, Button code, Prereq button code } */ - -/* - * 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_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, - { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_STD_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, - { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, - { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, - - LAST_ITEM_IN_LIST -}; /* button_context_standard */ - - -static const struct button_mapping button_context_wps[] = { - { ACTION_WPS_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP }, - { ACTION_WPS_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, - { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, - { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, - - { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, - { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL,BUTTON_RIGHT|BUTTON_REPEAT }, - - { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_POWER|BUTTON_RIGHT, BUTTON_POWER }, - { ACTION_WPS_ABSETA_PREVDIR,BUTTON_POWER|BUTTON_LEFT, BUTTON_POWER }, - { ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_UP, BUTTON_POWER }, - - { ACTION_WPS_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, - { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, - { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_VOLUP, BUTTON_SELECT }, - { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_VOLDOWN, BUTTON_SELECT }, - { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, - { ACTION_WPS_HOTKEY, BUTTON_SELECT|BUTTON_DOWN, BUTTON_NONE }, - { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, - - LAST_ITEM_IN_LIST -}; /* button_context_wps */ - -static const struct button_mapping button_context_settings[] = { - { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, - { ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE }, - { ACTION_SETTINGS_INC, BUTTON_VOLUP, BUTTON_NONE }, - { ACTION_SETTINGS_INCREPEAT,BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_SETTINGS_DEC, BUTTON_VOLDOWN, BUTTON_NONE }, - { ACTION_SETTINGS_DECREPEAT,BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), -}; /* button_context_settings */ - -static const struct button_mapping button_context_list[] = { -#ifdef HAVE_VOLUME_IN_LIST - { ACTION_LIST_VOLUP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_LIST_VOLUP, BUTTON_VOLUP, BUTTON_NONE }, - { ACTION_LIST_VOLDOWN, BUTTON_VOLDOWN, BUTTON_NONE }, - { ACTION_LIST_VOLDOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE }, -#endif - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; /* button_context_list */ - -static const struct button_mapping button_context_tree[] = { - { ACTION_TREE_WPS, BUTTON_UP|BUTTON_REL, BUTTON_UP }, - { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, - { ACTION_TREE_HOTKEY, BUTTON_SELECT|BUTTON_DOWN, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), -}; /* button_context_tree */ - -static const struct button_mapping button_context_listtree_scroll_without_combo[] = { - { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, - { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, - { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, - { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), -}; /* button_context_listtree_scroll_without_combo */ - -static const struct button_mapping button_context_listtree_scroll_with_combo[] = { -// { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_NONE }, -// { ACTION_TREE_ROOT_INIT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_REC|BUTTON_LEFT }, -// { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, -// { ACTION_TREE_PGRIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE }, -// { ACTION_TREE_PGRIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), -}; /* button_context_listtree_scroll_with_combo */ - -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_quickscreen[] = { - { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, - { ACTION_QS_TOP, BUTTON_UP|BUTTON_REL, BUTTON_NONE }, - { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE }, - { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, - { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REL, 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_settings_right_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_CANCEL, BUTTON_POWER, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), -}; /* button_context_settings_right_is_inc */ - -static const struct button_mapping button_context_pitchscreen[] = { - { ACTION_PS_INC_SMALL, BUTTON_VOLUP, BUTTON_NONE }, - { ACTION_PS_INC_BIG, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_PS_DEC_SMALL, BUTTON_VOLDOWN, BUTTON_NONE }, - { ACTION_PS_DEC_BIG, BUTTON_VOLDOWN|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_SELECT, BUTTON_NONE }, - { ACTION_PS_EXIT, BUTTON_POWER, 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_pitchscreen */ - -/** FM Radio Screen **/ -#if CONFIG_TUNER -static const struct button_mapping button_context_radio[] = { - { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_FM_MENU, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_FM_PRESET, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, - { ACTION_FM_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_NONE }, - { ACTION_FM_MODE, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, - { ACTION_FM_EXIT, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE }, - { ACTION_FM_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) -}; /* button_context_radio */ -#endif - -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_CURSOR_LEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_NONE }, -// { ACTION_KBD_CURSOR_LEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT,BUTTON_NONE }, -// { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE }, -// { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE }, - - { ACTION_KBD_UP, BUTTON_VOLUP, BUTTON_NONE }, - { ACTION_KBD_UP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_DOWN, BUTTON_VOLDOWN, BUTTON_NONE }, - { ACTION_KBD_DOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE }, - -// { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_VOLDOWN, BUTTON_NONE }, -// { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_VOLDOWN|BUTTON_REPEAT,BUTTON_NONE }, -// { ACTION_KBD_PAGE_FLIP, BUTTON_REC|BUTTON_SELECT, BUTTON_REC }, - - { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE }, - { ACTION_KBD_DONE, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, - { ACTION_KBD_ABORT, BUTTON_POWER, BUTTON_NONE }, - - LAST_ITEM_IN_LIST -}; /* button_context_keyboard */ - -static const struct button_mapping button_context_bmark[] = { -// { ACTION_BMS_DELETE, BUTTON_REC, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), -}; /* button_context_bmark */ - -#ifdef USB_ENABLE_HID -static const struct button_mapping button_context_usb_hid[] = { - { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_MODE|BUTTON_REL, BUTTON_MODE }, - { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_MODE|BUTTON_REPEAT, BUTTON_MODE }, - - LAST_ITEM_IN_LIST -}; /* button_context_usb_hid */ - -static const struct button_mapping button_context_usb_hid_mode_multimedia[] = { - { ACTION_USB_HID_MULTIMEDIA_VOLUME_DOWN, BUTTON_VOLUP, BUTTON_NONE }, - { ACTION_USB_HID_MULTIMEDIA_VOLUME_DOWN, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_USB_HID_MULTIMEDIA_VOLUME_UP, BUTTON_VOLDOWN, BUTTON_NONE }, - { ACTION_USB_HID_MULTIMEDIA_VOLUME_UP, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_USB_HID_MULTIMEDIA_VOLUME_MUTE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, - { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_PLAY_PAUSE, BUTTON_UP|BUTTON_REL, BUTTON_UP }, - { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, - { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_TRACK_PREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, - { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_TRACK_NEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) -}; /* button_context_usb_hid_mode_multimedia */ - -static const struct button_mapping button_context_usb_hid_mode_presentation[] = { - { ACTION_USB_HID_PRESENTATION_SLIDESHOW_START, BUTTON_UP|BUTTON_REL, BUTTON_UP }, - { ACTION_USB_HID_PRESENTATION_SLIDESHOW_LEAVE, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, - { ACTION_USB_HID_PRESENTATION_SLIDE_PREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, - { ACTION_USB_HID_PRESENTATION_SLIDE_NEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, - { ACTION_USB_HID_PRESENTATION_SLIDE_FIRST, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, - { ACTION_USB_HID_PRESENTATION_SLIDE_LAST, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, - { ACTION_USB_HID_PRESENTATION_SCREEN_BLACK, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, - { ACTION_USB_HID_PRESENTATION_SCREEN_WHITE, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, - { ACTION_USB_HID_PRESENTATION_LINK_PREV, BUTTON_VOLUP, BUTTON_NONE }, - { ACTION_USB_HID_PRESENTATION_LINK_PREV, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_USB_HID_PRESENTATION_LINK_NEXT, BUTTON_VOLDOWN, BUTTON_NONE }, - { ACTION_USB_HID_PRESENTATION_LINK_NEXT, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_USB_HID_PRESENTATION_MOUSE_CLICK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, - { ACTION_USB_HID_PRESENTATION_MOUSE_OVER, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) -}; /* button_context_usb_hid_mode_presentation */ - -static const struct button_mapping button_context_usb_hid_mode_browser[] = { - { ACTION_USB_HID_BROWSER_SCROLL_UP, BUTTON_VOLUP, BUTTON_NONE }, - { ACTION_USB_HID_BROWSER_SCROLL_UP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_USB_HID_BROWSER_SCROLL_DOWN, BUTTON_VOLDOWN, BUTTON_NONE }, - { ACTION_USB_HID_BROWSER_SCROLL_DOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_USB_HID_BROWSER_SCROLL_PAGE_UP, BUTTON_UP|BUTTON_REL, BUTTON_UP }, - { ACTION_USB_HID_BROWSER_SCROLL_PAGE_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, - { ACTION_USB_HID_BROWSER_ZOOM_IN, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, - { ACTION_USB_HID_BROWSER_ZOOM_OUT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, - { ACTION_USB_HID_BROWSER_ZOOM_RESET, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, - { ACTION_USB_HID_BROWSER_ZOOM_RESET, BUTTON_UP|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_UP|BUTTON_DOWN }, - { ACTION_USB_HID_BROWSER_TAB_PREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, - { ACTION_USB_HID_BROWSER_TAB_NEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, - { ACTION_USB_HID_BROWSER_TAB_CLOSE, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER }, - { ACTION_USB_HID_BROWSER_HISTORY_BACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, - { ACTION_USB_HID_BROWSER_HISTORY_FORWARD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, - { ACTION_USB_HID_BROWSER_VIEW_FULL_SCREEN, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) -}; /* button_context_usb_hid_mode_browser */ - -#ifdef HAVE_USB_HID_MOUSE -static const struct button_mapping button_context_usb_hid_mode_mouse[] = { - { ACTION_USB_HID_MOUSE_UP, BUTTON_UP, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_UP_REP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_DOWN, BUTTON_DOWN, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_DOWN_REP, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_LEFT, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_LEFT_REP, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_RIGHT_REP, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_BUTTON_LEFT, BUTTON_SELECT, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_LDRAG_UP, BUTTON_SELECT|BUTTON_UP, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_LDRAG_UP_REP, BUTTON_SELECT|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_LDRAG_DOWN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_LDRAG_DOWN_REP, BUTTON_SELECT|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_LDRAG_LEFT, BUTTON_SELECT|BUTTON_LEFT, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_LDRAG_LEFT_REP, BUTTON_SELECT|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_LDRAG_RIGHT, BUTTON_SELECT|BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_LDRAG_RIGHT_REP, BUTTON_SELECT|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_BUTTON_RIGHT, BUTTON_POWER, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_BUTTON_RIGHT_REL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_RDRAG_UP, BUTTON_POWER|BUTTON_UP, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_RDRAG_UP_REP, BUTTON_POWER|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_RDRAG_DOWN, BUTTON_POWER|BUTTON_DOWN, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_RDRAG_DOWN_REP, BUTTON_POWER|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_RDRAG_LEFT, BUTTON_POWER|BUTTON_LEFT, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_RDRAG_LEFT_REP, BUTTON_POWER|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_RDRAG_RIGHT, BUTTON_POWER|BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_RDRAG_RIGHT_REP, BUTTON_POWER|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP, BUTTON_VOLUP, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_VOLDOWN, BUTTON_NONE }, - { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) -}; /* button_context_usb_hid_mode_mouse */ -#endif -#endif - -/* 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_LIST: - return button_context_list; - case CONTEXT_TREE: - case CONTEXT_MAINMENU: - if (global_settings.hold_lr_for_scroll_in_list) - return button_context_listtree_scroll_without_combo; - else - return button_context_listtree_scroll_with_combo; - case CONTEXT_CUSTOM|CONTEXT_TREE: - return button_context_tree; - - case CONTEXT_SETTINGS: - case CONTEXT_SETTINGS_TIME: - return button_context_settings; - case CONTEXT_CUSTOM|CONTEXT_SETTINGS: - case CONTEXT_SETTINGS_COLOURCHOOSER: - case CONTEXT_SETTINGS_EQ: - return button_context_settings_right_is_inc; - - case CONTEXT_YESNOSCREEN: - return button_context_yesno; -#if CONFIG_TUNER - case CONTEXT_FM: - return button_context_radio; -#endif - case CONTEXT_BOOKMARKSCREEN: - return button_context_bmark; - case CONTEXT_QUICKSCREEN: - return button_context_quickscreen; - case CONTEXT_PITCHSCREEN: - return button_context_pitchscreen; -#ifdef HAVE_RECORDING - case CONTEXT_RECSCREEN: - return button_context_recscreen; -#endif - case CONTEXT_KEYBOARD: - return button_context_keyboard; -#ifdef USB_ENABLE_HID - case CONTEXT_USB_HID: - return button_context_usb_hid; - case CONTEXT_USB_HID_MODE_MULTIMEDIA: - return button_context_usb_hid_mode_multimedia; - case CONTEXT_USB_HID_MODE_PRESENTATION: - return button_context_usb_hid_mode_presentation; - case CONTEXT_USB_HID_MODE_BROWSER: - return button_context_usb_hid_mode_browser; -#ifdef HAVE_USB_HID_MOUSE - case CONTEXT_USB_HID_MODE_MOUSE: - return button_context_usb_hid_mode_mouse; -#endif -#endif - default: - return button_context_standard; - } - return button_context_standard; -} diff --git a/apps/keymaps/keymap-iaudio67.c b/apps/keymaps/keymap-iaudio67.c deleted file mode 100644 index 5c62a73dd0..0000000000 --- a/apps/keymaps/keymap-iaudio67.c +++ /dev/null @@ -1,330 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2007 Mark Arigo - * - * 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 Iaudio[67] target */ - -#include "config.h" -#include "action.h" -#include "button.h" -#include "settings.h" - -/* {Action Code, Button code, Prereq button code } */ - -/* - * 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_RIGHT|BUTTON_REL, BUTTON_NONE }, - { ACTION_STD_PREVREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - - { ACTION_STD_NEXT, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, - { ACTION_STD_NEXTREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - - { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, - { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, - { ACTION_STD_CANCEL, BUTTON_STOP|BUTTON_REL, BUTTON_NONE }, - { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, - - { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, - { ACTION_STD_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, -// { ACTION_STD_QUICKSCREEN, BUTTON_REC|BUTTON_PLAY, BUTTON_NONE }, - - LAST_ITEM_IN_LIST -}; /* button_context_standard */ - - -static const struct button_mapping button_context_wps[] = { - - { ACTION_WPS_VOLDOWN, BUTTON_VOLDOWN, BUTTON_NONE }, - { ACTION_WPS_VOLDOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_VOLUP, BUTTON_VOLUP, BUTTON_NONE }, - { ACTION_WPS_VOLUP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, - { ACTION_WPS_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, - - { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, - { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, - - { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, - { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, - - { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, -#ifdef HAVE_HOTKEY - { ACTION_WPS_HOTKEY, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, -#else - { ACTION_WPS_VIEW_PLAYLIST, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, -#endif - { ACTION_WPS_STOP, BUTTON_STOP, BUTTON_NONE }, - - LAST_ITEM_IN_LIST -}; /* button_context_wps */ - -static const struct button_mapping button_context_settings[] = { - { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE }, -// { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE }, - - { ACTION_SETTINGS_INC, BUTTON_VOLUP|BUTTON_REL, BUTTON_NONE }, - { ACTION_SETTINGS_INCREPEAT,BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, - - { ACTION_SETTINGS_DEC, BUTTON_VOLDOWN|BUTTON_REL, BUTTON_NONE }, - { ACTION_SETTINGS_DECREPEAT,BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE }, - - { ACTION_STD_PREV, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, - { ACTION_STD_PREVREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - - { ACTION_STD_NEXT, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, - { ACTION_STD_NEXTREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), -}; /* button_context_settings */ - -static const struct button_mapping button_context_list[] = { -#ifdef HAVE_VOLUME_IN_LIST - { ACTION_LIST_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_LIST_VOLUP, BUTTON_VOL_UP|BUTTON_REL, BUTTON_NONE }, - - { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REL, BUTTON_NONE }, - { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, -#endif - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; /* button_context_list */ - -static const struct button_mapping button_context_tree[] = { - // { ACTION_TREE_WPS, BUTTON_REC|BUTTON_VOLUP, BUTTON_REC }, - // { ACTION_TREE_STOP, BUTTON_REC|BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_REC|BUTTON_VOLUP }, -#ifdef HAVE_HOTKEY - // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, -#endif - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), -}; /* button_context_tree */ - -static const struct button_mapping button_context_listtree_scroll_without_combo[] = { -#if 0 - { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, - { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, - { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - - { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, - { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, -#endif - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), -}; /* button_context_listtree_scroll_without_combo */ - -static const struct button_mapping button_context_listtree_scroll_with_combo[] = { -// { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_NONE }, -// { ACTION_TREE_ROOT_INIT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_REC|BUTTON_LEFT }, -// { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, -// { ACTION_TREE_PGRIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE }, -// { ACTION_TREE_PGRIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), -}; /* button_context_listtree_scroll_with_combo */ - -static const struct button_mapping button_context_yesno[] = { -// { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), -}; /* button_context_settings_yesno */ - -static const struct button_mapping button_context_quickscreen[] = { -#if 0 - { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_STD_CANCEL, BUTTON_MENU|BUTTON_REL, BUTTON_NONE }, - - { ACTION_QS_TOP, BUTTON_VOLUP|BUTTON_REL, BUTTON_NONE }, - { ACTION_QS_TOP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, - - { ACTION_QS_DOWN, BUTTON_VOLDOWN|BUTTON_REL, BUTTON_NONE }, - { ACTION_QS_DOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE }, - - { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, - { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - - { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, - { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, -#endif - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), -}; /* button_context_quickscreen */ - -static const struct button_mapping button_context_settings_right_is_inc[] = { -#if 0 - { 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_CANCEL, BUTTON_MENU, BUTTON_NONE }, -#endif - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), -}; /* button_context_settings_right_is_inc */ - -static const struct button_mapping button_context_pitchscreen[] = { -#if 0 - { ACTION_PS_INC_SMALL, BUTTON_VOLUP, BUTTON_NONE }, - { ACTION_PS_INC_BIG, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, - - { ACTION_PS_DEC_SMALL, BUTTON_VOLDOWN, BUTTON_NONE }, - { ACTION_PS_DEC_BIG, BUTTON_VOLDOWN|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_PLAY, BUTTON_NONE }, - { ACTION_PS_EXIT, BUTTON_MENU, BUTTON_NONE }, - - { ACTION_PS_SLOWER, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_PS_FASTER, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - -#endif - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), -}; /* button_context_pitchscreen */ - -/** Recording Screen **/ -#ifdef HAVE_RECORDING -static const struct button_mapping button_context_recscreen[] = { - { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, - { ACTION_REC_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, - { ACTION_STD_CANCEL, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, -// { ACTION_REC_NEWFILE, BUTTON_REC|BUTTON_REL, BUTTON_REC }, - - { ACTION_SETTINGS_INC, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, - { ACTION_SETTINGS_INCREPEAT,BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_SETTINGS_DEC, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, - { ACTION_SETTINGS_DECREPEAT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; /* button_context_recscreen */ -#endif - -/** FM Radio Screen **/ -#if CONFIG_TUNER -static const struct button_mapping button_context_radio[] = { - { ACTION_FM_MENU, BUTTON_MENU | BUTTON_REL, BUTTON_MENU }, - { ACTION_FM_MODE, BUTTON_MENU | BUTTON_REPEAT, BUTTON_MENU }, - { ACTION_FM_PRESET, BUTTON_STOP, BUTTON_NONE }, - { ACTION_FM_PLAY, BUTTON_PLAY | BUTTON_REL, BUTTON_NONE }, - { ACTION_FM_STOP, BUTTON_PLAY | BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_FM_EXIT, BUTTON_POWER, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) -}; /* button_context_radio */ -#endif - -static const struct button_mapping button_context_keyboard[] = { - { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, - { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, - { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - -// { ACTION_KBD_CURSOR_LEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_NONE }, -// { ACTION_KBD_CURSOR_LEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT,BUTTON_NONE }, -// { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE }, -// { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE }, - - { ACTION_KBD_UP, BUTTON_VOLUP|BUTTON_REL, BUTTON_NONE }, - { ACTION_KBD_UP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_DOWN, BUTTON_VOLDOWN|BUTTON_REL, BUTTON_NONE }, - { ACTION_KBD_DOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE }, - -// { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_VOLDOWN, BUTTON_NONE }, -// { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_VOLDOWN|BUTTON_REPEAT,BUTTON_NONE }, - -// { ACTION_KBD_PAGE_FLIP, BUTTON_REC|BUTTON_PLAY, BUTTON_REC }, - - { ACTION_KBD_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, - { ACTION_KBD_DONE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, - { ACTION_KBD_ABORT, BUTTON_MENU|BUTTON_REL, BUTTON_NONE }, - - LAST_ITEM_IN_LIST -}; /* button_context_keyboard */ - -static const struct button_mapping button_context_bmark[] = { -// { ACTION_BMS_DELETE, BUTTON_REC, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), -}; /* button_context_bmark */ - -/* 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_LIST: - return button_context_list; - case CONTEXT_TREE: - case CONTEXT_MAINMENU: - if (global_settings.hold_lr_for_scroll_in_list) - return button_context_listtree_scroll_without_combo; - else - return button_context_listtree_scroll_with_combo; - case CONTEXT_CUSTOM|CONTEXT_TREE: - return button_context_tree; - - case CONTEXT_SETTINGS: - case CONTEXT_SETTINGS_TIME: - return button_context_settings; - case CONTEXT_CUSTOM|CONTEXT_SETTINGS: - case CONTEXT_SETTINGS_COLOURCHOOSER: - case CONTEXT_SETTINGS_EQ: - return button_context_settings_right_is_inc; - - case CONTEXT_YESNOSCREEN: - return button_context_yesno; -#if CONFIG_TUNER - case CONTEXT_FM: - return button_context_radio; -#endif - case CONTEXT_BOOKMARKSCREEN: - return button_context_bmark; - case CONTEXT_QUICKSCREEN: - return button_context_quickscreen; - case CONTEXT_PITCHSCREEN: - return button_context_pitchscreen; -#ifdef HAVE_RECORDING - case CONTEXT_RECSCREEN: - return button_context_recscreen; -#endif - case CONTEXT_KEYBOARD: - return button_context_keyboard; - - default: - return button_context_standard; - } - - return button_context_standard; -} diff --git a/apps/keymaps/keymap-logikdax.c b/apps/keymaps/keymap-logikdax.c deleted file mode 100644 index 20c23031ef..0000000000 --- a/apps/keymaps/keymap-logikdax.c +++ /dev/null @@ -1,318 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2008 Dave Chapman - * - * 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 Sandisk c200 target */ - -#include "config.h" -#include "action.h" -#include "button.h" -#include "settings.h" - -/* {Action Code, Button code, Prereq button code } */ - -/* - * 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_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, - { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, - - { ACTION_STD_MENU, BUTTON_MODE|BUTTON_REL, BUTTON_MODE }, - { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, -// { ACTION_STD_QUICKSCREEN, BUTTON_REC|BUTTON_SELECT, BUTTON_NONE }, - - LAST_ITEM_IN_LIST -}; /* button_context_standard */ - - -static const struct button_mapping button_context_wps[] = { - { ACTION_WPS_PLAY, BUTTON_POWERPLAY|BUTTON_REL, BUTTON_POWERPLAY }, - { ACTION_WPS_STOP, BUTTON_POWERPLAY|BUTTON_REPEAT, BUTTON_POWERPLAY }, - - { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, - { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, - - { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, - { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, - - { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_MODE|BUTTON_RIGHT, BUTTON_MODE }, - { ACTION_WPS_ABSETA_PREVDIR,BUTTON_MODE|BUTTON_LEFT, BUTTON_MODE }, - { ACTION_WPS_ABRESET, BUTTON_MODE|BUTTON_UP, BUTTON_MODE }, - - { ACTION_WPS_MENU, BUTTON_MODE|BUTTON_REL, BUTTON_MODE }, - { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, -#if 0 - { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, - { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT }, - { ACTION_WPS_CONTEXT, BUTTON_VOLDOWN|BUTTON_REL, BUTTON_VOLDOWN }, - { ACTION_WPS_QUICKSCREEN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_VOLDOWN }, -#endif - - LAST_ITEM_IN_LIST -}; /* button_context_wps */ - -static const struct button_mapping button_context_settings[] = { - { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, - { ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE }, - - { 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_RIGHT|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_settings */ - -static const struct button_mapping button_context_list[] = { - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; /* button_context_list */ - -static const struct button_mapping button_context_tree[] = { - // { ACTION_TREE_WPS, BUTTON_REC|BUTTON_VOLUP, BUTTON_REC }, - // { ACTION_TREE_STOP, BUTTON_REC|BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_REC|BUTTON_VOLUP }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), -}; /* button_context_tree */ - -static const struct button_mapping button_context_listtree_scroll_without_combo[] = { - { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, - { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, - { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - - { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, - { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), -}; /* button_context_listtree_scroll_without_combo */ - -static const struct button_mapping button_context_listtree_scroll_with_combo[] = { -// { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_NONE }, -// { ACTION_TREE_ROOT_INIT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_REC|BUTTON_LEFT }, -// { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, -// { ACTION_TREE_PGRIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE }, -// { ACTION_TREE_PGRIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), -}; /* button_context_listtree_scroll_with_combo */ - -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_quickscreen[] = { - { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_STD_CANCEL, BUTTON_MODE|BUTTON_REL, BUTTON_NONE }, - - { ACTION_QS_TOP, BUTTON_UP|BUTTON_REL, BUTTON_NONE }, - { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, - - { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE }, - { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - - { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, - { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - - { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REL, 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_settings_right_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_CANCEL, BUTTON_MODE, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), -}; /* button_context_settings_right_is_inc */ - -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_SELECT, BUTTON_NONE }, - { ACTION_PS_EXIT, BUTTON_MODE, 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_pitchscreen */ - -/** Recording Screen **/ -#ifdef HAVE_RECORDING -static const struct button_mapping button_context_recscreen[] = { - { ACTION_STD_MENU, BUTTON_MODE|BUTTON_REL, BUTTON_MODE }, - { ACTION_REC_PAUSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, - { ACTION_STD_CANCEL, BUTTON_MODE|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_REC_NEWFILE, BUTTON_REC|BUTTON_REL, BUTTON_REC }, - - { 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 }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; /* button_context_recscreen */ -#endif - -/** FM Radio Screen **/ -#if CONFIG_TUNER -static const struct button_mapping button_context_radio[] = { - { ACTION_NONE, BUTTON_UP, BUTTON_NONE }, - { ACTION_FM_MENU, BUTTON_DOWN, BUTTON_NONE }, - { ACTION_FM_PRESET, BUTTON_SELECT, BUTTON_NONE }, - { ACTION_FM_STOP, BUTTON_POWERPLAY|BUTTON_REPEAT, BUTTON_POWERPLAY }, - { ACTION_FM_MODE, BUTTON_REC, BUTTON_NONE }, - { ACTION_FM_EXIT, BUTTON_MODE|BUTTON_REL, BUTTON_MODE }, - { ACTION_FM_PLAY, BUTTON_POWERPLAY|BUTTON_REL, BUTTON_POWERPLAY }, - { 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 }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) -}; /* button_context_radio */ -#endif - -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_CURSOR_LEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_NONE }, -// { ACTION_KBD_CURSOR_LEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT,BUTTON_NONE }, -// { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE }, -// { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,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 }, - -// { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_VOLDOWN, BUTTON_NONE }, -// { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_VOLDOWN|BUTTON_REPEAT,BUTTON_NONE }, - -// { ACTION_KBD_PAGE_FLIP, BUTTON_REC|BUTTON_SELECT, BUTTON_REC }, - - { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE }, - { ACTION_KBD_DONE, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, - { ACTION_KBD_ABORT, BUTTON_MODE, BUTTON_NONE }, - - LAST_ITEM_IN_LIST -}; /* button_context_keyboard */ - -static const struct button_mapping button_context_bmark[] = { -// { ACTION_BMS_DELETE, BUTTON_REC, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), -}; /* button_context_bmark */ - -/* 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_LIST: - return button_context_list; - case CONTEXT_TREE: - case CONTEXT_MAINMENU: - if (global_settings.hold_lr_for_scroll_in_list) - return button_context_listtree_scroll_without_combo; - else - return button_context_listtree_scroll_with_combo; - case CONTEXT_CUSTOM|CONTEXT_TREE: - return button_context_tree; - - case CONTEXT_SETTINGS: - case CONTEXT_SETTINGS_TIME: - return button_context_settings; - case CONTEXT_CUSTOM|CONTEXT_SETTINGS: - case CONTEXT_SETTINGS_COLOURCHOOSER: - case CONTEXT_SETTINGS_EQ: - return button_context_settings_right_is_inc; - - case CONTEXT_YESNOSCREEN: - return button_context_yesno; -#if CONFIG_TUNER - case CONTEXT_FM: - return button_context_radio; -#endif - case CONTEXT_BOOKMARKSCREEN: - return button_context_bmark; - case CONTEXT_QUICKSCREEN: - return button_context_quickscreen; - case CONTEXT_PITCHSCREEN: - return button_context_pitchscreen; -#ifdef HAVE_RECORDING - case CONTEXT_RECSCREEN: - return button_context_recscreen; -#endif - case CONTEXT_KEYBOARD: - return button_context_keyboard; - - default: - return button_context_standard; - } - return button_context_standard; -} diff --git a/apps/lang/english-us.lang b/apps/lang/english-us.lang index 8ddf4a82d0..b0afe443fb 100644 --- a/apps/lang/english-us.lang +++ b/apps/lang/english-us.lang @@ -15080,7 +15080,7 @@ *: "Press LEFT to cancel." android,hifietma*,zenvision: "Press BACK to cancel." - cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." + cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." ihifi760,ihifi960: "Double tap RETURN to cancel." ihifi770,ihifi770c,ihifi800: "Press HOME to cancel." iriverh10,samsungyh*: "Double tap LEFT to cancel." @@ -15095,7 +15095,7 @@ *: "Press LEFT to cancel." android,hifietma*,zenvision: "Press BACK to cancel." - cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." + cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." ihifi760,ihifi960: "Double tap RETURN to cancel." ihifi770,ihifi770c,ihifi800: "Press HOME to cancel." iriverh10,samsungyh*: "Double tap LEFT to cancel." @@ -15110,7 +15110,7 @@ *: "Press LEFT to cancel." android,hifietma*,zenvision: "Press BACK to cancel." - cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." + cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." ihifi760,ihifi960: "Double tap RETURN to cancel." ihifi770,ihifi770c,ihifi800: "Press HOME to cancel." iriverh10,samsungyh*: "Double tap LEFT to cancel." diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 9ca4c84430..fd90817130 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang @@ -15239,7 +15239,7 @@ *: "Press LEFT to cancel." android,hifietma*,zenvision: "Press BACK to cancel." - cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." + cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." ihifi760,ihifi960: "Double tap RETURN to cancel." ihifi770,ihifi770c,ihifi800: "Press HOME to cancel." iriverh10,samsungyh*: "Double tap LEFT to cancel." @@ -15254,7 +15254,7 @@ *: "Press LEFT to cancel." android,hifietma*,zenvision: "Press BACK to cancel." - cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." + cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." ihifi760,ihifi960: "Double tap RETURN to cancel." ihifi770,ihifi770c,ihifi800: "Press HOME to cancel." iriverh10,samsungyh*: "Double tap LEFT to cancel." @@ -15269,7 +15269,7 @@ *: "Press LEFT to cancel." android,hifietma*,zenvision: "Press BACK to cancel." - cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." + cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." ihifi760,ihifi960: "Double tap RETURN to cancel." ihifi770,ihifi770c,ihifi800: "Press HOME to cancel." iriverh10,samsungyh*: "Double tap LEFT to cancel." diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang index dc8cd4be1d..559b53127d 100644 --- a/apps/lang/italiano.lang +++ b/apps/lang/italiano.lang @@ -15031,7 +15031,7 @@ *: "Press LEFT to cancel." android,hifietma*,zenvision: "Press BACK to cancel." - cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." + cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." ihifi760,ihifi960: "Double tap RETURN to cancel." ihifi770,ihifi770c,ihifi800: "Press HOME to cancel." iriverh10,samsungyh*: "Double tap LEFT to cancel." @@ -15046,7 +15046,7 @@ *: "Premere LEFT per annullare." android,hifietma*,zenvision: "Premere BACK per annullare." - cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Premere POWER per annullare." + cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Premere POWER per annullare." ihifi760,ihifi960: "Premere due volte RETURN per annullare." ihifi770,ihifi770c,ihifi800: "Premere HOME per annullare." iriverh10,samsungyh*: "Premere due volte LEFT per annullare." @@ -15061,7 +15061,7 @@ *: "Premere LEFT per annullare." android,hifietma*,zenvision: "Premere BACK per annullare." - cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Premere POWER per annullare." + cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Premere POWER per annullare." ihifi760,ihifi960: "Premere due volte RETURN per annullare." ihifi770,ihifi770c,ihifi800: "Premere HOME per annullare." iriverh10,samsungyh*: "Premere due volte LEFT per annullare." diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang index a6a68ed1e6..3e7abc613d 100644 --- a/apps/lang/nederlands.lang +++ b/apps/lang/nederlands.lang @@ -15104,7 +15104,7 @@ *: "Press LEFT to cancel." android,hifietma*,zenvision: "Press BACK to cancel." - cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." + cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." ihifi760,ihifi960: "Double tap RETURN to cancel." ihifi770,ihifi770c,ihifi800: "Press HOME to cancel." iriverh10,samsungyh*: "Double tap LEFT to cancel." @@ -15120,7 +15120,7 @@ *: "Druk op LINKS om te annuleren." android: "Druk op RECHTS om te annuleren." hifietma*,zenvision: "Druk op BACK om te annuleren." - cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Druk op POWER om te annuleren." + cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Druk op POWER om te annuleren." ihifi760,ihifi960: "Dubbeltik op RETURN om te annuleren." ihifi770,ihifi770c,ihifi800: "Druk op HOME om te annuleren." iriverh10,samsungyh*: "Dubbeltik op LINKS om te annuleren." @@ -15136,7 +15136,7 @@ *: "Druk op LINKS om te annuleren." android: "Druk op RECHTS om te annuleren." hifietma*,zenvision: "Druk op BACK om te annuleren." - cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Druk op POWER om te annuleren." + cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Druk op POWER om te annuleren." ihifi760,ihifi960: "Dubbeltik op RETURN om te annuleren." ihifi770,ihifi770c,ihifi800: "Druk op HOME om te annuleren." iriverh10,samsungyh*: "Dubbeltik op LINKS om te annuleren." diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang index 6832ccdc87..15f6915dd1 100644 --- a/apps/lang/polski.lang +++ b/apps/lang/polski.lang @@ -15038,7 +15038,7 @@ *: "Press LEFT to cancel." android,hifietma*,zenvision: "Press BACK to cancel." - cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." + cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." ihifi760,ihifi960: "Double tap RETURN to cancel." ihifi770,ihifi770c,ihifi800: "Press HOME to cancel." iriverh10,samsungyh*: "Double tap LEFT to cancel." @@ -15053,7 +15053,7 @@ *: "Wciśnij LEFT, aby anulować." android,hifietma*,zenvision: "Wciśnij BACK, aby anulować." - cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Wciśnij POWER, aby anulować." + cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Wciśnij POWER, aby anulować." ihifi760,ihifi960: "Podwójnie stuknij RETURN, aby anulować." ihifi770,ihifi770c,ihifi800: "Wciśnij HOME, aby anulować." iriverh10,samsungyh*: "Podwójnie stuknij LEFT, aby anulować." @@ -15068,7 +15068,7 @@ *: "Wciśnij left, aby anulować." android,hifietma*,zenvision: "Wciśnij bak, aby anulować." - cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Wciśnij pałer, aby anulować." + cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Wciśnij pałer, aby anulować." ihifi760,ihifi960: "Podwójnie stuknij ritern, aby anulować." ihifi770,ihifi770c,ihifi800: "Wciśnij hołm, aby anulować." iriverh10,samsungyh*: "Podwójnie stuknij left, aby anulować." diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang index 6364c71c0b..9d71ad819c 100644 --- a/apps/lang/russian.lang +++ b/apps/lang/russian.lang @@ -15161,7 +15161,7 @@ *: "Press LEFT to cancel." android,hifietma*,zenvision: "Press BACK to cancel." - cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." + cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." ihifi760,ihifi960: "Double tap RETURN to cancel." ihifi770,ihifi770c,ihifi800: "Press HOME to cancel." iriverh10,samsungyh*: "Double tap LEFT to cancel." @@ -15176,7 +15176,7 @@ *: "Нажмите ВЛЕВО для отмены." android,hifietma*,zenvision: "Нажмите НАЗАД для отмены." - cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Нажмите ВКЛ. для отмены." + cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Нажмите ВКЛ. для отмены." ihifi760,ihifi960: "Дважды нажмите ВОЗВРАТ для отмены." ihifi770,ihifi770c,ihifi800: "Нажмите ДОМОЙ для отмены." iriverh10,samsungyh*: "Дважды нажмите ВЛЕВО для отмены." @@ -15191,7 +15191,7 @@ *: "Нажмите кнопку Влево для отмены." android,hifietma*,zenvision: "Нажмите кнопку Назад для отмены." - cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Нажмите кнопку включения для отмены." + cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Нажмите кнопку включения для отмены." ihifi760,ihifi960: "Дважды нажмите кнопку Назад для отмены." ihifi770,ihifi770c,ihifi800: "Нажмите кнопку Домой для отмены." iriverh10,samsungyh*: "Дважды нажмите кнопку Влево для отмены." diff --git a/apps/lang/slovak.lang b/apps/lang/slovak.lang index 65015a5990..00f98ecd35 100644 --- a/apps/lang/slovak.lang +++ b/apps/lang/slovak.lang @@ -15056,7 +15056,7 @@ *: "Press LEFT to cancel." android,hifietma*,zenvision: "Press BACK to cancel." - cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." + cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." ihifi760,ihifi960: "Double tap RETURN to cancel." ihifi770,ihifi770c,ihifi800: "Press HOME to cancel." iriverh10,samsungyh*: "Double tap LEFT to cancel." @@ -15071,7 +15071,7 @@ *: "Stlačte LEFT pre zrušenie" android: "Stlačte späť pre zrušenie" - cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Stlačte POWER pre zrušenie" + cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Stlačte POWER pre zrušenie" hifietma*,zenvision: "Stlačte BACK Pre zrušenie" ihifi760,ihifi960: "Poklepte RETURN pre zrušenie" ihifi770,ihifi770c,ihifi800: "Stlačte HOME pre zrušenie" @@ -15087,7 +15087,7 @@ *: "Stlačte LEFT pre zrušenie" android: "Stlačte späť pre zrušenie" - cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Stlačte POWER pre zrušenie" + cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Stlačte POWER pre zrušenie" hifietma*,zenvision: "Stlačte BACK Pre zrušenie" ihifi760,ihifi960: "Poklepte RETURN pre zrušenie" ihifi770,ihifi770c,ihifi800: "Stlačte HOME pre zrušenie" diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang index db93124c8f..95063ca0c0 100644 --- a/apps/lang/srpski.lang +++ b/apps/lang/srpski.lang @@ -15318,7 +15318,7 @@ *: "Press LEFT to cancel." android,hifietma*,zenvision: "Press BACK to cancel." - cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." + cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel." ihifi760,ihifi960: "Double tap RETURN to cancel." ihifi770,ihifi770c,ihifi800: "Press HOME to cancel." iriverh10,samsungyh*: "Double tap LEFT to cancel." @@ -15333,7 +15333,7 @@ *: "Притисните LEFT за прекид." android,hifietma*,zenvision: "Притисните BACK за прекид." - cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Притисните POWER за прекид." + cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Притисните POWER за прекид." ihifi760,ihifi960: "Дупли тап RETURN за прекид." ihifi770,ihifi770c,ihifi800: "Притисните HOME за прекид." iriverh10,samsungyh*: "Дупли тап LEFT за прекид." @@ -15348,7 +15348,7 @@ *: "Притисните LEFT за прекид." android,hifietma*,zenvision: "Притисните BACK за прекид." - cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Притисните POWER за прекид." + cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Притисните POWER за прекид." ihifi760,ihifi960: "Дупли тап RETURN за прекид." ihifi770,ihifi770c,ihifi800: "Притисните HOME за прекид." iriverh10,samsungyh*: "Дупли тап LEFT за прекид." 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