From c03e665badb8dd5e322b6d75e77a213488e79845 Mon Sep 17 00:00:00 2001 From: Szymon Dziok Date: Sat, 24 May 2014 01:12:02 +0000 Subject: Fix the simulators. Change-Id: I9663f709b5979fffea3962e2062de3821a264c23 --- uisimulator/buttonmap/SOURCES | 6 +- uisimulator/buttonmap/samsung-yh820.c | 78 ++++++++++++++++++++++++ uisimulator/buttonmap/samsung-yh820_yh92x.c | 94 ----------------------------- uisimulator/buttonmap/samsung-yh92x.c | 79 ++++++++++++++++++++++++ 4 files changed, 161 insertions(+), 96 deletions(-) create mode 100644 uisimulator/buttonmap/samsung-yh820.c delete mode 100644 uisimulator/buttonmap/samsung-yh820_yh92x.c create mode 100644 uisimulator/buttonmap/samsung-yh92x.c (limited to 'uisimulator') diff --git a/uisimulator/buttonmap/SOURCES b/uisimulator/buttonmap/SOURCES index 26567d3e53..6b248e9324 100644 --- a/uisimulator/buttonmap/SOURCES +++ b/uisimulator/buttonmap/SOURCES @@ -57,8 +57,10 @@ gogear-hdd6330.c onda-vx747.c #elif CONFIG_KEYPAD == ONDAVX777_PAD onda-vx777.c -#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD -samsung-yh820_yh92x.c +#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD +samsung-yh820.c +#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD +samsung-yh92x.c #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD pbell-vibe500.c #elif CONFIG_KEYPAD == MPIO_HD200_PAD diff --git a/uisimulator/buttonmap/samsung-yh820.c b/uisimulator/buttonmap/samsung-yh820.c new file mode 100644 index 0000000000..02836fe8f4 --- /dev/null +++ b/uisimulator/buttonmap/samsung-yh820.c @@ -0,0 +1,78 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2009 Mark Arigo + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + + +#include +#include "config.h" +#include "button.h" +#include "buttonmap.h" + +int key_to_button(int keyboard_button) +{ + int new_btn = BUTTON_NONE; + switch (keyboard_button) + { + case SDLK_KP4: + case SDLK_LEFT: + new_btn = BUTTON_LEFT; + break; + case SDLK_KP6: + case SDLK_RIGHT: + new_btn = BUTTON_RIGHT; + break; + case SDLK_KP8: + case SDLK_UP: + new_btn = BUTTON_UP; + break; + case SDLK_KP2: + case SDLK_DOWN: + new_btn = BUTTON_DOWN; + break; + case SDLK_KP5: + case SDLK_KP_ENTER: + new_btn = BUTTON_PLAY; + break; + case SDLK_KP9: + case SDLK_PAGEUP: + new_btn = BUTTON_FFWD; + break; + case SDLK_KP7: + case SDLK_PAGEDOWN: + new_btn = BUTTON_REW; + break; + case SDLK_KP_PLUS: + new_btn = BUTTON_REC; + break; + } + return new_btn; +} + +struct button_map bm[] = { + { SDLK_KP_PLUS, 330, 53, 23, "Record" }, + { SDLK_KP7, 132, 208, 21, "Left" }, + { SDLK_KP5, 182, 210, 18, "Play" }, + { SDLK_KP9, 234, 211, 22, "Right" }, + { SDLK_KP8, 182, 260, 15, "Up" }, + { SDLK_KP4, 122, 277, 29, "Menu" }, + { SDLK_KP6, 238, 276, 25, "Select" }, + { SDLK_KP2, 183, 321, 24, "Down" }, + { 0, 0, 0, 0, "None" } +}; diff --git a/uisimulator/buttonmap/samsung-yh820_yh92x.c b/uisimulator/buttonmap/samsung-yh820_yh92x.c deleted file mode 100644 index 0f12c77df3..0000000000 --- a/uisimulator/buttonmap/samsung-yh820_yh92x.c +++ /dev/null @@ -1,94 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2009 Mark Arigo - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - - -#include -#include "config.h" -#include "button.h" -#include "buttonmap.h" - -int key_to_button(int keyboard_button) -{ - int new_btn = BUTTON_NONE; - switch (keyboard_button) - { - case SDLK_KP4: - case SDLK_LEFT: - new_btn = BUTTON_LEFT; - break; - case SDLK_KP6: - case SDLK_RIGHT: - new_btn = BUTTON_RIGHT; - break; - case SDLK_KP8: - case SDLK_UP: - new_btn = BUTTON_UP; - break; - case SDLK_KP2: - case SDLK_DOWN: - new_btn = BUTTON_DOWN; - break; - case SDLK_KP5: - case SDLK_KP_ENTER: - new_btn = BUTTON_PLAY; - break; - case SDLK_KP9: - case SDLK_PAGEUP: - new_btn = BUTTON_FFWD; - break; -#ifdef SAMSUNG_YH820 - case SDLK_KP7: -#else - case SDLK_KP3: -#endif - case SDLK_PAGEDOWN: - new_btn = BUTTON_REW; - break; - case SDLK_KP_PLUS: - new_btn = BUTTON_REC; - break; - } - return new_btn; -} - -struct button_map bm[] = { -#if defined (SAMSUNG_YH820) - { SDLK_KP_PLUS, 330, 53, 23, "Record" }, - { SDLK_KP7, 132, 208, 21, "Left" }, - { SDLK_KP5, 182, 210, 18, "Play" }, - { SDLK_KP9, 234, 211, 22, "Right" }, - { SDLK_KP8, 182, 260, 15, "Up" }, - { SDLK_KP4, 122, 277, 29, "Menu" }, - { SDLK_KP6, 238, 276, 25, "Select" }, - { SDLK_KP2, 183, 321, 24, "Down" }, -#elif defined (SAMSUNG_YH920) || defined (SAMSUNG_YH925) - { SDLK_KP9, 370, 32, 15, "FF" }, - { SDLK_KP5, 369, 84, 25, "Play" }, - { SDLK_KP5, 367, 125, 27, "Play" }, - { SDLK_KP3, 369, 188, 17, "Rew" }, - { SDLK_KP_PLUS, 370, 330, 30, "Record" }, - { SDLK_KP4, 146, 252, 32, "Menu" }, - { SDLK_KP8, 204, 226, 27, "Up" }, - { SDLK_KP6, 257, 250, 34, "Select" }, - { SDLK_KP2, 205, 294, 35, "Down" }, -#endif - { 0, 0, 0, 0, "None" } -}; diff --git a/uisimulator/buttonmap/samsung-yh92x.c b/uisimulator/buttonmap/samsung-yh92x.c new file mode 100644 index 0000000000..995f9c8a7e --- /dev/null +++ b/uisimulator/buttonmap/samsung-yh92x.c @@ -0,0 +1,79 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2009 Mark Arigo + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + + +#include +#include "config.h" +#include "button.h" +#include "buttonmap.h" + +int key_to_button(int keyboard_button) +{ + int new_btn = BUTTON_NONE; + switch (keyboard_button) + { + case SDLK_KP4: + case SDLK_LEFT: + new_btn = BUTTON_LEFT; + break; + case SDLK_KP6: + case SDLK_RIGHT: + new_btn = BUTTON_RIGHT; + break; + case SDLK_KP8: + case SDLK_UP: + new_btn = BUTTON_UP; + break; + case SDLK_KP2: + case SDLK_DOWN: + new_btn = BUTTON_DOWN; + break; + case SDLK_KP5: + case SDLK_KP_ENTER: + new_btn = BUTTON_PLAY; + break; + case SDLK_KP9: + case SDLK_PAGEUP: + new_btn = BUTTON_FFWD; + break; + case SDLK_KP3: + case SDLK_PAGEDOWN: + new_btn = BUTTON_REW; + break; + case SDLK_KP_PLUS: + new_btn = BUTTON_REC; + break; + } + return new_btn; +} + +struct button_map bm[] = { + { SDLK_KP9, 370, 32, 15, "FF" }, + { SDLK_KP5, 369, 84, 25, "Play" }, + { SDLK_KP5, 367, 125, 27, "Play" }, + { SDLK_KP3, 369, 188, 17, "Rew" }, + { SDLK_KP_PLUS, 370, 330, 30, "Record" }, + { SDLK_KP4, 146, 252, 32, "Menu" }, + { SDLK_KP8, 204, 226, 27, "Up" }, + { SDLK_KP6, 257, 250, 34, "Select" }, + { SDLK_KP2, 205, 294, 35, "Down" }, + { 0, 0, 0, 0, "None" } +}; -- cgit v1.2.3