From aacb0811d98beb70a59d26edbfd43ba9c456497f Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Sat, 27 Feb 2021 22:07:37 +0000 Subject: Rename symbols of FiiO M3K Linux-based port Mainly a straight replacement of FIIO_M3K -> FIIO_M3K_LINUX. Change-Id: Id07c84f8150991d1b6851540c2c3f8f67e3f12c2 --- apps/SOURCES | 4 +- apps/bitmaps/native/SOURCES | 2 +- apps/debug_menu.c | 2 +- apps/keymaps/keymap-fiiom3k.c | 224 -------------------------- apps/keymaps/keymap-fiiom3klinux.c | 224 ++++++++++++++++++++++++++ apps/plugins/battery_bench.c | 2 +- apps/plugins/blackjack.c | 2 +- apps/plugins/brickmania.c | 2 +- apps/plugins/calculator.c | 2 +- apps/plugins/calendar.c | 2 +- apps/plugins/chessbox/chessbox_pgn.h | 2 +- apps/plugins/chessclock.c | 2 +- apps/plugins/chip8.c | 2 +- apps/plugins/chopper.c | 2 +- apps/plugins/clix.c | 2 +- apps/plugins/cube.c | 2 +- apps/plugins/doom/i_video.c | 2 +- apps/plugins/flipit.c | 2 +- apps/plugins/fractals/fractal.h | 2 +- apps/plugins/goban/goban.h | 2 +- apps/plugins/imageviewer/imageviewer_button.h | 2 +- apps/plugins/invadrox.c | 2 +- apps/plugins/jewels.c | 2 +- apps/plugins/lib/keymaps.h | 2 +- apps/plugins/lib/pluginlib_actions.c | 4 +- apps/plugins/midi/midiplay.c | 2 +- apps/plugins/minesweeper.c | 2 +- apps/plugins/mp3_encoder.c | 2 +- apps/plugins/mpegplayer/mpeg_settings.c | 2 +- apps/plugins/mpegplayer/mpegplayer.c | 2 +- apps/plugins/oscilloscope.c | 2 +- apps/plugins/pacbox/pacbox.h | 2 +- apps/plugins/pegbox.c | 4 +- apps/plugins/pong.c | 2 +- apps/plugins/reversi/reversi-gui.h | 2 +- apps/plugins/rockblox.c | 2 +- apps/plugins/rockboy/rockboy.c | 2 +- apps/plugins/rockpaint.c | 2 +- apps/plugins/sliding_puzzle.c | 2 +- apps/plugins/snake.c | 2 +- apps/plugins/snake2.c | 2 +- apps/plugins/sokoban.c | 2 +- apps/plugins/solitaire.c | 2 +- apps/plugins/spacerocks.c | 2 +- apps/plugins/star.c | 2 +- apps/plugins/stopwatch.c | 2 +- apps/plugins/sudoku/sudoku.h | 2 +- apps/plugins/text_viewer/tv_button.h | 2 +- apps/plugins/vu_meter.c | 2 +- apps/plugins/wormlet.c | 2 +- apps/plugins/xobox.c | 2 +- apps/plugins/zxbox/keymaps.h | 2 +- apps/plugins/zxbox/zxbox_keyb.c | 2 +- bootloader/SOURCES | 2 +- bootloader/rocker_linux.c | 8 +- firmware/SOURCES | 4 +- firmware/asm/SOURCES | 2 +- firmware/drivers/audio/fiiolinux_codec.c | 2 +- firmware/export/config.h | 6 +- firmware/export/config/fiiom3k.h | 130 --------------- firmware/export/config/fiiom3klinux.h | 130 +++++++++++++++ firmware/export/rbpaths.h | 4 +- firmware/export/system.h | 2 +- firmware/font.c | 2 +- tools/builds.pm | 2 +- tools/configure | 8 +- tools/rockboxdev.sh | 2 +- 67 files changed, 430 insertions(+), 430 deletions(-) delete mode 100644 apps/keymaps/keymap-fiiom3k.c create mode 100644 apps/keymaps/keymap-fiiom3klinux.c delete mode 100644 firmware/export/config/fiiom3k.h create mode 100644 firmware/export/config/fiiom3klinux.h diff --git a/apps/SOURCES b/apps/SOURCES index 4ae04a4cf8..62291bb992 100644 --- a/apps/SOURCES +++ b/apps/SOURCES @@ -300,8 +300,8 @@ keymaps/keymap-xduoox3.c keymaps/keymap-xduoox3ii.c #elif CONFIG_KEYPAD == XDUOO_X20_PAD keymaps/keymap-xduoox20.c -#elif CONFIG_KEYPAD == FIIO_M3K_PAD -keymaps/keymap-fiiom3k.c +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD +keymaps/keymap-fiiom3klinux.c #elif CONFIG_KEYPAD == EROSQ_PAD keymaps/keymap-erosq.c #endif diff --git a/apps/bitmaps/native/SOURCES b/apps/bitmaps/native/SOURCES index 1d1fcd4783..c31f6605df 100644 --- a/apps/bitmaps/native/SOURCES +++ b/apps/bitmaps/native/SOURCES @@ -50,7 +50,7 @@ toolsicon.70x70x16.bmp hibyicon.130x130x16.bmp rockboxicon.130x130x16.bmp toolsicon.130x130x16.bmp -#elif defined(FIIO_M3K) +#elif defined(FIIO_M3K_LINUX) fiioicon.130x130x16.bmp rockboxicon.130x130x16.bmp toolsicon.130x130x16.bmp diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 7187e8135c..8716b302c4 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c @@ -2528,7 +2528,7 @@ static const struct { { "Screendump", dbg_screendump }, #endif { "Skin Engine RAM usage", dbg_skin_engine }, -#if ((CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K)) && !defined(SIMULATOR) +#if ((CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX)) && !defined(SIMULATOR) { "View HW info", dbg_hw_info }, #endif #if (CONFIG_PLATFORM & PLATFORM_NATIVE) diff --git a/apps/keymaps/keymap-fiiom3k.c b/apps/keymaps/keymap-fiiom3k.c deleted file mode 100644 index 4fa97e9435..0000000000 --- a/apps/keymaps/keymap-fiiom3k.c +++ /dev/null @@ -1,224 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2019 by Roman Stolyarov - * - * 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 FiiO M3K 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_PREV, BUTTON_PREV, BUTTON_NONE }, - { ACTION_STD_PREVREPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, - { ACTION_STD_NEXT, BUTTON_NEXT, BUTTON_NONE }, - { ACTION_STD_NEXTREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, - { ACTION_STD_CANCEL, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, - { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, - { ACTION_STD_MENU, BUTTON_OPTION|BUTTON_REL, BUTTON_OPTION }, - - 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_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, - { ACTION_WPS_SKIPPREV, BUTTON_PREV|BUTTON_REL, BUTTON_PREV }, - { ACTION_WPS_SEEKBACK, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_STOPSEEK, BUTTON_PREV|BUTTON_REL, BUTTON_PREV|BUTTON_REPEAT }, - { ACTION_WPS_SKIPNEXT, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, - { ACTION_WPS_SEEKFWD, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_STOPSEEK, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT|BUTTON_REPEAT }, - { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, - { ACTION_WPS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, - { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_BROWSE, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, - { ACTION_WPS_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, - { ACTION_WPS_MENU, BUTTON_OPTION|BUTTON_REL, BUTTON_OPTION }, - { ACTION_WPS_QUICKSCREEN, BUTTON_OPTION|BUTTON_REPEAT, BUTTON_OPTION }, - { ACTION_WPS_HOTKEY, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, - -// XXX BUTTON_UP and BUTTON_DOWN aren't on here. - - { ACTION_STD_KEYLOCK, BUTTON_POWER, BUTTON_NONE }, - - LAST_ITEM_IN_LIST -}; /* button_context_wps */ - -static const struct button_mapping button_context_list[] = { - { ACTION_LIST_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, - { ACTION_LIST_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, - { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; /* button_context_list */ - -/** Bookmark Screen **/ -static const struct button_mapping button_context_bmark[] = { - { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) -}; /* button_context_bmark */ - -/** Keyboard **/ -static const struct button_mapping button_context_keyboard[] = { - { ACTION_KBD_LEFT, BUTTON_PREV, BUTTON_NONE }, - { ACTION_KBD_LEFT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_RIGHT, BUTTON_NEXT, BUTTON_NONE }, - { ACTION_KBD_RIGHT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, - { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_CURSOR_LEFT, BUTTON_VOL_UP, BUTTON_NONE }, - { ACTION_KBD_CURSOR_LEFT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_CURSOR_RIGHT, BUTTON_VOL_DOWN, BUTTON_NONE }, - { ACTION_KBD_CURSOR_RIGHT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_BACKSPACE, BUTTON_HOME, BUTTON_NONE }, - { ACTION_KBD_BACKSPACE, BUTTON_HOME|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, - { ACTION_KBD_DONE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, - { ACTION_KBD_ABORT, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, - - LAST_ITEM_IN_LIST -}; /* button_context_keyboard */ - -/** Pitchscreen **/ -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_PREV, BUTTON_NONE }, - { ACTION_PS_NUDGE_LEFTOFF, BUTTON_PREV|BUTTON_REL, BUTTON_NONE }, - { ACTION_PS_NUDGE_RIGHT, BUTTON_NEXT, BUTTON_NONE }, - { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_NEXT|BUTTON_REL, BUTTON_NONE }, - { ACTION_PS_TOGGLE_MODE, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, - { ACTION_PS_RESET, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, - { ACTION_PS_EXIT, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, - { ACTION_PS_SLOWER, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_PS_FASTER, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; /* button_context_pitchscreen */ - -/** Quickscreen **/ -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_PREV, BUTTON_NONE }, - { ACTION_QS_LEFT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_QS_RIGHT, BUTTON_NEXT, BUTTON_NONE }, - { ACTION_QS_RIGHT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_CANCEL, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; /* button_context_quickscreen */ - -/** Settings - General Mappings **/ -static const struct button_mapping button_context_settings[] = { - { ACTION_SETTINGS_RESET, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, - { ACTION_STD_PREV, BUTTON_PREV, BUTTON_NONE }, - { ACTION_STD_PREVREPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_NEXT, BUTTON_NEXT, BUTTON_NONE }, - { ACTION_STD_NEXTREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, - { ACTION_STD_CANCEL, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; /* button_context_settings */ - -static const struct button_mapping button_context_settings_vol_is_inc[] = { - { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, - { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_SETTINGS_INC, BUTTON_VOL_UP, BUTTON_NONE }, - { ACTION_SETTINGS_INCREPEAT,BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, - { ACTION_SETTINGS_DECREPEAT,BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_SETTINGS_DEC, BUTTON_VOL_DOWN, BUTTON_NONE }, - { ACTION_SETTINGS_DECREPEAT,BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; /* button_context_settings_right_is_inc */ - -/** Tree **/ -static const struct button_mapping button_context_tree[] = { - { ACTION_TREE_WPS, BUTTON_OPTION|BUTTON_REL, BUTTON_OPTION }, - { ACTION_TREE_HOTKEY, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, - { ACTION_STD_MENU, BUTTON_OPTION|BUTTON_REPEAT, BUTTON_OPTION }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) -}; /* button_context_tree */ - -/** Yes/No Screen **/ -static const struct button_mapping button_context_yesnoscreen[] = { - { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; /* button_context_settings_yesnoscreen */ - -/* 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_LIST: - return button_context_list; - case CONTEXT_STD: - return button_context_standard; - case CONTEXT_BOOKMARKSCREEN: - return button_context_bmark; - case CONTEXT_KEYBOARD: - return button_context_keyboard; - case CONTEXT_PITCHSCREEN: - return button_context_pitchscreen; - case CONTEXT_QUICKSCREEN: - return button_context_quickscreen; - case CONTEXT_SETTINGS: - return button_context_settings; - case CONTEXT_SETTINGS_TIME: - case CONTEXT_SETTINGS_COLOURCHOOSER: - case CONTEXT_SETTINGS_EQ: - case CONTEXT_SETTINGS_RECTRIGGER: - return button_context_settings_vol_is_inc; - case CONTEXT_TREE: - case CONTEXT_MAINMENU: - return button_context_tree; - case CONTEXT_WPS: - return button_context_wps; - case CONTEXT_YESNOSCREEN: - return button_context_yesnoscreen; - } - return button_context_standard; -} diff --git a/apps/keymaps/keymap-fiiom3klinux.c b/apps/keymaps/keymap-fiiom3klinux.c new file mode 100644 index 0000000000..7cec8c67eb --- /dev/null +++ b/apps/keymaps/keymap-fiiom3klinux.c @@ -0,0 +1,224 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2019 by Roman Stolyarov + * + * 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 FiiO M3K Linux 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_PREV, BUTTON_PREV, BUTTON_NONE }, + { ACTION_STD_PREVREPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, + { ACTION_STD_NEXT, BUTTON_NEXT, BUTTON_NONE }, + { ACTION_STD_NEXTREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, + { ACTION_STD_CANCEL, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, + { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, + { ACTION_STD_MENU, BUTTON_OPTION|BUTTON_REL, BUTTON_OPTION }, + + 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_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, + { ACTION_WPS_SKIPPREV, BUTTON_PREV|BUTTON_REL, BUTTON_PREV }, + { ACTION_WPS_SEEKBACK, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_WPS_STOPSEEK, BUTTON_PREV|BUTTON_REL, BUTTON_PREV|BUTTON_REPEAT }, + { ACTION_WPS_SKIPNEXT, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, + { ACTION_WPS_SEEKFWD, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_WPS_STOPSEEK, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT|BUTTON_REPEAT }, + { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, + { ACTION_WPS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, + { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_WPS_BROWSE, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, + { ACTION_WPS_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, + { ACTION_WPS_MENU, BUTTON_OPTION|BUTTON_REL, BUTTON_OPTION }, + { ACTION_WPS_QUICKSCREEN, BUTTON_OPTION|BUTTON_REPEAT, BUTTON_OPTION }, + { ACTION_WPS_HOTKEY, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, + +// XXX BUTTON_UP and BUTTON_DOWN aren't on here. + + { ACTION_STD_KEYLOCK, BUTTON_POWER, BUTTON_NONE }, + + LAST_ITEM_IN_LIST +}; /* button_context_wps */ + +static const struct button_mapping button_context_list[] = { + { ACTION_LIST_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, + { ACTION_LIST_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, + { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) +}; /* button_context_list */ + +/** Bookmark Screen **/ +static const struct button_mapping button_context_bmark[] = { + { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, + + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) +}; /* button_context_bmark */ + +/** Keyboard **/ +static const struct button_mapping button_context_keyboard[] = { + { ACTION_KBD_LEFT, BUTTON_PREV, BUTTON_NONE }, + { ACTION_KBD_LEFT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_KBD_RIGHT, BUTTON_NEXT, BUTTON_NONE }, + { ACTION_KBD_RIGHT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, + { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_KBD_CURSOR_LEFT, BUTTON_VOL_UP, BUTTON_NONE }, + { ACTION_KBD_CURSOR_LEFT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_KBD_CURSOR_RIGHT, BUTTON_VOL_DOWN, BUTTON_NONE }, + { ACTION_KBD_CURSOR_RIGHT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_KBD_BACKSPACE, BUTTON_HOME, BUTTON_NONE }, + { ACTION_KBD_BACKSPACE, BUTTON_HOME|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_KBD_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, + { ACTION_KBD_DONE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, + { ACTION_KBD_ABORT, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, + + LAST_ITEM_IN_LIST +}; /* button_context_keyboard */ + +/** Pitchscreen **/ +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_PREV, BUTTON_NONE }, + { ACTION_PS_NUDGE_LEFTOFF, BUTTON_PREV|BUTTON_REL, BUTTON_NONE }, + { ACTION_PS_NUDGE_RIGHT, BUTTON_NEXT, BUTTON_NONE }, + { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_NEXT|BUTTON_REL, BUTTON_NONE }, + { ACTION_PS_TOGGLE_MODE, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, + { ACTION_PS_RESET, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, + { ACTION_PS_EXIT, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, + { ACTION_PS_SLOWER, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_PS_FASTER, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, + + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) +}; /* button_context_pitchscreen */ + +/** Quickscreen **/ +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_PREV, BUTTON_NONE }, + { ACTION_QS_LEFT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_QS_RIGHT, BUTTON_NEXT, BUTTON_NONE }, + { ACTION_QS_RIGHT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, + + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) +}; /* button_context_quickscreen */ + +/** Settings - General Mappings **/ +static const struct button_mapping button_context_settings[] = { + { ACTION_SETTINGS_RESET, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, + { ACTION_STD_PREV, BUTTON_PREV, BUTTON_NONE }, + { ACTION_STD_PREVREPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_NEXT, BUTTON_NEXT, BUTTON_NONE }, + { ACTION_STD_NEXTREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, + { ACTION_STD_CANCEL, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, + + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) +}; /* button_context_settings */ + +static const struct button_mapping button_context_settings_vol_is_inc[] = { + { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, + { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_SETTINGS_INC, BUTTON_VOL_UP, BUTTON_NONE }, + { ACTION_SETTINGS_INCREPEAT,BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, + { ACTION_SETTINGS_DECREPEAT,BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_SETTINGS_DEC, BUTTON_VOL_DOWN, BUTTON_NONE }, + { ACTION_SETTINGS_DECREPEAT,BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) +}; /* button_context_settings_right_is_inc */ + +/** Tree **/ +static const struct button_mapping button_context_tree[] = { + { ACTION_TREE_WPS, BUTTON_OPTION|BUTTON_REL, BUTTON_OPTION }, + { ACTION_TREE_HOTKEY, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, + { ACTION_STD_MENU, BUTTON_OPTION|BUTTON_REPEAT, BUTTON_OPTION }, + + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) +}; /* button_context_tree */ + +/** Yes/No Screen **/ +static const struct button_mapping button_context_yesnoscreen[] = { + { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, + + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) +}; /* button_context_settings_yesnoscreen */ + +/* 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_LIST: + return button_context_list; + case CONTEXT_STD: + return button_context_standard; + case CONTEXT_BOOKMARKSCREEN: + return button_context_bmark; + case CONTEXT_KEYBOARD: + return button_context_keyboard; + case CONTEXT_PITCHSCREEN: + return button_context_pitchscreen; + case CONTEXT_QUICKSCREEN: + return button_context_quickscreen; + case CONTEXT_SETTINGS: + return button_context_settings; + case CONTEXT_SETTINGS_TIME: + case CONTEXT_SETTINGS_COLOURCHOOSER: + case CONTEXT_SETTINGS_EQ: + case CONTEXT_SETTINGS_RECTRIGGER: + return button_context_settings_vol_is_inc; + case CONTEXT_TREE: + case CONTEXT_MAINMENU: + return button_context_tree; + case CONTEXT_WPS: + return button_context_wps; + case CONTEXT_YESNOSCREEN: + return button_context_yesnoscreen; + } + return button_context_standard; +} diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index deee2815bb..dc22489b15 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c @@ -91,7 +91,7 @@ CONFIG_KEYPAD == IHIFI_800_PAD || \ CONFIG_KEYPAD == XDUOO_X3II_PAD || \ CONFIG_KEYPAD == XDUOO_X20_PAD || \ - CONFIG_KEYPAD == FIIO_M3K_PAD || \ + CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD || \ CONFIG_KEYPAD == EROSQ_PAD) #define BATTERY_ON BUTTON_PLAY diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index b5e58c5914..f434784a5f 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c @@ -559,7 +559,7 @@ enum { #define BJACK_RIGHT BUTTON_NEXT #define BJACK_LEFT BUTTON_PREV -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define BJACK_SELECT_NAME "PLAY" #define BJACK_STAY_NAME "NEXT" #define BJACK_QUIT_NAME "POWER" diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index 4f4ffc8df6..70ad58a908 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c @@ -314,7 +314,7 @@ CONFIG_KEYPAD == SANSA_CONNECT_PAD #define UP BUTTON_HOME #define DOWN BUTTON_OPTION -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define QUIT BUTTON_POWER #define LEFT BUTTON_PREV #define RIGHT BUTTON_NEXT diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 77f79f9057..46d9da6149 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c @@ -504,7 +504,7 @@ F3: equal to "=" #define CALCULATOR_CALC (BUTTON_PLAY|BUTTON_REPEAT) #define CALCULATOR_CLEAR (BUTTON_POWER|BUTTON_REPEAT) -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define CALCULATOR_LEFT BUTTON_PREV #define CALCULATOR_RIGHT BUTTON_NEXT #define CALCULATOR_UP BUTTON_HOME diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index 59aba941ae..b52a62328f 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c @@ -391,7 +391,7 @@ #define CALENDAR_NEXT_MONTH BUTTON_VOL_UP #define CALENDAR_PREV_MONTH BUTTON_VOL_DOWN -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define CALENDAR_QUIT BUTTON_POWER #define CALENDAR_SELECT BUTTON_PLAY #define CALENDAR_NEXT_WEEK BUTTON_OPTION diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index e9b66787ee..aacc2ba412 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h @@ -539,7 +539,7 @@ #define CB_SCROLL_LEFT (BUTTON_PREV|BUTTON_REPEAT) #define CB_SCROLL_RIGHT (BUTTON_NEXT|BUTTON_REPEAT) -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define CB_SELECT BUTTON_PLAY #define CB_UP BUTTON_HOME #define CB_DOWN BUTTON_OPTION diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 27b3990b8b..9b933cdcd4 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c @@ -376,7 +376,7 @@ #define CHC_SETTINGS_OK BUTTON_PLAY #define CHC_SETTINGS_CANCEL BUTTON_POWER -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define CHC_QUIT BUTTON_POWER #define CHC_STARTSTOP BUTTON_PLAY #define CHC_RESET BUTTON_OPTION diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index 84e8e709c4..dde6faaccf 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c @@ -1259,7 +1259,7 @@ CONFIG_KEYPAD == MROBE500_PAD #define CHIP8_KEY6 BUTTON_NEXT #define CHIP8_KEY8 BUTTON_OPTION -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define CHIP8_OFF BUTTON_POWER #define CHIP8_KEY2 BUTTON_HOME #define CHIP8_KEY4 BUTTON_PREV diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index 35c80a960b..23b32150da 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c @@ -198,7 +198,7 @@ CONFIG_KEYPAD == MROBE500_PAD #define ACTION BUTTON_SELECT #define ACTIONTEXT "Select" -#elif CONFIG_KEYPAD == XDUOO_X3_PAD || CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD || CONFIG_KEYPAD == FIIO_M3K_PAD || CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD || CONFIG_KEYPAD == EROSQ_PAD +#elif CONFIG_KEYPAD == XDUOO_X3_PAD || CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD || CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD || CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD || CONFIG_KEYPAD == EROSQ_PAD #define QUIT BUTTON_POWER #define ACTION BUTTON_PLAY #define ACTIONTEXT "PLAY" diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c index 08264e8490..eb0e0d1a59 100644 --- a/apps/plugins/clix.c +++ b/apps/plugins/clix.c @@ -292,7 +292,7 @@ #define CLIX_BUTTON_RIGHT BUTTON_NEXT #define CLIX_BUTTON_CLICK BUTTON_PLAY -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define CLIX_BUTTON_QUIT BUTTON_POWER #define CLIX_BUTTON_UP BUTTON_HOME #define CLIX_BUTTON_DOWN BUTTON_OPTION diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 416bf1105d..b84a2636cb 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c @@ -380,7 +380,7 @@ #define CUBE_PAUSE BUTTON_HOME #define CUBE_HIGHSPEED BUTTON_PLAY -#elif (CONFIG_KEYPAD == FIIO_M3K_PAD) +#elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) #define CUBE_QUIT BUTTON_POWER #define CUBE_NEXT BUTTON_NEXT #define CUBE_PREV BUTTON_PREV diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 99b4de827d..233c1cac8f 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c @@ -577,7 +577,7 @@ void I_ShutdownGraphics(void) #define DOOMBUTTON_ENTER BUTTON_PLAY #define DOOMBUTTON_WEAPON BUTTON_VOL_UP -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN #define DOOMBUTTON_LEFT BUTTON_PREV diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index a4d59fff3d..4a6e64a5be 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c @@ -448,7 +448,7 @@ #define FLIPIT_STEP_BY_STEP (BUTTON_HOME | BUTTON_PLAY) #define FLIPIT_TOGGLE BUTTON_PLAY -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define FLIPIT_LEFT BUTTON_PREV #define FLIPIT_RIGHT BUTTON_NEXT diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h index d4d013550e..55bd513fe0 100644 --- a/apps/plugins/fractals/fractal.h +++ b/apps/plugins/fractals/fractal.h @@ -470,7 +470,7 @@ #define FRACTAL_PRECISION_DEC (BUTTON_PLAY | BUTTON_PREV) #define FRACTAL_RESET (BUTTON_HOME | BUTTON_POWER) -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define FRACTAL_QUIT BUTTON_POWER #define FRACTAL_UP BUTTON_HOME #define FRACTAL_DOWN BUTTON_OPTION diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h index db70216464..375588c7d8 100644 --- a/apps/plugins/goban/goban.h +++ b/apps/plugins/goban/goban.h @@ -455,7 +455,7 @@ #define GBN_BUTTON_CONTEXT BUTTON_PLAY | BUTTON_REPEAT #define GBN_BUTTON_NEXT_VAR BUTTON_HOME | BUTTON_POWER -#elif (CONFIG_KEYPAD == FIIO_M3K_PAD) +#elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) #define GBN_BUTTON_UP BUTTON_HOME #define GBN_BUTTON_DOWN BUTTON_OPTION #define GBN_BUTTON_LEFT BUTTON_PREV diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h index 4559a7b3a3..221ea3380e 100644 --- a/apps/plugins/imageviewer/imageviewer_button.h +++ b/apps/plugins/imageviewer/imageviewer_button.h @@ -491,7 +491,7 @@ #define IMGVIEW_MENU BUTTON_POWER #define IMGVIEW_SLIDE_SHOW (BUTTON_HOME|BUTTON_POWER) -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define IMGVIEW_ZOOM_PRE BUTTON_PLAY #define IMGVIEW_ZOOM_IN (BUTTON_PLAY | BUTTON_REL) #define IMGVIEW_ZOOM_OUT (BUTTON_PLAY | BUTTON_REPEAT) diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index 1c39a01c87..21bba6d9d4 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c @@ -275,7 +275,7 @@ CONFIG_KEYPAD == MROBE500_PAD #define RIGHT BUTTON_VOL_DOWN #define FIRE BUTTON_VOL_UP -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define QUIT BUTTON_POWER #define LEFT BUTTON_HOME diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index b58c47dd12..928cd78c95 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c @@ -357,7 +357,7 @@ CONFIG_KEYPAD == MROBE500_PAD #define HK_SELECT "PLAY" #define HK_CANCEL "POWER" -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define JEWELS_UP BUTTON_HOME #define JEWELS_DOWN BUTTON_OPTION #define JEWELS_LEFT BUTTON_PREV diff --git a/apps/plugins/lib/keymaps.h b/apps/plugins/lib/keymaps.h index 7c1b998400..b0667b13cc 100644 --- a/apps/plugins/lib/keymaps.h +++ b/apps/plugins/lib/keymaps.h @@ -223,7 +223,7 @@ #define BTN_FIRE BUTTON_PLAY #define BTN_PAUSE BUTTON_POWER -#elif (CONFIG_KEYPAD == FIIO_M3K_PAD) +#elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) #define BTN_UP BUTTON_VOL_UP #define BTN_DOWN BUTTON_VOL_DOWN #define BTN_LEFT BUTTON_PREV diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 4d2a08cf47..4b5a0a4505 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c @@ -233,7 +233,7 @@ const struct button_mapping pla_main_ctx[] = { PLA_DOWN_REPEAT, BUTTON_OPTION|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 == FIIO_M3K_PAD) +#elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) { PLA_UP, BUTTON_HOME, BUTTON_NONE }, { PLA_DOWN, BUTTON_OPTION, BUTTON_NONE }, { PLA_LEFT, BUTTON_PREV, BUTTON_NONE }, @@ -482,7 +482,7 @@ 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 == FIIO_M3K_PAD) +#elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) {PLA_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER}, {PLA_EXIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE}, {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c index 641991cfeb..7dde947e1c 100644 --- a/apps/plugins/midi/midiplay.c +++ b/apps/plugins/midi/midiplay.c @@ -301,7 +301,7 @@ #define MIDI_VOL_DOWN BUTTON_VOL_DOWN #define MIDI_PLAYPAUSE BUTTON_PLAY -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define MIDI_QUIT BUTTON_POWER #define MIDI_FFWD BUTTON_NEXT #define MIDI_REWIND BUTTON_PREV diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 11c0e86619..590ea56d08 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c @@ -395,7 +395,7 @@ CONFIG_KEYPAD == MROBE500_PAD # define MINESWP_DISCOVER2 BUTTON_VOL_UP # define MINESWP_INFO (BUTTON_PLAY | BUTTON_OPTION) -#elif (CONFIG_KEYPAD == FIIO_M3K_PAD) +#elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) # define MINESWP_LEFT BUTTON_PREV # define MINESWP_RIGHT BUTTON_NEXT # define MINESWP_UP BUTTON_HOME diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index 177835549c..244265b250 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c @@ -2562,7 +2562,7 @@ CONFIG_KEYPAD == MROBE500_PAD #define MP3ENC_DONE BUTTON_POWER #define MP3ENC_SELECT BUTTON_PLAY -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define MP3ENC_PREV BUTTON_HOME #define MP3ENC_NEXT BUTTON_OPTION #define MP3ENC_DONE BUTTON_POWER diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 1bc7d4db96..44c72dd853 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c @@ -326,7 +326,7 @@ struct mpeg_settings settings; #define MPEG_START_TIME_RIGHT2 BUTTON_VOL_DOWN #define MPEG_START_TIME_EXIT BUTTON_POWER -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define MPEG_START_TIME_SELECT BUTTON_PLAY #define MPEG_START_TIME_LEFT BUTTON_PREV #define MPEG_START_TIME_RIGHT BUTTON_NEXT diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 619be8f1ef..81b6d37857 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c @@ -459,7 +459,7 @@ CONFIG_KEYPAD == SANSA_M200_PAD #define MPEG_RW BUTTON_PREV #define MPEG_FF BUTTON_NEXT -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define MPEG_MENU BUTTON_PLAY #define MPEG_STOP BUTTON_POWER #define MPEG_PAUSE BUTTON_HOME diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index 62c11b91c9..d50de7f2a0 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c @@ -498,7 +498,7 @@ #define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN #define NEED_LASTBUTTON -#elif (CONFIG_KEYPAD == FIIO_M3K_PAD) +#elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) #define OSCILLOSCOPE_QUIT BUTTON_POWER #define OSCILLOSCOPE_DRAWMODE_PRE BUTTON_PLAY #define OSCILLOSCOPE_DRAWMODE (BUTTON_PLAY | BUTTON_REL) diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index 39583edbd4..48196146a7 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h @@ -373,7 +373,7 @@ #define PACMAN_1UP BUTTON_VOL_UP #define PACMAN_COIN BUTTON_PLAY -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define PACMAN_UP BUTTON_PREV #define PACMAN_DOWN BUTTON_NEXT #define PACMAN_LEFT BUTTON_HOME diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index a84b687763..e16cf2921e 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c @@ -643,7 +643,7 @@ CONFIG_KEYPAD == MROBE500_PAD #define LVL_UP_TEXT "VOL+" #define LVL_DOWN_TEXT "VOL-" -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define PEGBOX_SELECT BUTTON_PLAY #define PEGBOX_QUIT BUTTON_POWER #define PEGBOX_RESTART (BUTTON_POWER | BUTTON_HOME) @@ -677,7 +677,7 @@ CONFIG_KEYPAD == MROBE500_PAD #define LVL_UP_TEXT "VOL+" #define LVL_DOWN_TEXT "VOL-" -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define PEGBOX_SELECT BUTTON_PLAY #define PEGBOX_QUIT BUTTON_POWER #define PEGBOX_RESTART (BUTTON_POWER | BUTTON_HOME) diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index d5952aac35..4df4db66bb 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c @@ -301,7 +301,7 @@ CONFIG_KEYPAD == MROBE500_PAD #define PONG_RIGHT_UP BUTTON_HOME #define PONG_RIGHT_DOWN BUTTON_NEXT -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define PONG_QUIT BUTTON_POWER #define PONG_PAUSE BUTTON_PLAY #define PONG_LEFT_UP BUTTON_PREV diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h index 0a2348a28d..c94ca59179 100644 --- a/apps/plugins/reversi/reversi-gui.h +++ b/apps/plugins/reversi/reversi-gui.h @@ -330,7 +330,7 @@ #define REVERSI_BUTTON_MENU BUTTON_PLAY #define REVERSI_BUTTON_MENU_LONGPRESS -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define REVERSI_BUTTON_QUIT BUTTON_POWER #define REVERSI_BUTTON_UP BUTTON_HOME #define REVERSI_BUTTON_DOWN BUTTON_OPTION diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index 6a8b50a68d..7958818a8e 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c @@ -443,7 +443,7 @@ #define ROCKBLOX_DROP (BUTTON_PLAY|BUTTON_REL) #define ROCKBLOX_RESTART (BUTTON_PLAY|BUTTON_REPEAT) -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define ROCKBLOX_OFF BUTTON_POWER #define ROCKBLOX_ROTATE_CCW BUTTON_HOME diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 75de5230f2..1f65b780a6 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c @@ -435,7 +435,7 @@ static void setoptions (void) options.SELECT = BUTTON_VOL_UP; options.MENU = BUTTON_POWER; -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD options.UP = BUTTON_PREV; options.DOWN = BUTTON_NEXT; diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index f28fbdf622..e2b1f2a3e3 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c @@ -360,7 +360,7 @@ #define ROCKPAINT_LEFT BUTTON_PREV #define ROCKPAINT_RIGHT BUTTON_NEXT -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define ROCKPAINT_QUIT BUTTON_POWER #define ROCKPAINT_DRAW BUTTON_PLAY #define ROCKPAINT_MENU (BUTTON_HOME | BUTTON_POWER) diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index 8c70f6b4a6..dec400c079 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c @@ -321,7 +321,7 @@ CONFIG_KEYPAD == MROBE500_PAD #define PUZZLE_SHUFFLE (BUTTON_HOME | BUTTON_POWER) #define PUZZLE_PICTURE BUTTON_PLAY -#elif (CONFIG_KEYPAD == FIIO_M3K_PAD) +#elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) #define PUZZLE_QUIT BUTTON_POWER #define PUZZLE_LEFT BUTTON_PREV #define PUZZLE_RIGHT BUTTON_NEXT diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index 0f2bcdce6c..c5c28eba6e 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c @@ -281,7 +281,7 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left; #define SNAKE_DOWN BUTTON_OPTION #define SNAKE_PLAYPAUSE BUTTON_PLAY -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define SNAKE_QUIT BUTTON_POWER #define SNAKE_LEFT BUTTON_PREV #define SNAKE_RIGHT BUTTON_NEXT diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index 464af413f9..fcc1790a13 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c @@ -410,7 +410,7 @@ CONFIG_KEYPAD == MROBE500_PAD #define SNAKE2_PLAYPAUSE BUTTON_PLAY #define SNAKE2_PLAYPAUSE_TEXT "PLAY" -#elif (CONFIG_KEYPAD == FIIO_M3K_PAD) +#elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) #define SNAKE2_LEFT BUTTON_PREV #define SNAKE2_RIGHT BUTTON_NEXT #define SNAKE2_UP BUTTON_HOME diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index e779722790..2dcea7546f 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c @@ -647,7 +647,7 @@ #define BUTTON_SAVE BUTTON_PLAY #define BUTTON_SAVE_NAME "PLAY" -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define SOKOBAN_LEFT BUTTON_PREV #define SOKOBAN_RIGHT BUTTON_NEXT #define SOKOBAN_UP BUTTON_HOME diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 6c496663cf..d14c608396 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c @@ -665,7 +665,7 @@ CONFIG_KEYPAD == MROBE500_PAD # define HK_CUR2STACK "DBL PLAY" # define HK_REM2STACK "NEXT" -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD # define SOL_QUIT BUTTON_POWER # define SOL_UP BUTTON_HOME # define SOL_DOWN BUTTON_OPTION diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index 67816120a1..608f3ee512 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c @@ -336,7 +336,7 @@ #define AST_RIGHT BUTTON_NEXT #define AST_FIRE BUTTON_PLAY -#elif (CONFIG_KEYPAD == FIIO_M3K_PAD) +#elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) #define AST_PAUSE BUTTON_VOL_UP #define AST_QUIT BUTTON_POWER #define AST_THRUST BUTTON_HOME diff --git a/apps/plugins/star.c b/apps/plugins/star.c index e44c867cdc..9de5032699 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c @@ -604,7 +604,7 @@ #define STAR_LEVEL_DOWN_NAME "PLAY + PREV" #define STAR_LEVEL_REPEAT_NAME "PLAY + OPTION" -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define STAR_QUIT BUTTON_POWER #define STAR_LEFT BUTTON_PREV #define STAR_RIGHT BUTTON_NEXT diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index db9cfd57da..82e6fba5c6 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c @@ -285,7 +285,7 @@ #define STOPWATCH_SCROLL_UP BUTTON_HOME #define STOPWATCH_SCROLL_DOWN BUTTON_OPTION -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define STOPWATCH_QUIT BUTTON_POWER #define STOPWATCH_START_STOP BUTTON_NEXT #define STOPWATCH_RESET_TIMER BUTTON_PREV diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 36f47a377a..de3802d9bc 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h @@ -418,7 +418,7 @@ #define SUDOKU_BUTTON_MENU (BUTTON_POWER | BUTTON_REL) #define SUDOKU_BUTTON_POSSIBLE (BUTTON_HOME | BUTTON_POWER) -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define SUDOKU_BUTTON_QUIT_PRE BUTTON_POWER #define SUDOKU_BUTTON_QUIT (BUTTON_POWER | BUTTON_REPEAT) #define SUDOKU_BUTTON_UP BUTTON_HOME diff --git a/apps/plugins/text_viewer/tv_button.h b/apps/plugins/text_viewer/tv_button.h index cf3a2b777e..ba71201cda 100644 --- a/apps/plugins/text_viewer/tv_button.h +++ b/apps/plugins/text_viewer/tv_button.h @@ -533,7 +533,7 @@ #define TV_LINE_DOWN BUTTON_OPTION #define TV_BOOKMARK (BUTTON_OPTION | BUTTON_PLAY) -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define TV_QUIT BUTTON_POWER #define TV_SCROLL_UP BUTTON_VOL_UP #define TV_SCROLL_DOWN BUTTON_VOL_DOWN diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 80e1960fad..629294ce7f 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c @@ -408,7 +408,7 @@ #define LABEL_MENU "PLAY" #define LABEL_VOLUME "VOL UP/DN" -#elif (CONFIG_KEYPAD == FIIO_M3K_PAD) +#elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) #define VUMETER_QUIT BUTTON_POWER #define VUMETER_HELP BUTTON_HOME #define VUMETER_MENU BUTTON_PLAY diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index e4286f35b4..d3db768535 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c @@ -371,7 +371,7 @@ CONFIG_KEYPAD == MROBE500_PAD #define BTN_QUIT BUTTON_POWER #define BTN_STOPRESET (BUTTON_HOME | BUTTON_POWER) -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define BTN_DIR_UP BUTTON_HOME #define BTN_DIR_DOWN BUTTON_OPTION #define BTN_DIR_LEFT BUTTON_PREV diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index 55a1dc4bdb..e04ecc225d 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c @@ -324,7 +324,7 @@ CONFIG_KEYPAD == MROBE500_PAD #define DOWN BUTTON_OPTION #define PAUSE BUTTON_PLAY -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define QUIT BUTTON_POWER #define LEFT BUTTON_PREV diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index 6c0fac6ddf..e62c33c157 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h @@ -274,7 +274,7 @@ #define ZX_UP BUTTON_HOME #define ZX_DOWN BUTTON_OPTION -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define ZX_SELECT BUTTON_PLAY #define ZX_MENU BUTTON_POWER #define ZX_LEFT BUTTON_PREV diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index f77ce538d1..6237ded8c1 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c @@ -266,7 +266,7 @@ #define KBD_UP BUTTON_HOME #define KBD_DOWN BUTTON_OPTION -#elif CONFIG_KEYPAD == FIIO_M3K_PAD +#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD #define KBD_SELECT BUTTON_PLAY #define KBD_ABORT BUTTON_POWER diff --git a/bootloader/SOURCES b/bootloader/SOURCES index e775fbe246..3c9a3068ad 100644 --- a/bootloader/SOURCES +++ b/bootloader/SOURCES @@ -78,7 +78,7 @@ show_logo.c mpio_hd200_hd300.c #elif defined(SONY_NWZ_LINUX) nwz_linux.c -#elif defined(HIBY_LINUX) || defined(FIIO_M3K) +#elif defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX) rocker_linux.c #elif defined(RK27_GENERIC) || defined(HM60X) || defined(HM801) \ || defined(MA9) || defined(MA9C) || defined(MA8) || defined(MA8C) \ diff --git a/bootloader/rocker_linux.c b/bootloader/rocker_linux.c index fc633d504e..c0cba2776c 100644 --- a/bootloader/rocker_linux.c +++ b/bootloader/rocker_linux.c @@ -72,7 +72,7 @@ #define BUTTON_DOWN BUTTON_HOME #define BUTTON_SELECT BUTTON_PLAY #include "bitmaps/hibyicon.h" -#elif defined(FIIO_M3K) +#elif defined(FIIO_M3K_LINUX) #define ICON_WIDTH 130 #define ICON_HEIGHT 130 #define ICON_NAME bm_fiioicon @@ -95,7 +95,7 @@ #endif #define BASE_DIR PIVOT_ROOT -//#ifdef FIIO_M3K +//#ifdef FIIO_M3K_LINUX //#define BASE_DIR "/mnt" //#else //#define BASE_DIR "/mnt/sd_0" @@ -469,7 +469,7 @@ void run_script_menu(void) static void adb(int start) { -#if defined(FIIO_M3K) +#if defined(FIIO_M3K_LINUX) lcd_set_foreground(LCD_RGBPACK(255, 0, 0)); lcd_putsf(0, 1, "ADB not supported!"); sleep(2*HZ); @@ -622,7 +622,7 @@ int main(int argc, char **argv) #endif mount_storage(false); /* boot OF */ -#if defined(FIIO_M3K) +#if defined(FIIO_M3K_LINUX) execvp("/usr/project/bin/player_daemon", argv); #else execvp("/usr/bin/hiby_player", argv); diff --git a/firmware/SOURCES b/firmware/SOURCES index 11929d8253..36a125783c 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -115,7 +115,7 @@ target/hosted/sonynwz/nvp-nwz.c target/hosted/sonynwz/nwz-db.c #endif -#if ((defined(HIBY_LINUX) || defined(FIIO_M3K)) && !defined(SIMULATOR)) +#if ((defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX)) && !defined(SIMULATOR)) drivers/lcd-memframe.c target/hosted/alsa-controls.c target/hosted/pcm-alsa.c @@ -148,7 +148,7 @@ target/hosted/usb-hiby.c target/hosted/button-devinput.c #endif -#if (defined(FIIO_M3K)) && !defined(SIMULATOR) +#if (defined(FIIO_M3K_LINUX)) && !defined(SIMULATOR) target/hosted/fiio/buttonlight-fiio.c target/hosted/fiio/button-fiio.c target/hosted/fiio/debug-fiio.c diff --git a/firmware/asm/SOURCES b/firmware/asm/SOURCES index 2b18ea2026..ebeaf49193 100644 --- a/firmware/asm/SOURCES +++ b/firmware/asm/SOURCES @@ -16,7 +16,7 @@ mempcpy.c defined(COWON_D2) || defined(MINI2440) || defined(SAMSUNG_YPR0) || \ defined(SAMSUNG_YPR1) || defined(DX50) || defined(DX90) || (defined(MROBE_500) && !defined(LCD_USE_DMA)) || \ defined(CREATIVE_ZEN) || defined(CREATIVE_ZENXFI) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || \ - defined(FIIO_M3K)) && \ + defined(FIIO_M3K_LINUX)) && \ !defined(SIMULATOR) #if LCD_DEPTH >= 24 lcd-as-memframe-24bit.c diff --git a/firmware/drivers/audio/fiiolinux_codec.c b/firmware/drivers/audio/fiiolinux_codec.c index b2d95c91e9..31731fd6ed 100644 --- a/firmware/drivers/audio/fiiolinux_codec.c +++ b/firmware/drivers/audio/fiiolinux_codec.c @@ -166,7 +166,7 @@ void audiohw_set_filter_roll_off(int value) 1 = Slow; 2 = Short Sharp 3 = Short Slow */ -#if 0 // defined(FIIO_M3K) +#if 0 // defined(FIIO_M3K_LINUX) // AK4376 supports this but the control isn't wired into ALSA! long int value_hw = value; alsa_controls_set_ints("AK4376 Digital Filter", 1, &value_hw); diff --git a/firmware/export/config.h b/firmware/export/config.h index 547c359d8d..e35d407372 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -163,7 +163,7 @@ #define IHIFI_800_PAD 68 #define XDUOO_X3II_PAD 69 #define XDUOO_X20_PAD 70 -#define FIIO_M3K_PAD 71 +#define FIIO_M3K_LINUX_PAD 71 #define EROSQ_PAD 72 /* CONFIG_REMOTE_KEYPAD */ @@ -603,8 +603,8 @@ Lyre prototype 1 */ #include "config/xduoox3ii.h" #elif defined(XDUOO_X20) #include "config/xduoox20.h" -#elif defined(FIIO_M3K) -#include "config/fiiom3k.h" +#elif defined(FIIO_M3K_LINUX) +#include "config/fiiom3klinux.h" #elif defined(EROS_Q) #include "config/aigoerosq.h" #else diff --git a/firmware/export/config/fiiom3k.h b/firmware/export/config/fiiom3k.h deleted file mode 100644 index 6e831f2f55..0000000000 --- a/firmware/export/config/fiiom3k.h +++ /dev/null @@ -1,130 +0,0 @@ -/* - * This config file is for the FiiO M3K - */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 112 - -#define MODEL_NAME "FiiO M3K" - -/* LCD dimensions */ -#define LCD_WIDTH 240 -#define LCD_HEIGHT 320 -/* sqrt(240^2 + 320^2) / 2.0 = 200 */ -#define LCD_DPI 200 - -#ifndef SIMULATOR -#define CONFIG_PLATFORM (PLATFORM_HOSTED) -#define PIVOT_ROOT "/mnt" -#endif - -#define HAVE_FPU - -#define HW_SAMPR_CAPS (SAMPR_CAP_44 | SAMPR_CAP_48 | SAMPR_CAP_88 | SAMPR_CAP_96 | SAMPR_CAP_176 | SAMPR_CAP_192) - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -#define LCD_DEPTH 16 -/* Check that but should not matter */ -#define LCD_PIXELFORMAT RGB565 - -#define HAVE_BACKLIGHT -#define HAVE_BACKLIGHT_BRIGHTNESS - -/* define this if you have a light associated with the buttons */ -#define HAVE_BUTTON_LIGHT -#define HAVE_BUTTONLIGHT_BRIGHTNESS - -/* Main LCD backlight brightness range and defaults: the backlight driver - * has levels from 0 to 32. But 0 is off so start at 1. - */ -#define MIN_BRIGHTNESS_SETTING 1 -#define MAX_BRIGHTNESS_SETTING 255 -#define BRIGHTNESS_STEP 5 -#define DEFAULT_BRIGHTNESS_SETTING 70 - -/* Which backlight fading type? */ -#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_SETTING - -/* define this if you have a real-time clock */ -#define CONFIG_RTC APPLICATION - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x80000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x100000 - -#define HAVE_HEADPHONE_DETECTION - -/* KeyPad configuration for plugins */ -#define CONFIG_KEYPAD FIIO_M3K_PAD - -/* Define this if a programmable hotkey is mapped */ -#define HAVE_HOTKEY - -/* define this if the target has volume keys which can be used in the lists */ -#define HAVE_VOLUME_IN_LIST - -#ifndef SIMULATOR -/* We have usb power and can detect usb but it is handled by Linux */ -#define HAVE_USB_POWER - -#endif - -#define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE - -/* Linux controlls charging, we can monitor */ -#define CONFIG_CHARGING CHARGING_MONITOR - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* same dimensions as gigabeats */ -#define CONFIG_LCD LCD_INGENIC_LINUX - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* Define this to the CPU frequency */ -#define CPU_FREQ 1008000000 - -/* No special storage */ -#define CONFIG_STORAGE STORAGE_HOSTFS -#define HAVE_STORAGE_FLUSH - -/* Battery */ -#define BATTERY_TYPES_COUNT 1 - -/* Audio codec */ -#define HAVE_FIIO_LINUX_CODEC - -/* We don't have hardware controls */ -#define HAVE_SW_TONE_CONTROLS - -/* Battery */ -#define BATTERY_CAPACITY_DEFAULT 1100 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 1100 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 1100 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 0 /* capacity increment */ - -/* ROLO */ -#define BOOTFILE_EXT "m3k" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" diff --git a/firmware/export/config/fiiom3klinux.h b/firmware/export/config/fiiom3klinux.h new file mode 100644 index 0000000000..51d2a222e6 --- /dev/null +++ b/firmware/export/config/fiiom3klinux.h @@ -0,0 +1,130 @@ +/* + * This config file is for the FiiO M3K (Linux version) + */ + +/* For Rolo and boot loader */ +#define MODEL_NUMBER 112 + +#define MODEL_NAME "FiiO M3K" + +/* LCD dimensions */ +#define LCD_WIDTH 240 +#define LCD_HEIGHT 320 +/* sqrt(240^2 + 320^2) / 2.0 = 200 */ +#define LCD_DPI 200 + +#ifndef SIMULATOR +#define CONFIG_PLATFORM (PLATFORM_HOSTED) +#define PIVOT_ROOT "/mnt" +#endif + +#define HAVE_FPU + +#define HW_SAMPR_CAPS (SAMPR_CAP_44 | SAMPR_CAP_48 | SAMPR_CAP_88 | SAMPR_CAP_96 | SAMPR_CAP_176 | SAMPR_CAP_192) + +/* define this if you have a colour LCD */ +#define HAVE_LCD_COLOR + +/* define this if you want album art for this target */ +#define HAVE_ALBUMART + +/* define this to enable bitmap scaling */ +#define HAVE_BMP_SCALING + +/* define this to enable JPEG decoding */ +#define HAVE_JPEG + +/* define this if you have access to the quickscreen */ +#define HAVE_QUICKSCREEN + +/* define this if you would like tagcache to build on this target */ +#define HAVE_TAGCACHE + +#define LCD_DEPTH 16 +/* Check that but should not matter */ +#define LCD_PIXELFORMAT RGB565 + +#define HAVE_BACKLIGHT +#define HAVE_BACKLIGHT_BRIGHTNESS + +/* define this if you have a light associated with the buttons */ +#define HAVE_BUTTON_LIGHT +#define HAVE_BUTTONLIGHT_BRIGHTNESS + +/* Main LCD backlight brightness range and defaults: the backlight driver + * has levels from 0 to 32. But 0 is off so start at 1. + */ +#define MIN_BRIGHTNESS_SETTING 1 +#define MAX_BRIGHTNESS_SETTING 255 +#define BRIGHTNESS_STEP 5 +#define DEFAULT_BRIGHTNESS_SETTING 70 + +/* Which backlight fading type? */ +#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_SETTING + +/* define this if you have a real-time clock */ +#define CONFIG_RTC APPLICATION + +/* The number of bytes reserved for loadable codecs */ +#define CODEC_SIZE 0x80000 + +/* The number of bytes reserved for loadable plugins */ +#define PLUGIN_BUFFER_SIZE 0x100000 + +#define HAVE_HEADPHONE_DETECTION + +/* KeyPad configuration for plugins */ +#define CONFIG_KEYPAD FIIO_M3K_LINUX_PAD + +/* Define this if a programmable hotkey is mapped */ +#define HAVE_HOTKEY + +/* define this if the target has volume keys which can be used in the lists */ +#define HAVE_VOLUME_IN_LIST + +#ifndef SIMULATOR +/* We have usb power and can detect usb but it is handled by Linux */ +#define HAVE_USB_POWER + +#endif + +#define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE + +/* Linux controlls charging, we can monitor */ +#define CONFIG_CHARGING CHARGING_MONITOR + +/* define this if the hardware can be powered off while charging */ +#define HAVE_POWEROFF_WHILE_CHARGING + +/* same dimensions as gigabeats */ +#define CONFIG_LCD LCD_INGENIC_LINUX + +/* Define this if you have a software controlled poweroff */ +#define HAVE_SW_POWEROFF + +/* Define this to the CPU frequency */ +#define CPU_FREQ 1008000000 + +/* No special storage */ +#define CONFIG_STORAGE STORAGE_HOSTFS +#define HAVE_STORAGE_FLUSH + +/* Battery */ +#define BATTERY_TYPES_COUNT 1 + +/* Audio codec */ +#define HAVE_FIIO_LINUX_CODEC + +/* We don't have hardware controls */ +#define HAVE_SW_TONE_CONTROLS + +/* Battery */ +#define BATTERY_CAPACITY_DEFAULT 1100 /* default battery capacity */ +#define BATTERY_CAPACITY_MIN 1100 /* min. capacity selectable */ +#define BATTERY_CAPACITY_MAX 1100 /* max. capacity selectable */ +#define BATTERY_CAPACITY_INC 0 /* capacity increment */ + +/* ROLO */ +#define BOOTFILE_EXT "m3k" +#define BOOTFILE "rockbox." BOOTFILE_EXT +#define BOOTDIR "/.rockbox" diff --git a/firmware/export/rbpaths.h b/firmware/export/rbpaths.h index da5a2fb71c..f53d0eb480 100644 --- a/firmware/export/rbpaths.h +++ b/firmware/export/rbpaths.h @@ -43,7 +43,7 @@ /* NOTE: target-specific hosted HOME_DIR resides in filesystem-app.c */ #if !defined(APPLICATION) || defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || \ defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX) || \ - defined(HIBY_LINUX) || defined(FIIO_M3K) + defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX) #define HOME_DIR "/" @@ -80,7 +80,7 @@ #if defined(APPLICATION) && \ !(defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || \ - defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K)) + defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX)) #define PLUGIN_DATA_DIR ROCKBOX_DIR "/rocks.data" #define PLUGIN_GAMES_DATA_DIR PLUGIN_DATA_DIR diff --git a/firmware/export/system.h b/firmware/export/system.h index 68d7958870..f9a074349b 100644 --- a/firmware/export/system.h +++ b/firmware/export/system.h @@ -347,7 +347,7 @@ static inline void cpu_boost_unlock(void) #ifndef SIMULATOR bool dbg_ports(void); #endif -#if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K) +#if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX) bool dbg_hw_info(void); #endif diff --git a/firmware/font.c b/firmware/font.c index b2ac1a3c3c..595410fed2 100644 --- a/firmware/font.c +++ b/firmware/font.c @@ -85,7 +85,7 @@ /* compiled-in font */ extern struct font sysfont; -#if !defined(BOOTLOADER) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K) +#if !defined(BOOTLOADER) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX) struct buflib_alloc_data { struct font font; /* must be the first member! */ diff --git a/tools/builds.pm b/tools/builds.pm index b46b32f0a0..fbe8902e9e 100644 --- a/tools/builds.pm +++ b/tools/builds.pm @@ -448,7 +448,7 @@ $releasenotes="/wiki/ReleaseNotes315"; name => 'xDuoo X20', status => 2, }, - 'fiiom3k' => { + 'fiiom3klinux' => { name => 'FiiO M3K', status => 1, }, diff --git a/tools/configure b/tools/configure index 07d90b26ef..c057f90006 100755 --- a/tools/configure +++ b/tools/configure @@ -1595,7 +1595,7 @@ cat <