Rename symbols of FiiO M3K Linux-based port
Mainly a straight replacement of FIIO_M3K -> FIIO_M3K_LINUX. Change-Id: Id07c84f8150991d1b6851540c2c3f8f67e3f12c2
This commit is contained in:
parent
55dc86f5db
commit
aacb0811d9
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
*
|
||||
****************************************************************************/
|
||||
|
||||
/* Button Code Definitions for FiiO M3K target */
|
||||
/* Button Code Definitions for FiiO M3K Linux target */
|
||||
|
||||
#include "config.h"
|
||||
#include "action.h"
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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},
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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) \
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* This config file is for the FiiO M3K
|
||||
* This config file is for the FiiO M3K (Linux version)
|
||||
*/
|
||||
|
||||
/* For Rolo and boot loader */
|
||||
|
@ -74,7 +74,7 @@
|
|||
#define HAVE_HEADPHONE_DETECTION
|
||||
|
||||
/* KeyPad configuration for plugins */
|
||||
#define CONFIG_KEYPAD FIIO_M3K_PAD
|
||||
#define CONFIG_KEYPAD FIIO_M3K_LINUX_PAD
|
||||
|
||||
/* Define this if a programmable hotkey is mapped */
|
||||
#define HAVE_HOTKEY
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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! */
|
||||
|
|
|
@ -448,7 +448,7 @@ $releasenotes="/wiki/ReleaseNotes315";
|
|||
name => 'xDuoo X20',
|
||||
status => 2,
|
||||
},
|
||||
'fiiom3k' => {
|
||||
'fiiom3klinux' => {
|
||||
name => 'FiiO M3K',
|
||||
status => 1,
|
||||
},
|
||||
|
|
|
@ -1595,7 +1595,7 @@ cat <<EOF
|
|||
==AgpTek== 252) 800 227) NW-A20 series
|
||||
240) Rocker 228) NWZ-A860 series
|
||||
==FiiO== 229) NWZ-S750 series
|
||||
==AIGO== 244) M3K
|
||||
==AIGO== 244) M3K Linux
|
||||
245) Eros Q / K
|
||||
|
||||
EOF
|
||||
|
@ -4088,12 +4088,12 @@ fi
|
|||
sysfontbl="16-Terminus"
|
||||
;;
|
||||
|
||||
244|fiiom3k)
|
||||
244|fiiom3klinux)
|
||||
application="yes"
|
||||
app_type="fiio"
|
||||
target_id=112
|
||||
modelname="fiiom3k"
|
||||
target="FIIO_M3K"
|
||||
modelname="fiiom3klinux"
|
||||
target="FIIO_M3K_LINUX"
|
||||
memory=16 # XXX Can probably go over 32?
|
||||
tool="cp "
|
||||
boottool="cp "
|
||||
|
|
|
@ -845,7 +845,7 @@ do
|
|||
# glibc: 2.16
|
||||
# alsa: 1.0.29
|
||||
#
|
||||
# FiiO M3K:
|
||||
# FiiO M3K Linux:
|
||||
# kernel: 3.10.14
|
||||
# glibc: 2.16
|
||||
# alsa: 1.0.26
|
||||
|
|
Loading…
Reference in New Issue