From a820a98361b43a01740f155fd4ae3881d844e124 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Mon, 13 Apr 2020 16:00:32 -0400 Subject: [PATCH] obsolete: Nuke the very-incomplete Archos AV300 target It's even missing a config header file. Just shoot it in the head. Change-Id: I4c5cdb4fb63361a4e4fc893e93d73d3890fe17df --- apps/SOURCES | 2 - apps/keymaps/keymap-av300.c | 262 ------------------ firmware/export/config.h | 4 - firmware/target/arm/archos/av300/ata-av300.c | 58 ---- firmware/target/arm/archos/av300/ata-target.h | 39 --- .../target/arm/archos/av300/button-target.h | 45 --- .../target/arm/archos/av300/power-av300.c | 66 ----- tools/builds.pm | 4 - tools/configure | 24 +- uisimulator/buttonmap/SOURCES | 4 +- uisimulator/buttonmap/archos-av300.c | 81 ------ 11 files changed, 2 insertions(+), 587 deletions(-) delete mode 100644 apps/keymaps/keymap-av300.c delete mode 100644 firmware/target/arm/archos/av300/ata-av300.c delete mode 100644 firmware/target/arm/archos/av300/ata-target.h delete mode 100644 firmware/target/arm/archos/av300/button-target.h delete mode 100644 firmware/target/arm/archos/av300/power-av300.c delete mode 100644 uisimulator/buttonmap/archos-av300.c diff --git a/apps/SOURCES b/apps/SOURCES index 20e6fa9d2d..99b0832286 100644 --- a/apps/SOURCES +++ b/apps/SOURCES @@ -232,8 +232,6 @@ keymaps/keymap-c200.c keymaps/keymap-m200.c #elif CONFIG_KEYPAD == SANSA_CLIP_PAD keymaps/keymap-clip.c -#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD -keymaps/keymap-av300.c #elif CONFIG_KEYPAD == MROBE500_PAD keymaps/keymap-mr500.c #elif CONFIG_KEYPAD == MROBE100_PAD diff --git a/apps/keymaps/keymap-av300.c b/apps/keymaps/keymap-av300.c deleted file mode 100644 index bba7430118..0000000000 --- a/apps/keymaps/keymap-av300.c +++ /dev/null @@ -1,262 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 Antoine Cellerier - * - * 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 archos AV300 target - * - * \TODO handle F3 - */ - -#include "config.h" -#include "action.h" -#include "button.h" -#include "settings.h" - -/* CONTEXT_CUSTOM's used in this file... - -CONTEXT_CUSTOM|1 = the standard list/tree defines (without directions) - - -*/ - -static const struct button_mapping button_context_standard[] = { - { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, - { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, - { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - - { ACTION_STD_OK, BUTTON_ON, BUTTON_NONE }, - { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, - - { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, - { ACTION_STD_MENU, BUTTON_F1, BUTTON_NONE }, - { ACTION_STD_QUICKSCREEN, BUTTON_F2, BUTTON_NONE }, - { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT }, - { ACTION_STD_CANCEL, BUTTON_OFF, BUTTON_NONE }, - { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_F3, BUTTON_F3, BUTTON_NONE }, - - LAST_ITEM_IN_LIST -}; - -static const struct button_mapping button_context_wps[] = { - { ACTION_WPS_PLAY, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, - { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, - { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, - { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, - { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, - { ACTION_WPS_STOP, BUTTON_OFF|BUTTON_REL, BUTTON_OFF }, - { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, - { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, - { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_MENU, BUTTON_F1|BUTTON_REL, BUTTON_F1 }, - { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT }, - { ACTION_WPS_QUICKSCREEN, BUTTON_F2|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_HOTKEY, BUTTON_F2|BUTTON_REL, BUTTON_F2 }, - { ACTION_WPS_BROWSE, BUTTON_ON|BUTTON_REL, BUTTON_ON }, - { ACTION_WPS_ID3SCREEN, BUTTON_F1|BUTTON_ON, BUTTON_NONE }, - { ACTION_WPS_PITCHSCREEN, BUTTON_ON|BUTTON_UP, BUTTON_ON }, - { ACTION_WPS_PITCHSCREEN, BUTTON_ON|BUTTON_DOWN, BUTTON_ON }, - { ACTION_STD_KEYLOCK, BUTTON_F1|BUTTON_DOWN, BUTTON_NONE }, - { ACTION_F3, BUTTON_F3, BUTTON_NONE }, - { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_ON|BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_WPS_ABSETA_PREVDIR, BUTTON_ON|BUTTON_LEFT, BUTTON_NONE }, - { ACTION_WPS_ABRESET, BUTTON_ON|BUTTON_OFF, BUTTON_ON }, - - - LAST_ITEM_IN_LIST -}; - -static const struct button_mapping button_context_settings[] = { - { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, - { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, - { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; - -static const struct button_mapping button_context_tree[] = { - { ACTION_TREE_WPS, BUTTON_ON|BUTTON_REL, BUTTON_ON }, - { ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE }, - { ACTION_TREE_HOTKEY, BUTTON_F2|BUTTON_REL, BUTTON_F2 }, - { ACTION_NONE, BUTTON_ON, BUTTON_NONE }, - { ACTION_LISTTREE_PGUP, BUTTON_ON|BUTTON_UP, BUTTON_NONE }, - { ACTION_LISTTREE_PGUP, BUTTON_ON|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_LISTTREE_PGDOWN, BUTTON_ON|BUTTON_DOWN, BUTTON_NONE }, - { ACTION_LISTTREE_PGDOWN, BUTTON_ON|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; /* button_context_listtree */ - -static const struct button_mapping button_context_tree_scroll_lr[] = { - { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, - { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, - { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, - { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1), -}; - -static const struct button_mapping button_context_yesno[] = { - { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; -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_LEFT, BUTTON_NONE }, - { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_CANCEL, BUTTON_SELECT, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; /* button_context_quickscreen */ - -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_LEFT, BUTTON_NONE }, - { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, - { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, - { ACTION_PS_TOGGLE_MODE, BUTTON_F1, BUTTON_NONE }, - { ACTION_PS_RESET, BUTTON_ON, BUTTON_NONE }, - { ACTION_PS_EXIT, BUTTON_OFF, BUTTON_NONE }, - { ACTION_PS_SLOWER, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_PS_FASTER, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; /* button_context_pitchcreen */ - -static const struct button_mapping button_context_recscreen[] = { - { ACTION_REC_PAUSE, BUTTON_SELECT, BUTTON_NONE }, - { ACTION_REC_F2, BUTTON_F2, BUTTON_NONE }, - { ACTION_REC_F3, BUTTON_F3, BUTTON_NONE }, - { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; /* button_context_recscreen */ - -static const struct button_mapping button_context_keyboard[] = { - { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_CURSOR_LEFT, BUTTON_ON|BUTTON_LEFT, BUTTON_NONE }, - { ACTION_KBD_CURSOR_LEFT, BUTTON_ON|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_CURSOR_RIGHT, BUTTON_ON|BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_KBD_CURSOR_RIGHT, BUTTON_ON|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE }, - { ACTION_KBD_PAGE_FLIP, BUTTON_F1, BUTTON_NONE }, - { ACTION_KBD_DONE, BUTTON_F2, BUTTON_NONE }, - { ACTION_KBD_ABORT, BUTTON_OFF, BUTTON_NONE }, - { ACTION_KBD_BACKSPACE, BUTTON_F3, BUTTON_NONE }, - { ACTION_KBD_BACKSPACE, BUTTON_F3|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, - { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, - { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - - LAST_ITEM_IN_LIST -}; /* button_context_keyboard */ - -static const struct button_mapping button_context_bmark[] = { - { ACTION_NONE, BUTTON_ON, BUTTON_NONE }, - { ACTION_BMS_DELETE, BUTTON_SELECT|BUTTON_ON, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), - -}; /* button_context_settings_bmark */ - -static const struct button_mapping button_context_radio[] = { - { ACTION_FM_MENU, BUTTON_F1, BUTTON_NONE }, - { ACTION_FM_PRESET, BUTTON_F2, BUTTON_NONE }, - { ACTION_FM_RECORD, BUTTON_F3, BUTTON_NONE }, - { ACTION_FM_FREEZE, BUTTON_SELECT, BUTTON_NONE }, - { ACTION_FM_STOP, BUTTON_OFF, BUTTON_NONE }, - { ACTION_FM_MODE, BUTTON_ON | BUTTON_REPEAT, BUTTON_ON }, - { ACTION_FM_EXIT, BUTTON_ON | BUTTON_REL, BUTTON_ON }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) - -}; - -const struct button_mapping* get_context_mapping( int context ) -{ - switch( context ) - { - case CONTEXT_WPS: - return button_context_wps; - case CONTEXT_SETTINGS_TIME: - case CONTEXT_SETTINGS: - return button_context_settings; - - case CONTEXT_YESNOSCREEN: - return button_context_yesno; - - case CONTEXT_PITCHSCREEN: - return button_context_pitchscreen; - case CONTEXT_BOOKMARKSCREEN: - return button_context_bmark; - case CONTEXT_TREE: - case CONTEXT_MAINMENU: - if (global_settings.hold_lr_for_scroll_in_list) - return button_context_tree_scroll_lr; - /* else fall through to CUSTOM|1 */ - case CONTEXT_CUSTOM|1: - return button_context_tree; - - case CONTEXT_QUICKSCREEN: - return button_context_quickscreen; - - case CONTEXT_RECSCREEN: - return button_context_recscreen; - case CONTEXT_KEYBOARD: - return button_context_keyboard; - case CONTEXT_FM: - return button_context_radio; - - case CONTEXT_STD: - case CONTEXT_LIST: - default: - return button_context_standard; - } -} diff --git a/firmware/export/config.h b/firmware/export/config.h index c55d489c26..4f9cd02097 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -118,7 +118,6 @@ #define SANSA_E200_PAD 13 #define SANSA_C200_PAD 14 #define TATUNG_TPJ1022_PAD 15 -#define ARCHOS_AV300_PAD 16 #define MROBE100_PAD 17 #define MROBE500_PAD 18 #define GIGABEAT_S_PAD 19 @@ -240,7 +239,6 @@ #define LCD_H10_20GB 13 /* as used by iriver H10 20Gb */ #define LCD_H10_5GB 14 /* as used by iriver H10 5Gb */ #define LCD_TPJ1022 15 /* as used by Tatung Elio TPJ-1022 */ -#define LCD_DSC25 16 /* as used by Archos AV300 */ #define LCD_C200 17 /* as used by Sandisk Sansa c200 */ #define LCD_MROBE500 18 /* as used by Olympus M:Robe 500i */ #define LCD_MROBE100 19 /* as used by Olympus M:Robe 100 */ @@ -412,8 +410,6 @@ Lyre prototype 1 */ #include "config/archosondiosp.h" #elif defined(ARCHOS_ONDIOFM) #include "config/archosondiofm.h" -#elif defined(ARCHOS_AV300) -#include "config/archosav300.h" #elif defined(IRIVER_H100) #include "config/iriverh100.h" #elif defined(IRIVER_H120) diff --git a/firmware/target/arm/archos/av300/ata-av300.c b/firmware/target/arm/archos/av300/ata-av300.c deleted file mode 100644 index e8623e5f16..0000000000 --- a/firmware/target/arm/archos/av300/ata-av300.c +++ /dev/null @@ -1,58 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: ata-pp5020.c 10521 2006-08-11 08:35:27Z bger $ - * - * Target-specific ATA functions for AV3xx (TMS320DSC25) - * - * Based on code from the ArchOpen project - http://www.archopen.org - * Adapted for Rockbox in January 2007 - * - * Original file: - * lib/target/arch_AV3XX/ata.c - * - * AvLo - linav project - * Copyright (c) 2005 by Christophe THOMAS (oxygen77 at free.fr) - * - * 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 "system.h" -#include "ata-driver.h" - -void ata_reset() -{ - /* arch_ata_reset_HD(void) */ - cpld_set_port_2(CPLD_HD_RESET); - cpld_clear_port_2(CPLD_HD_RESET); -} - -void ata_enable(bool on) -{ - /* TODO: Implement ata_enable() */ - (void)on; -} - -bool ata_is_coldstart() -{ - /* TODO: Implement coldstart variable */ - return true; -} - -void ata_device_init() -{ - /* Set CF/HD selection to HD */ - cpld_select(CPLD_HD_CF,CPLD_SEL_HD); -} diff --git a/firmware/target/arm/archos/av300/ata-target.h b/firmware/target/arm/archos/av300/ata-target.h deleted file mode 100644 index 5732f17045..0000000000 --- a/firmware/target/arm/archos/av300/ata-target.h +++ /dev/null @@ -1,39 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: ata-target.h 11655 2006-12-03 22:13:44Z amiconn $ - * - * Copyright (C) 2007 by Dave Chapman - * - * 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 ATA_TARGET_H -#define ATA_TARGET_H - -/* Plain C read & write loops */ - -#define ATA_IOBASE 0x02400000 - -#define ATA_DATA (*((volatile unsigned short*)(ATA_IOBASE))) -#define ATA_ERROR (*((volatile unsigned char*)(ATA_IOBASE + 0x080))) -#define ATA_NSECTOR (*((volatile unsigned char*)(ATA_IOBASE + 0x100))) -#define ATA_SECTOR (*((volatile unsigned char*)(ATA_IOBASE + 0x180))) -#define ATA_LCYL (*((volatile unsigned char*)(ATA_IOBASE + 0x200))) -#define ATA_HCYL (*((volatile unsigned char*)(ATA_IOBASE + 0x280))) -#define ATA_SELECT (*((volatile unsigned char*)(ATA_IOBASE + 0x300))) -#define ATA_CONTROL (*((volatile unsigned char*)(ATA_IOBASE + 0x340))) -#define ATA_COMMAND (*((volatile unsigned char*)(ATA_IOBASE + 0x380))) - -#endif /* ATA_TARGET_H */ diff --git a/firmware/target/arm/archos/av300/button-target.h b/firmware/target/arm/archos/av300/button-target.h deleted file mode 100644 index a4c439690f..0000000000 --- a/firmware/target/arm/archos/av300/button-target.h +++ /dev/null @@ -1,45 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: button-target.h 11967 2007-01-09 23:29:07Z linus $ - * - * Copyright (C) 2007 by Dave Chapman - * - * 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 _BUTTON_TARGET_H_ -#define _BUTTON_TARGET_H_ - -/* Main unit's buttons */ - -#define BUTTON_ON 0x00000001 -#define BUTTON_OFF 0x00000002 - -#define BUTTON_LEFT 0x00000004 -#define BUTTON_RIGHT 0x00000008 -#define BUTTON_UP 0x00000010 -#define BUTTON_DOWN 0x00000020 - -#define BUTTON_SELECT 0x00000040 - -#define BUTTON_F1 0x00000080 -#define BUTTON_F2 0x00000100 -#define BUTTON_F3 0x00000200 - -#define BUTTON_MAIN (BUTTON_ON|BUTTON_OFF|BUTTON_LEFT|BUTTON_RIGHT\ - |BUTTON_UP|BUTTON_DOWN|BUTTON_SELECT\ - |BUTTON_F1|BUTTON_F2|BUTTON_F3) - -#endif /* _BUTTON_TARGET_H_ */ diff --git a/firmware/target/arm/archos/av300/power-av300.c b/firmware/target/arm/archos/av300/power-av300.c deleted file mode 100644 index 013fd04691..0000000000 --- a/firmware/target/arm/archos/av300/power-av300.c +++ /dev/null @@ -1,66 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: power-x5.c 10967 2006-09-17 09:19:50Z jethead71 $ - * - * Based on code from the ArchOpen project - http://www.archopen.org - * Adapted for Rockbox in January 2007 - * - * Original files: - * lib/target/arch_AV3XX/ata.c - * - * AvLo - linav project - * Copyright (c) 2005 by Christophe THOMAS (oxygen77 at free.fr) - * - * 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 "config.h" -#include "cpu.h" -#include -#include "kernel.h" -#include "system.h" -#include "power.h" - -void power_init(void) -{ - /* Charger detect */ -} - -unsigned int power_input_status(void) -{ - return POWER_INPUT_NONE; -} - -void ide_power_enable(bool on) -{ - if(on) - cpld_set_port_3(CPLD_HD_POWER); /* powering up HD */ - else - cpld_clear_port_3(CPLD_HD_POWER); -} - -bool ide_powered(void) -{ - return false; -} - -void power_off(void) -{ -} - -bool tuner_power(bool status) -{ - (void)status; - return true; -} diff --git a/tools/builds.pm b/tools/builds.pm index 51549d4e21..ddb9795d28 100644 --- a/tools/builds.pm +++ b/tools/builds.pm @@ -14,10 +14,6 @@ $releasenotes="/wiki/ReleaseNotes315"; # } %builds = ( - 'archosav300' => { - name => 'Archos AV300', - status => 1, - }, 'archosfmrecorder' => { name => 'Archos FM Recorder', status => 3, diff --git a/tools/configure b/tools/configure index 099e25d080..a41a9e529b 100755 --- a/tools/configure +++ b/tools/configure @@ -1517,7 +1517,7 @@ cat < ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2007 Dave Chapman - * - * 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 "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_SELECT; - break; - } - return new_btn; -} - - -struct button_map bm[] = { - { 0, 0, 0, 0, "None" } -}; -