forked from len0rd/rockbox
Fix puzzles... again
Change-Id: I34dd8673ebcbc7fcd55681175d0e18c8bbc5fe6c
This commit is contained in:
Franklin Wei
parent
42115ffab8
commit
39fe30ff58
3 changed files with 209 additions and 3 deletions
206
apps/plugins/puzzles/keymaps.h
Normal file
206
apps/plugins/puzzles/keymaps.h
Normal file
|
|
@ -0,0 +1,206 @@
|
|||
/***************************************************************************
|
||||
* __________ __ ___.
|
||||
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
|
||||
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
|
||||
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
|
||||
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
|
||||
* \/ \/ \/ \/ \/
|
||||
* $Id$
|
||||
*
|
||||
* Copyright (C) 2014 Franklin Wei, Benjamin Brown
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
***************************************************************************/
|
||||
|
||||
#ifndef _XWORLD_KEYMAPS_H
|
||||
#define _XWORLD_KEYMAPS_H
|
||||
|
||||
/* Handle the "nice" targets that have directional buttons with normal names */
|
||||
#if (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \
|
||||
(CONFIG_KEYPAD == PHILIPS_HDD6330_PAD) || \
|
||||
(CONFIG_KEYPAD == PHILIPS_SA9200_PAD) || \
|
||||
(CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD) || \
|
||||
(CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD) || \
|
||||
(CONFIG_KEYPAD == SANSA_CONNECT_PAD) || \
|
||||
(CONFIG_KEYPAD == SANSA_C200_PAD) || \
|
||||
(CONFIG_KEYPAD == SANSA_CLIP_PAD) || \
|
||||
(CONFIG_KEYPAD == SANSA_E200_PAD) || \
|
||||
(CONFIG_KEYPAD == SANSA_FUZE_PAD) || \
|
||||
(CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) || \
|
||||
(CONFIG_KEYPAD == GIGABEAT_PAD) || \
|
||||
(CONFIG_KEYPAD == GIGABEAT_S_PAD) || \
|
||||
(CONFIG_KEYPAD == SAMSUNG_YH92X_PAD) || \
|
||||
(CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
|
||||
(CONFIG_KEYPAD == IAUDIO_X5M5_PAD) || \
|
||||
(CONFIG_KEYPAD == CREATIVE_ZEN_PAD) || \
|
||||
(CONFIG_KEYPAD == SONY_NWZ_PAD) || \
|
||||
(CONFIG_KEYPAD == CREATIVEZVM_PAD) || \
|
||||
(CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) || \
|
||||
(CONFIG_KEYPAD == IRIVER_H300_PAD) || \
|
||||
(CONFIG_KEYPAD == HM801_PAD) || \
|
||||
(CONFIG_KEYPAD == HM60X_PAD)
|
||||
#define BTN_UP BUTTON_UP
|
||||
#define BTN_DOWN BUTTON_DOWN
|
||||
#define BTN_LEFT BUTTON_LEFT
|
||||
#define BTN_RIGHT BUTTON_RIGHT
|
||||
|
||||
#if (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD)
|
||||
#define BTN_UP_LEFT BUTTON_BACK
|
||||
#define BTN_UP_RIGHT BUTTON_PLAYPAUSE
|
||||
#define BTN_DOWN_LEFT BUTTON_BOTTOMLEFT
|
||||
#define BTN_DOWN_RIGHT BUTTON_BOTTOMRIGHT
|
||||
#endif
|
||||
|
||||
#if (CONFIG_KEYPAD == HM60X_PAD)
|
||||
#define BTN_FIRE BUTTON_POWER
|
||||
#define BTN_PAUSE BUTTON_SELECT
|
||||
#endif
|
||||
|
||||
#if (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \
|
||||
(CONFIG_KEYPAD == PHILIPS_HDD6330_PAD) || \
|
||||
(CONFIG_KEYPAD == PHILIPS_SA9200_PAD) || \
|
||||
(CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD) || \
|
||||
(CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD) || \
|
||||
(CONFIG_KEYPAD == SANSA_CONNECT_PAD) || \
|
||||
(CONFIG_KEYPAD == SANSA_C200_PAD) || \
|
||||
(CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) || \
|
||||
(CONFIG_KEYPAD == ONDAVX747_PAD)
|
||||
#define BTN_FIRE BUTTON_VOL_UP
|
||||
#define BTN_PAUSE BUTTON_VOL_DOWN
|
||||
|
||||
#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD)
|
||||
#define BTN_FIRE BUTTON_HOME
|
||||
#define BTN_PAUSE BUTTON_SELECT
|
||||
|
||||
#elif (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
|
||||
#define BTN_FIRE BUTTON_FFWD
|
||||
#define BTN_PAUSE BUTTON_REW
|
||||
|
||||
#elif (CONFIG_KEYPAD == SANSA_E200_PAD)
|
||||
#define BTN_FIRE BUTTON_REC
|
||||
#define BTN_PAUSE BUTTON_POWER
|
||||
|
||||
#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD)
|
||||
#define BTN_FIRE BUTTON_SELECT
|
||||
#define BTN_PAUSE BUTTON_POWER
|
||||
|
||||
#elif (CONFIG_KEYPAD == CREATIVE_ZEN_PAD)
|
||||
#define BTN_FIRE BUTTON_SELECT
|
||||
#define BTN_PAUSE BUTTON_BACK
|
||||
|
||||
#elif (CONFIG_KEYPAD == CREATIVEZVM_PAD)
|
||||
#define BTN_FIRE BUTTON_PLAY
|
||||
#define BTN_PAUSE BUTTON_MENU
|
||||
|
||||
#elif (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD)
|
||||
#define BTN_FIRE BUTTON_USER
|
||||
#define BTN_PAUSE BUTTON_MENU
|
||||
|
||||
#elif (CONFIG_KEYPAD == SONY_NWZ_PAD)
|
||||
#define BTN_FIRE BUTTON_PLAY
|
||||
#define BTN_PAUSE BUTTON_BACK
|
||||
|
||||
#elif (CONFIG_KEYPAD == IRIVER_H300_PAD)
|
||||
#define BTN_FIRE BUTTON_REC
|
||||
#define BTN_PAUSE BUTTON_MODE
|
||||
|
||||
#elif (CONFIG_KEYPAD == HM801_PAD)
|
||||
#define BTN_FIRE BUTTON_PREV
|
||||
#define BTN_PAUSE BUTTON_NEXT
|
||||
|
||||
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
|
||||
(CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
|
||||
#define BTN_FIRE BUTTON_REC
|
||||
#define BTN_PAUSE BUTTON_PLAY
|
||||
|
||||
#elif (CONFIG_KEYPAD == GIGABEAT_PAD) || \
|
||||
(CONFIG_KEYPAD == GIGABEAT_S_PAD)
|
||||
#define BTN_FIRE BUTTON_VOL_UP
|
||||
#define BTN_PAUSE BUTTON_MENU
|
||||
/* #if CONFIG_KEYPAD == PHILIPS_HDD1630_PAD */
|
||||
#endif
|
||||
|
||||
/* ... and now for the bad ones that don't have
|
||||
* standard names for the directional buttons */
|
||||
#elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD)
|
||||
#define BTN_UP BUTTON_OK
|
||||
#define BTN_DOWN BUTTON_CANCEL
|
||||
#define BTN_LEFT BUTTON_MENU
|
||||
#define BTN_RIGHT BUTTON_PLAY
|
||||
#define BTN_FIRE BUTTON_POWER
|
||||
#define BTN_PAUSE BUTTON_REC
|
||||
|
||||
#elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
|
||||
#define BTN_UP BUTTON_SCROLL_UP
|
||||
#define BTN_DOWN BUTTON_SCROLL_DOWN
|
||||
#define BTN_LEFT BUTTON_LEFT
|
||||
#define BTN_RIGHT BUTTON_RIGHT
|
||||
#define BTN_FIRE BUTTON_REW
|
||||
#define BTN_PAUSE BUTTON_PLAY
|
||||
|
||||
#elif (CONFIG_KEYPAD == MROBE500_PAD)
|
||||
#define BTN_FIRE BUTTON_POWER
|
||||
|
||||
#elif (CONFIG_KEYPAD == MROBE_REMOTE)
|
||||
#define BTN_UP BUTTON_RC_PLAY
|
||||
#define BTN_DOWN BUTTON_RC_DOWN
|
||||
#define BTN_LEFT BUTTON_RC_REW
|
||||
#define BTN_RIGHT BUTTON_RC_FF
|
||||
|
||||
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \
|
||||
(CONFIG_KEYPAD == IPOD_3G_PAD) || \
|
||||
(CONFIG_KEYPAD == IPOD_1G2G_PAD)
|
||||
#define BTN_UP BUTTON_MENU
|
||||
#define BTN_DOWN BUTTON_PLAY
|
||||
#define BTN_LEFT BUTTON_LEFT
|
||||
#define BTN_RIGHT BUTTON_RIGHT
|
||||
#define BTN_FIRE BUTTON_SELECT
|
||||
#define BTN_PAUSE (BUTTON_MENU | BUTTON_SELECT)
|
||||
|
||||
#elif (CONFIG_KEYPAD == ONDAVX777_PAD)
|
||||
#define BTN_FIRE BUTTON_POWER
|
||||
|
||||
#elif (CONFIG_KEYPAD == COWON_D2_PAD)
|
||||
#define BTN_FIRE BUTTON_PLUS
|
||||
#define BTN_PAUSE BUTTON_MINUS
|
||||
|
||||
#elif (CONFIG_KEYPAD == ONDAVX747_PAD) || \
|
||||
(CONFIG_KEYPAD == DX50_PAD)
|
||||
#define BTN_LEFT BUTTON_LEFT
|
||||
#define BTN_RIGHT BUTTON_RIGHT
|
||||
#define BTN_FIRE BUTTON_BOTTOMLEFT
|
||||
#define BTN_PAUSE BUTTON_TOPLEFT
|
||||
|
||||
#else
|
||||
#error Unsupported keypad
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_TOUCHSCREEN
|
||||
#define BTN_UP BUTTON_TOPMIDDLE
|
||||
#define BTN_DOWN BUTTON_BOTTOMMIDDLE
|
||||
#define BTN_LEFT BUTTON_LEFT
|
||||
#define BTN_RIGHT BUTTON_RIGHT
|
||||
|
||||
#if (CONFIG_KEYPAD == MROBE500_PAD) || \
|
||||
(CONFIG_KEYPAD == ONDAVX777_PAD)
|
||||
#define BTN_PAUSE BUTTON_BOTTOMLEFT
|
||||
|
||||
#elif (CONFIG_KEYPAD != COWON_D2_PAD) && \
|
||||
(CONFIG_KEYPAD != DX50_PAD) && \
|
||||
(CONFIG_KEYPAD != ONDAVX777_PAD)
|
||||
#define BTN_FIRE BUTTON_BOTTOMLEFT
|
||||
#define BTN_PAUSE BUTTON_TOPLEFT
|
||||
#endif
|
||||
|
||||
/* HAVE_TOUCHSCREEN */
|
||||
#endif
|
||||
|
||||
/* _XWORLD_KEYMAPS_H */
|
||||
#endif
|
||||
|
|
@ -50,8 +50,8 @@ endif
|
|||
# we suppress all warnings
|
||||
PUZZLESFLAGS = -I$(PUZZLES_SRCDIR)/dummy \
|
||||
$(filter-out -O%,$(PLUGINFLAGS)) $(PUZZLESOPTIMIZE) \
|
||||
-Wno-unused-parameter -Wno-sign-compare -Wno-strict-aliasing \
|
||||
-DFOR_REAL -I$(PUZZLES_SRCDIR)/src \
|
||||
-Wno-unused-parameter -Wno-sign-compare -Wno-strict-aliasing -w \
|
||||
-DFOR_REAL -I$(PUZZLES_SRCDIR)/src -I$(PUZZLES_SRCDIR) \
|
||||
-include $(PUZZLES_SRCDIR)/rbcompat.h
|
||||
ifdef PUZZLES_COMBINED
|
||||
PUZZLESFLAGS += -DCOMBINED
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@
|
|||
|
||||
#include "plugin.h"
|
||||
|
||||
#include "keymaps.h"
|
||||
#include "src/puzzles.h"
|
||||
#include "src/keymaps.h"
|
||||
|
||||
#ifndef COMBINED
|
||||
#include "lib/playback_control.h"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue