summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-04-13 16:00:32 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-04-13 22:06:22 +0200
commita820a98361b43a01740f155fd4ae3881d844e124 (patch)
treefeae173d7515c354c2db4a4dadc30560c17a9f83
parentcfc02cadcc65d74b17f15e5621c42a53467f6d04 (diff)
downloadrockbox-a820a98361b43a01740f155fd4ae3881d844e124.tar.gz
rockbox-a820a98361b43a01740f155fd4ae3881d844e124.zip
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
-rw-r--r--apps/SOURCES2
-rw-r--r--apps/keymaps/keymap-av300.c262
-rw-r--r--firmware/export/config.h4
-rw-r--r--firmware/target/arm/archos/av300/ata-av300.c58
-rw-r--r--firmware/target/arm/archos/av300/ata-target.h39
-rw-r--r--firmware/target/arm/archos/av300/button-target.h45
-rw-r--r--firmware/target/arm/archos/av300/power-av300.c66
-rw-r--r--tools/builds.pm4
-rwxr-xr-xtools/configure24
-rw-r--r--uisimulator/buttonmap/SOURCES4
-rw-r--r--uisimulator/buttonmap/archos-av300.c81
11 files changed, 2 insertions, 587 deletions
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
232keymaps/keymap-m200.c 232keymaps/keymap-m200.c
233#elif CONFIG_KEYPAD == SANSA_CLIP_PAD 233#elif CONFIG_KEYPAD == SANSA_CLIP_PAD
234keymaps/keymap-clip.c 234keymaps/keymap-clip.c
235#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
236keymaps/keymap-av300.c
237#elif CONFIG_KEYPAD == MROBE500_PAD 235#elif CONFIG_KEYPAD == MROBE500_PAD
238keymaps/keymap-mr500.c 236keymaps/keymap-mr500.c
239#elif CONFIG_KEYPAD == MROBE100_PAD 237#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 @@
1/***************************************************************************
2 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/
8 * $Id$
9 *
10 * Copyright (C) 2006 Antoine Cellerier <dionoea @t videolan d.t org>
11 *
12 * This program is free software; you can redistribute it and/or
13 * modify it under the terms of the GNU General Public License
14 * as published by the Free Software Foundation; either version 2
15 * of the License, or (at your option) any later version.
16 *
17 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
18 * KIND, either express or implied.
19 *
20 ****************************************************************************/
21
22/* *
23 * Button Code Definitions for archos AV300 target
24 *
25 * \TODO handle F3
26 */
27
28#include "config.h"
29#include "action.h"
30#include "button.h"
31#include "settings.h"
32
33/* CONTEXT_CUSTOM's used in this file...
34
35CONTEXT_CUSTOM|1 = the standard list/tree defines (without directions)
36
37
38*/
39
40static const struct button_mapping button_context_standard[] = {
41 { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE },
42 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
43 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE },
44 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
45
46 { ACTION_STD_OK, BUTTON_ON, BUTTON_NONE },
47 { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE },
48 { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT },
49
50 { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
51 { ACTION_STD_MENU, BUTTON_F1, BUTTON_NONE },
52 { ACTION_STD_QUICKSCREEN, BUTTON_F2, BUTTON_NONE },
53 { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT },
54 { ACTION_STD_CANCEL, BUTTON_OFF, BUTTON_NONE },
55 { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE },
56 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
57 { ACTION_F3, BUTTON_F3, BUTTON_NONE },
58
59 LAST_ITEM_IN_LIST
60};
61
62static const struct button_mapping button_context_wps[] = {
63 { ACTION_WPS_PLAY, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
64 { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
65 { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
66 { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
67 { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
68 { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT },
69 { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT },
70 { ACTION_WPS_STOP, BUTTON_OFF|BUTTON_REL, BUTTON_OFF },
71 { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE },
72 { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
73 { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE },
74 { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
75 { ACTION_WPS_MENU, BUTTON_F1|BUTTON_REL, BUTTON_F1 },
76 { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT },
77 { ACTION_WPS_QUICKSCREEN, BUTTON_F2|BUTTON_REPEAT, BUTTON_NONE },
78 { ACTION_WPS_HOTKEY, BUTTON_F2|BUTTON_REL, BUTTON_F2 },
79 { ACTION_WPS_BROWSE, BUTTON_ON|BUTTON_REL, BUTTON_ON },
80 { ACTION_WPS_ID3SCREEN, BUTTON_F1|BUTTON_ON, BUTTON_NONE },
81 { ACTION_WPS_PITCHSCREEN, BUTTON_ON|BUTTON_UP, BUTTON_ON },
82 { ACTION_WPS_PITCHSCREEN, BUTTON_ON|BUTTON_DOWN, BUTTON_ON },
83 { ACTION_STD_KEYLOCK, BUTTON_F1|BUTTON_DOWN, BUTTON_NONE },
84 { ACTION_F3, BUTTON_F3, BUTTON_NONE },
85 { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_ON|BUTTON_RIGHT, BUTTON_NONE },
86 { ACTION_WPS_ABSETA_PREVDIR, BUTTON_ON|BUTTON_LEFT, BUTTON_NONE },
87 { ACTION_WPS_ABRESET, BUTTON_ON|BUTTON_OFF, BUTTON_ON },
88
89
90 LAST_ITEM_IN_LIST
91};
92
93static const struct button_mapping button_context_settings[] = {
94 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE },
95 { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
96 { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE },
97 { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
98 { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE },
99 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
100 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
101 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
102
103 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
104};
105
106static const struct button_mapping button_context_tree[] = {
107 { ACTION_TREE_WPS, BUTTON_ON|BUTTON_REL, BUTTON_ON },
108 { ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE },
109 { ACTION_TREE_HOTKEY, BUTTON_F2|BUTTON_REL, BUTTON_F2 },
110 { ACTION_NONE, BUTTON_ON, BUTTON_NONE },
111 { ACTION_LISTTREE_PGUP, BUTTON_ON|BUTTON_UP, BUTTON_NONE },
112 { ACTION_LISTTREE_PGUP, BUTTON_ON|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
113 { ACTION_LISTTREE_PGDOWN, BUTTON_ON|BUTTON_DOWN, BUTTON_NONE },
114 { ACTION_LISTTREE_PGDOWN, BUTTON_ON|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
115 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
116}; /* button_context_listtree */
117
118static const struct button_mapping button_context_tree_scroll_lr[] = {
119 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
120 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
121 { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT },
122 { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
123 { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE },
124 { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
125 { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
126 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1),
127};
128
129static const struct button_mapping button_context_yesno[] = {
130 { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE },
131
132 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
133};
134static const struct button_mapping button_context_quickscreen[] = {
135 { ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE },
136 { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
137 { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE },
138 { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
139 { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE },
140 { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
141 { ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
142 { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
143 { ACTION_STD_CANCEL, BUTTON_SELECT, BUTTON_NONE },
144
145 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
146}; /* button_context_quickscreen */
147
148static const struct button_mapping button_context_pitchscreen[] = {
149 { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE },
150 { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
151 { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE },
152 { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
153 { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE },
154 { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE },
155 { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
156 { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE },
157 { ACTION_PS_TOGGLE_MODE, BUTTON_F1, BUTTON_NONE },
158 { ACTION_PS_RESET, BUTTON_ON, BUTTON_NONE },
159 { ACTION_PS_EXIT, BUTTON_OFF, BUTTON_NONE },
160 { ACTION_PS_SLOWER, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
161 { ACTION_PS_FASTER, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
162
163 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
164}; /* button_context_pitchcreen */
165
166static const struct button_mapping button_context_recscreen[] = {
167 { ACTION_REC_PAUSE, BUTTON_SELECT, BUTTON_NONE },
168 { ACTION_REC_F2, BUTTON_F2, BUTTON_NONE },
169 { ACTION_REC_F3, BUTTON_F3, BUTTON_NONE },
170 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
171 { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
172 { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
173 { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
174
175 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
176}; /* button_context_recscreen */
177
178static const struct button_mapping button_context_keyboard[] = {
179 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE },
180 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
181 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
182 { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
183 { ACTION_KBD_CURSOR_LEFT, BUTTON_ON|BUTTON_LEFT, BUTTON_NONE },
184 { ACTION_KBD_CURSOR_LEFT, BUTTON_ON|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
185 { ACTION_KBD_CURSOR_RIGHT, BUTTON_ON|BUTTON_RIGHT, BUTTON_NONE },
186 { ACTION_KBD_CURSOR_RIGHT, BUTTON_ON|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
187 { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE },
188 { ACTION_KBD_PAGE_FLIP, BUTTON_F1, BUTTON_NONE },
189 { ACTION_KBD_DONE, BUTTON_F2, BUTTON_NONE },
190 { ACTION_KBD_ABORT, BUTTON_OFF, BUTTON_NONE },
191 { ACTION_KBD_BACKSPACE, BUTTON_F3, BUTTON_NONE },
192 { ACTION_KBD_BACKSPACE, BUTTON_F3|BUTTON_REPEAT, BUTTON_NONE },
193 { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE },
194 { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
195 { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE },
196 { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
197
198 LAST_ITEM_IN_LIST
199}; /* button_context_keyboard */
200
201static const struct button_mapping button_context_bmark[] = {
202 { ACTION_NONE, BUTTON_ON, BUTTON_NONE },
203 { ACTION_BMS_DELETE, BUTTON_SELECT|BUTTON_ON, BUTTON_NONE },
204
205 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
206
207}; /* button_context_settings_bmark */
208
209static const struct button_mapping button_context_radio[] = {
210 { ACTION_FM_MENU, BUTTON_F1, BUTTON_NONE },
211 { ACTION_FM_PRESET, BUTTON_F2, BUTTON_NONE },
212 { ACTION_FM_RECORD, BUTTON_F3, BUTTON_NONE },
213 { ACTION_FM_FREEZE, BUTTON_SELECT, BUTTON_NONE },
214 { ACTION_FM_STOP, BUTTON_OFF, BUTTON_NONE },
215 { ACTION_FM_MODE, BUTTON_ON | BUTTON_REPEAT, BUTTON_ON },
216 { ACTION_FM_EXIT, BUTTON_ON | BUTTON_REL, BUTTON_ON },
217
218 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
219
220};
221
222const struct button_mapping* get_context_mapping( int context )
223{
224 switch( context )
225 {
226 case CONTEXT_WPS:
227 return button_context_wps;
228 case CONTEXT_SETTINGS_TIME:
229 case CONTEXT_SETTINGS:
230 return button_context_settings;
231
232 case CONTEXT_YESNOSCREEN:
233 return button_context_yesno;
234
235 case CONTEXT_PITCHSCREEN:
236 return button_context_pitchscreen;
237 case CONTEXT_BOOKMARKSCREEN:
238 return button_context_bmark;
239 case CONTEXT_TREE:
240 case CONTEXT_MAINMENU:
241 if (global_settings.hold_lr_for_scroll_in_list)
242 return button_context_tree_scroll_lr;
243 /* else fall through to CUSTOM|1 */
244 case CONTEXT_CUSTOM|1:
245 return button_context_tree;
246
247 case CONTEXT_QUICKSCREEN:
248 return button_context_quickscreen;
249
250 case CONTEXT_RECSCREEN:
251 return button_context_recscreen;
252 case CONTEXT_KEYBOARD:
253 return button_context_keyboard;
254 case CONTEXT_FM:
255 return button_context_radio;
256
257 case CONTEXT_STD:
258 case CONTEXT_LIST:
259 default:
260 return button_context_standard;
261 }
262}
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 @@
118#define SANSA_E200_PAD 13 118#define SANSA_E200_PAD 13
119#define SANSA_C200_PAD 14 119#define SANSA_C200_PAD 14
120#define TATUNG_TPJ1022_PAD 15 120#define TATUNG_TPJ1022_PAD 15
121#define ARCHOS_AV300_PAD 16
122#define MROBE100_PAD 17 121#define MROBE100_PAD 17
123#define MROBE500_PAD 18 122#define MROBE500_PAD 18
124#define GIGABEAT_S_PAD 19 123#define GIGABEAT_S_PAD 19
@@ -240,7 +239,6 @@
240#define LCD_H10_20GB 13 /* as used by iriver H10 20Gb */ 239#define LCD_H10_20GB 13 /* as used by iriver H10 20Gb */
241#define LCD_H10_5GB 14 /* as used by iriver H10 5Gb */ 240#define LCD_H10_5GB 14 /* as used by iriver H10 5Gb */
242#define LCD_TPJ1022 15 /* as used by Tatung Elio TPJ-1022 */ 241#define LCD_TPJ1022 15 /* as used by Tatung Elio TPJ-1022 */
243#define LCD_DSC25 16 /* as used by Archos AV300 */
244#define LCD_C200 17 /* as used by Sandisk Sansa c200 */ 242#define LCD_C200 17 /* as used by Sandisk Sansa c200 */
245#define LCD_MROBE500 18 /* as used by Olympus M:Robe 500i */ 243#define LCD_MROBE500 18 /* as used by Olympus M:Robe 500i */
246#define LCD_MROBE100 19 /* as used by Olympus M:Robe 100 */ 244#define LCD_MROBE100 19 /* as used by Olympus M:Robe 100 */
@@ -412,8 +410,6 @@ Lyre prototype 1 */
412#include "config/archosondiosp.h" 410#include "config/archosondiosp.h"
413#elif defined(ARCHOS_ONDIOFM) 411#elif defined(ARCHOS_ONDIOFM)
414#include "config/archosondiofm.h" 412#include "config/archosondiofm.h"
415#elif defined(ARCHOS_AV300)
416#include "config/archosav300.h"
417#elif defined(IRIVER_H100) 413#elif defined(IRIVER_H100)
418#include "config/iriverh100.h" 414#include "config/iriverh100.h"
419#elif defined(IRIVER_H120) 415#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 @@
1/***************************************************************************
2 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/
8 * $Id: ata-pp5020.c 10521 2006-08-11 08:35:27Z bger $
9 *
10 * Target-specific ATA functions for AV3xx (TMS320DSC25)
11 *
12 * Based on code from the ArchOpen project - http://www.archopen.org
13 * Adapted for Rockbox in January 2007
14 *
15 * Original file:
16 * lib/target/arch_AV3XX/ata.c
17 *
18 * AvLo - linav project
19 * Copyright (c) 2005 by Christophe THOMAS (oxygen77 at free.fr)
20 *
21 * This program is free software; you can redistribute it and/or
22 * modify it under the terms of the GNU General Public License
23 * as published by the Free Software Foundation; either version 2
24 * of the License, or (at your option) any later version.
25 *
26 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
27 * KIND, either express or implied.
28 *
29 ****************************************************************************/
30
31#include <stdbool.h>
32#include "system.h"
33#include "ata-driver.h"
34
35void ata_reset()
36{
37 /* arch_ata_reset_HD(void) */
38 cpld_set_port_2(CPLD_HD_RESET);
39 cpld_clear_port_2(CPLD_HD_RESET);
40}
41
42void ata_enable(bool on)
43{
44 /* TODO: Implement ata_enable() */
45 (void)on;
46}
47
48bool ata_is_coldstart()
49{
50 /* TODO: Implement coldstart variable */
51 return true;
52}
53
54void ata_device_init()
55{
56 /* Set CF/HD selection to HD */
57 cpld_select(CPLD_HD_CF,CPLD_SEL_HD);
58}
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 @@
1/***************************************************************************
2 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/
8 * $Id: ata-target.h 11655 2006-12-03 22:13:44Z amiconn $
9 *
10 * Copyright (C) 2007 by Dave Chapman
11 *
12 * This program is free software; you can redistribute it and/or
13 * modify it under the terms of the GNU General Public License
14 * as published by the Free Software Foundation; either version 2
15 * of the License, or (at your option) any later version.
16 *
17 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
18 * KIND, either express or implied.
19 *
20 ****************************************************************************/
21
22#ifndef ATA_TARGET_H
23#define ATA_TARGET_H
24
25/* Plain C read & write loops */
26
27#define ATA_IOBASE 0x02400000
28
29#define ATA_DATA (*((volatile unsigned short*)(ATA_IOBASE)))
30#define ATA_ERROR (*((volatile unsigned char*)(ATA_IOBASE + 0x080)))
31#define ATA_NSECTOR (*((volatile unsigned char*)(ATA_IOBASE + 0x100)))
32#define ATA_SECTOR (*((volatile unsigned char*)(ATA_IOBASE + 0x180)))
33#define ATA_LCYL (*((volatile unsigned char*)(ATA_IOBASE + 0x200)))
34#define ATA_HCYL (*((volatile unsigned char*)(ATA_IOBASE + 0x280)))
35#define ATA_SELECT (*((volatile unsigned char*)(ATA_IOBASE + 0x300)))
36#define ATA_CONTROL (*((volatile unsigned char*)(ATA_IOBASE + 0x340)))
37#define ATA_COMMAND (*((volatile unsigned char*)(ATA_IOBASE + 0x380)))
38
39#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 @@
1/***************************************************************************
2 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/
8 * $Id: button-target.h 11967 2007-01-09 23:29:07Z linus $
9 *
10 * Copyright (C) 2007 by Dave Chapman
11 *
12 * This program is free software; you can redistribute it and/or
13 * modify it under the terms of the GNU General Public License
14 * as published by the Free Software Foundation; either version 2
15 * of the License, or (at your option) any later version.
16 *
17 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
18 * KIND, either express or implied.
19 *
20 ****************************************************************************/
21
22#ifndef _BUTTON_TARGET_H_
23#define _BUTTON_TARGET_H_
24
25/* Main unit's buttons */
26
27#define BUTTON_ON 0x00000001
28#define BUTTON_OFF 0x00000002
29
30#define BUTTON_LEFT 0x00000004
31#define BUTTON_RIGHT 0x00000008
32#define BUTTON_UP 0x00000010
33#define BUTTON_DOWN 0x00000020
34
35#define BUTTON_SELECT 0x00000040
36
37#define BUTTON_F1 0x00000080
38#define BUTTON_F2 0x00000100
39#define BUTTON_F3 0x00000200
40
41#define BUTTON_MAIN (BUTTON_ON|BUTTON_OFF|BUTTON_LEFT|BUTTON_RIGHT\
42 |BUTTON_UP|BUTTON_DOWN|BUTTON_SELECT\
43 |BUTTON_F1|BUTTON_F2|BUTTON_F3)
44
45#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 @@
1/***************************************************************************
2 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/
8 * $Id: power-x5.c 10967 2006-09-17 09:19:50Z jethead71 $
9 *
10 * Based on code from the ArchOpen project - http://www.archopen.org
11 * Adapted for Rockbox in January 2007
12 *
13 * Original files:
14 * lib/target/arch_AV3XX/ata.c
15 *
16 * AvLo - linav project
17 * Copyright (c) 2005 by Christophe THOMAS (oxygen77 at free.fr)
18 *
19 * This program is free software; you can redistribute it and/or
20 * modify it under the terms of the GNU General Public License
21 * as published by the Free Software Foundation; either version 2
22 * of the License, or (at your option) any later version.
23 *
24 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
25 * KIND, either express or implied.
26 *
27 ****************************************************************************/
28#include "config.h"
29#include "cpu.h"
30#include <stdbool.h>
31#include "kernel.h"
32#include "system.h"
33#include "power.h"
34
35void power_init(void)
36{
37 /* Charger detect */
38}
39
40unsigned int power_input_status(void)
41{
42 return POWER_INPUT_NONE;
43}
44
45void ide_power_enable(bool on)
46{
47 if(on)
48 cpld_set_port_3(CPLD_HD_POWER); /* powering up HD */
49 else
50 cpld_clear_port_3(CPLD_HD_POWER);
51}
52
53bool ide_powered(void)
54{
55 return false;
56}
57
58void power_off(void)
59{
60}
61
62bool tuner_power(bool status)
63{
64 (void)status;
65 return true;
66}
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";
14# } 14# }
15 15
16%builds = ( 16%builds = (
17 'archosav300' => {
18 name => 'Archos AV300',
19 status => 1,
20 },
21 'archosfmrecorder' => { 17 'archosfmrecorder' => {
22 name => 'Archos FM Recorder', 18 name => 'Archos FM Recorder',
23 status => 3, 19 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 <<EOF
1517 3) Recorder v2 13) iFP-790 23) 3G 1517 3) Recorder v2 13) iFP-790 23) 3G
1518 4) Ondio SP 14) H10 20Gb 24) 4G Grayscale 1518 4) Ondio SP 14) H10 20Gb 24) 4G Grayscale
1519 5) Ondio FM 15) H10 5/6Gb 25) Mini 1G 1519 5) Ondio FM 15) H10 5/6Gb 25) Mini 1G
1520 6) AV300 26) Mini 2G 1520 26) Mini 2G
1521 ==Toshiba== 27) 1G, 2G 1521 ==Toshiba== 27) 1G, 2G
1522 ==Cowon/iAudio== 40) Gigabeat F/X 28) Nano 2G 1522 ==Cowon/iAudio== 40) Gigabeat F/X 28) Nano 2G
1523 30) X5/X5V/X5L 41) Gigabeat S 29) Classic/6G 1523 30) X5/X5V/X5L 41) Gigabeat S 29) Classic/6G
@@ -1763,28 +1763,6 @@ fi
1763 t_model="ondio" 1763 t_model="ondio"
1764 ;; 1764 ;;
1765 1765
1766 6|archosav300)
1767 target_id=38
1768 modelname="archosav300"
1769 target="ARCHOS_AV300"
1770 memory=16 # always
1771 arm7tdmicc
1772 tool="$rootdir/tools/scramble -mm=C"
1773 bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
1774 bmp2rb_native="$rootdir/tools/bmp2rb -f 6"
1775 output="cjbm.ajz"
1776 appextra="recorder:gui:radio"
1777 plugins="yes"
1778 swcodec=""
1779 # toolset is the tools within the tools directory that we build for
1780 # this particular target.
1781 toolset="$toolset scramble descramble bmp2rb"
1782 # architecture, manufacturer and model for the target-tree build
1783 t_cpu="arm"
1784 t_manufacturer="archos"
1785 t_model="av300"
1786 ;;
1787
1788 10|iriverh120) 1766 10|iriverh120)
1789 target_id=9 1767 target_id=9
1790 modelname="iriverh120" 1768 modelname="iriverh120"
diff --git a/uisimulator/buttonmap/SOURCES b/uisimulator/buttonmap/SOURCES
index 4c6ca3adef..4e331f4b85 100644
--- a/uisimulator/buttonmap/SOURCES
+++ b/uisimulator/buttonmap/SOURCES
@@ -23,12 +23,10 @@ archos-ondio.c
23archos-player.c 23archos-player.c
24#elif CONFIG_KEYPAD == RECORDER_PAD 24#elif CONFIG_KEYPAD == RECORDER_PAD
25archos-recorder.c 25archos-recorder.c
26#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
27archos-av300.c
28#elif CONFIG_KEYPAD == SANSA_C200_PAD 26#elif CONFIG_KEYPAD == SANSA_C200_PAD
29sansa-c200.c 27sansa-c200.c
30#elif CONFIG_KEYPAD == SANSA_CLIP_PAD 28#elif CONFIG_KEYPAD == SANSA_CLIP_PAD
31sansa-clip.c 29sansa-clip.c
32#elif CONFIG_KEYPAD == SANSA_E200_PAD 30#elif CONFIG_KEYPAD == SANSA_E200_PAD
33sansa-e200.c 31sansa-e200.c
34#elif CONFIG_KEYPAD == SANSA_FUZE_PAD 32#elif CONFIG_KEYPAD == SANSA_FUZE_PAD
diff --git a/uisimulator/buttonmap/archos-av300.c b/uisimulator/buttonmap/archos-av300.c
deleted file mode 100644
index 5f09f7fc3e..0000000000
--- a/uisimulator/buttonmap/archos-av300.c
+++ /dev/null
@@ -1,81 +0,0 @@
1/***************************************************************************
2 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/
8 * $Id$
9 *
10 * Copyright (C) 2007 Dave Chapman
11 *
12 * This program is free software; you can redistribute it and/or
13 * modify it under the terms of the GNU General Public License
14 * as published by the Free Software Foundation; either version 2
15 * of the License, or (at your option) any later version.
16 *
17 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
18 * KIND, either express or implied.
19 *
20 ****************************************************************************/
21
22
23#include <SDL.h>
24#include "button.h"
25#include "buttonmap.h"
26
27int key_to_button(int keyboard_button)
28{
29 int new_btn = BUTTON_NONE;
30 switch (keyboard_button)
31 {
32 case SDLK_KP4:
33 case SDLK_LEFT:
34 new_btn = BUTTON_LEFT;
35 break;
36 case SDLK_KP6:
37 case SDLK_RIGHT:
38 new_btn = BUTTON_RIGHT;
39 break;
40 case SDLK_KP8:
41 case SDLK_UP:
42 new_btn = BUTTON_UP;
43 break;
44 case SDLK_KP2:
45 case SDLK_DOWN:
46 new_btn = BUTTON_DOWN;
47 break;
48 case SDLK_KP_PLUS:
49 case SDLK_F8:
50 new_btn = BUTTON_ON;
51 break;
52 case SDLK_KP_ENTER:
53 case SDLK_RETURN:
54 case SDLK_a:
55 new_btn = BUTTON_OFF;
56 break;
57 case SDLK_KP_DIVIDE:
58 case SDLK_F1:
59 new_btn = BUTTON_F1;
60 break;
61 case SDLK_KP_MULTIPLY:
62 case SDLK_F2:
63 new_btn = BUTTON_F2;
64 break;
65 case SDLK_KP_MINUS:
66 case SDLK_F3:
67 new_btn = BUTTON_F3;
68 break;
69 case SDLK_KP5:
70 case SDLK_SPACE:
71 new_btn = BUTTON_SELECT;
72 break;
73 }
74 return new_btn;
75}
76
77
78struct button_map bm[] = {
79 { 0, 0, 0, 0, "None" }
80};
81