diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-15 19:40:55 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 092c340a2062fa98b7387fc5fd63578ddae7d0b6 (patch) | |
tree | 98ec96946eeb2ae709cb0528cc6998e21bb9b290 /uisimulator | |
parent | 17f7cc92c258bc456a27c3e7c5a19c9409851879 (diff) | |
download | rockbox-092c340a2062fa98b7387fc5fd63578ddae7d0b6.tar.gz rockbox-092c340a2062fa98b7387fc5fd63578ddae7d0b6.tar.bz2 rockbox-092c340a2062fa98b7387fc5fd63578ddae7d0b6.zip |
[1/4] Remove SH support and all archos targets
This removes all code specific to SH targets
Change-Id: I7980523785d2596e65c06430f4638eec74a06061
Diffstat (limited to 'uisimulator')
-rw-r--r-- | uisimulator/bitmaps/UI-archosav300.bmp | bin | 428454 -> 0 bytes | |||
-rw-r--r-- | uisimulator/bitmaps/UI-archosfmrecorder.bmp | bin | 236864 -> 0 bytes | |||
-rw-r--r-- | uisimulator/bitmaps/UI-archosondiofm.bmp | bin | 104264 -> 0 bytes | |||
-rw-r--r-- | uisimulator/bitmaps/UI-archosondiosp.bmp | bin | 104264 -> 0 bytes | |||
-rw-r--r-- | uisimulator/bitmaps/UI-archosplayer.bmp | bin | 238616 -> 0 bytes | |||
-rw-r--r-- | uisimulator/bitmaps/UI-archosrecorder.bmp | bin | 219296 -> 0 bytes | |||
-rw-r--r-- | uisimulator/bitmaps/UI-archosrecorderv2.bmp | bin | 236864 -> 0 bytes | |||
-rw-r--r-- | uisimulator/buttonmap/SOURCES | 6 | ||||
-rw-r--r-- | uisimulator/buttonmap/archos-ondio.c | 69 | ||||
-rw-r--r-- | uisimulator/buttonmap/archos-player.c | 68 | ||||
-rw-r--r-- | uisimulator/buttonmap/archos-recorder.c | 104 | ||||
-rw-r--r-- | uisimulator/common/stubs.c | 52 |
12 files changed, 0 insertions, 299 deletions
diff --git a/uisimulator/bitmaps/UI-archosav300.bmp b/uisimulator/bitmaps/UI-archosav300.bmp Binary files differdeleted file mode 100644 index e86221ca7e..0000000000 --- a/uisimulator/bitmaps/UI-archosav300.bmp +++ /dev/null diff --git a/uisimulator/bitmaps/UI-archosfmrecorder.bmp b/uisimulator/bitmaps/UI-archosfmrecorder.bmp Binary files differdeleted file mode 100644 index 53f705b9ef..0000000000 --- a/uisimulator/bitmaps/UI-archosfmrecorder.bmp +++ /dev/null diff --git a/uisimulator/bitmaps/UI-archosondiofm.bmp b/uisimulator/bitmaps/UI-archosondiofm.bmp Binary files differdeleted file mode 100644 index e258720d28..0000000000 --- a/uisimulator/bitmaps/UI-archosondiofm.bmp +++ /dev/null diff --git a/uisimulator/bitmaps/UI-archosondiosp.bmp b/uisimulator/bitmaps/UI-archosondiosp.bmp Binary files differdeleted file mode 100644 index c62c2334a3..0000000000 --- a/uisimulator/bitmaps/UI-archosondiosp.bmp +++ /dev/null diff --git a/uisimulator/bitmaps/UI-archosplayer.bmp b/uisimulator/bitmaps/UI-archosplayer.bmp Binary files differdeleted file mode 100644 index db4003b120..0000000000 --- a/uisimulator/bitmaps/UI-archosplayer.bmp +++ /dev/null diff --git a/uisimulator/bitmaps/UI-archosrecorder.bmp b/uisimulator/bitmaps/UI-archosrecorder.bmp Binary files differdeleted file mode 100644 index 98937fea2d..0000000000 --- a/uisimulator/bitmaps/UI-archosrecorder.bmp +++ /dev/null diff --git a/uisimulator/bitmaps/UI-archosrecorderv2.bmp b/uisimulator/bitmaps/UI-archosrecorderv2.bmp Binary files differdeleted file mode 100644 index 53f705b9ef..0000000000 --- a/uisimulator/bitmaps/UI-archosrecorderv2.bmp +++ /dev/null diff --git a/uisimulator/buttonmap/SOURCES b/uisimulator/buttonmap/SOURCES index 130727254c..1e882e3ca4 100644 --- a/uisimulator/buttonmap/SOURCES +++ b/uisimulator/buttonmap/SOURCES @@ -17,12 +17,6 @@ iriver-h10.c iriver-h100_h300.c #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD iriver-ifp7xx.c -#elif CONFIG_KEYPAD == ONDIO_PAD -archos-ondio.c -#elif CONFIG_KEYPAD == PLAYER_PAD -archos-player.c -#elif CONFIG_KEYPAD == RECORDER_PAD -archos-recorder.c #elif CONFIG_KEYPAD == SANSA_C200_PAD sansa-c200.c #elif CONFIG_KEYPAD == SANSA_CLIP_PAD diff --git a/uisimulator/buttonmap/archos-ondio.c b/uisimulator/buttonmap/archos-ondio.c deleted file mode 100644 index f92715ced8..0000000000 --- a/uisimulator/buttonmap/archos-ondio.c +++ /dev/null @@ -1,69 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 Dan Everton - * - * 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 <SDL.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_KP_ENTER: - case SDLK_RETURN: - case SDLK_a: - new_btn = BUTTON_OFF; - break; - case SDLK_KP_PERIOD: - case SDLK_INSERT: - new_btn = BUTTON_MENU; - break; - } - return new_btn; -} - -struct button_map bm[] = { - { SDLK_KP_ENTER, 75, 23, 30, "Enter" }, - { SDLK_KP8, 75, 174, 33, "KP8" }, - { SDLK_KP4, 26, 186, 48, "KP4" }, - { SDLK_KP6, 118, 196, 32, "KP6" }, - { SDLK_KP2, 75, 234, 16, "KP2" }, - { SDLK_KP_PERIOD, 54, 250, 24, "Period" }, - { 0, 0, 0, 0, "None" } -}; diff --git a/uisimulator/buttonmap/archos-player.c b/uisimulator/buttonmap/archos-player.c deleted file mode 100644 index 3524e7b243..0000000000 --- a/uisimulator/buttonmap/archos-player.c +++ /dev/null @@ -1,68 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 Dan Everton - * - * 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 <SDL.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_PLAY; - break; - case SDLK_KP2: - case SDLK_DOWN: - new_btn = BUTTON_STOP; - break; - case SDLK_KP_PLUS: - case SDLK_F8: - new_btn = BUTTON_ON; - break; - case SDLK_KP_PERIOD: - case SDLK_INSERT: - new_btn = BUTTON_MENU; - break; - } - return new_btn; -} - -struct button_map bm[] = { - { SDLK_KP_PLUS, 79, 252, 23, "On" }, - { SDLK_KP_PERIOD, 81, 310, 20, "Menu" }, - { SDLK_KP8, 154, 237, 28, "Play" }, - { SDLK_KP4, 121, 282, 23, "Left" }, - { SDLK_KP6, 187, 282, 22, "Right" }, - { SDLK_KP2, 157, 312, 20, "Down" }, - { 0, 0, 0, 0, "None" } -}; diff --git a/uisimulator/buttonmap/archos-recorder.c b/uisimulator/buttonmap/archos-recorder.c deleted file mode 100644 index cdf98c0814..0000000000 --- a/uisimulator/buttonmap/archos-recorder.c +++ /dev/null @@ -1,104 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 Dan Everton - * - * 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 <SDL.h> -#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_KP_PLUS: - case SDLK_F8: - new_btn = BUTTON_ON; - break; - case SDLK_KP_ENTER: - case SDLK_RETURN: - case SDLK_a: - new_btn = BUTTON_OFF; - break; - case SDLK_KP_DIVIDE: - case SDLK_F1: - new_btn = BUTTON_F1; - break; - case SDLK_KP_MULTIPLY: - case SDLK_F2: - new_btn = BUTTON_F2; - break; - case SDLK_KP_MINUS: - case SDLK_F3: - new_btn = BUTTON_F3; - break; - case SDLK_KP5: - case SDLK_SPACE: - new_btn = BUTTON_PLAY; - break; - } - return new_btn; -} - -struct button_map bm[] = { -#if defined (ARCHOS_RECORDER) - { SDLK_F1, 94, 205, 22, "F1" }, - { SDLK_F2, 136, 204, 21, "F2" }, - { SDLK_F3, 174, 204, 24, "F3" }, - { SDLK_KP_PLUS, 75, 258, 19, "On" }, - { SDLK_KP_ENTER, 76, 307, 15, "Off" }, - { SDLK_KP5, 151, 290, 20, "Select" }, - { SDLK_KP8, 152, 251, 23, "Up" }, - { SDLK_KP4, 113, 288, 26, "Left" }, - { SDLK_KP6, 189, 291, 23, "Right" }, - { SDLK_KP2, 150, 327, 27, "Down" }, -#elif defined (ARCHOS_FMRECORDER) || defined (ARCHOS_RECORDERV2) - { SDLK_F1, 88, 210, 28, "F1" }, - { SDLK_F2, 144, 212, 28, "F2" }, - { SDLK_F3, 197, 212, 28, "F3" }, - { SDLK_KP5, 144, 287, 21, "Select" }, - { SDLK_KP_PLUS, 86, 320, 13, "Menu" }, - { SDLK_KP_ENTER, 114, 347, 13, "Stop" }, - { SDLK_y, 144, 288, 31, "None" }, - { SDLK_KP8, 144, 259, 25, "Up" }, - { SDLK_KP2, 144, 316, 31, "Down" }, - { SDLK_KP6, 171, 287, 32, "Right" }, -#endif - { SDLK_KP4, 117, 287, 31, "Left" }, - { 0, 0, 0, 0, "None" } -}; diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c index dc4f636521..0ad78fdb7c 100644 --- a/uisimulator/common/stubs.c +++ b/uisimulator/common/stubs.c @@ -43,8 +43,6 @@ void audio_set_buffer_margin(int seconds) (void)seconds; } -/* firmware/target/sh/archos/audio-archos.c */ - /* list of tracks in memory */ #define MAX_ID3_TAGS (1<<4) /* Must be power of 2 */ #define MAX_ID3_TAGS_MASK (MAX_ID3_TAGS - 1) @@ -104,48 +102,6 @@ void mp3_shutdown(void) { } -/* firmware/drivers/audio/mas35xx.c */ -#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) -void audiohw_set_loudness(int value) -{ - (void)value; -} - -void audiohw_set_avc(int value) -{ - (void)value; -} - -void audiohw_set_mdb_strength(int value) -{ - (void)value; -} - -void audiohw_set_mdb_harmonics(int value) -{ - (void)value; -} - -void audiohw_set_mdb_center(int value) -{ - (void)value; -} - -void audiohw_set_mdb_shape(int value) -{ - (void)value; -} - -void audiohw_set_mdb_enable(int value) -{ - (void)value; -} - -void audiohw_set_superbass(int value) -{ - (void)value; -} -#endif /* (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) */ #endif /* CODEC != SWCODEC */ int fat_startsector(void) @@ -311,14 +267,6 @@ bool spdif_powered(void) } #endif -#ifdef ARCHOS_PLAYER -bool is_new_player(void) -{ - extern char having_new_lcd; - return having_new_lcd; -} -#endif - #ifdef HAVE_USB_POWER bool usb_powered_only(void) { |