summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/neo/icons.h38
-rw-r--r--apps/neo/keyboard.c308
-rw-r--r--apps/neo/lcd-charset.h46
-rw-r--r--apps/wps-display.c2
-rw-r--r--firmware/drivers/button.c36
-rw-r--r--firmware/drivers/lcd-player.c46
-rw-r--r--firmware/drivers/serial.c2
-rw-r--r--firmware/export/button.h45
-rw-r--r--firmware/export/config-neo35.h52
-rw-r--r--firmware/export/config.h2
-rw-r--r--firmware/export/lcd.h21
-rwxr-xr-xtools/configure12
12 files changed, 1 insertions, 609 deletions
diff --git a/apps/neo/icons.h b/apps/neo/icons.h
deleted file mode 100644
index 460fee83ba..0000000000
--- a/apps/neo/icons.h
+++ /dev/null
@@ -1,38 +0,0 @@
1/***************************************************************************
2 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/
8 * $Id$
9 *
10 * Copyright (C) 2002 Justin Heiner
11 *
12 * All files in this archive are subject to the GNU General Public License.
13 * See the file COPYING in the source tree root for full license agreement.
14 *
15 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
16 * KIND, either express or implied.
17 *
18 ****************************************************************************/
19#ifndef _ICONS_H_
20#define _ICONS_H_
21
22#include <lcd.h>
23
24/*
25 * Icons of size 5x7 pixels for the Player LCD
26 */
27
28#ifdef HAVE_LCD_CHARCELLS
29
30enum {
31 Unknown=0x90,
32 Bookmark = 0x16,
33 Plugin, Folder, Mod_Ajz, Language, File, Wps, Playlist, Text, Config,
34};
35
36#endif
37
38#endif
diff --git a/apps/neo/keyboard.c b/apps/neo/keyboard.c
deleted file mode 100644
index 6dd315e16e..0000000000
--- a/apps/neo/keyboard.c
+++ /dev/null
@@ -1,308 +0,0 @@
1
2/***************************************************************************
3 * __________ __ ___.
4 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
5 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
6 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
7 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
8 * \/ \/ \/ \/ \/
9 * $Id$
10 *
11 * Copyright (C) 2003 by Francois Boucher
12 *
13 * All files in this archive are subject to the GNU General Public License.
14 * See the file COPYING in the source tree root for full license agreement.
15 *
16 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
17 * KIND, either express or implied.
18 *
19 ****************************************************************************/
20#include <string.h>
21
22#include "lcd.h"
23#include "button.h"
24#include "kernel.h"
25#include "version.h"
26#include "sprintf.h"
27#include "lcd-charset.h"
28#include "lang.h"
29#include "debug.h"
30
31/* Two functions that are part of the firmware for the Neo-builds only.
32 TODO: make them proper "official" firmware functions or replace them
33 with apps code */
34extern void lcd_cursor(int x, int y);
35extern int button_add(unsigned int button);
36
37#define KEYBOARD_MAX_LENGTH 255
38
39static const unsigned char* const kbd_screens[3] = {
40 "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
41 "abcdefghijklmnopqrstuvwxyz",
42 " !\"#$%&'()*+,-./0123456789;<=>?@[]^_`{|}"
43};
44
45static const unsigned char* const kbd_screens_names[3] = {
46 "Capitals",
47 "Small",
48 "Others"
49};
50
51static void kbd_show_legend( int nb )
52{
53 char buf[24];
54 snprintf(buf, sizeof(buf), "[%s]", kbd_screens_names[nb] );
55 lcd_puts( 0, 1, buf );
56 lcd_puts( 0, 2, kbd_screens[nb] );
57 lcd_puts( 0, 3, &kbd_screens[nb][20] );
58}
59
60/*
61 Returns text len Max = KEYBOARD_MAX_LENGTH characters.
62
63 This function MUST NOT fill in more than 'buflen' bytes into the given
64 buffer!
65*/
66static char kbdbuffer[KEYBOARD_MAX_LENGTH+1]; /* no use to alloc this huge one
67 on the stack */
68int kbd_input(char* text, int buflen)
69{
70 char* pstart;
71 char* pcursor;
72 char* pold;
73 int bufferlen;
74 char cursorpos = 0;
75 int ret = 0;
76 bool done = false;
77 int key;
78 int screen = 0;
79 int screenidx = -1;
80 const unsigned char * pcurscreen = kbd_screens[0];
81 bool ctl;
82
83 bufferlen = strlen(text);
84
85 if(bufferlen > KEYBOARD_MAX_LENGTH)
86 bufferlen = KEYBOARD_MAX_LENGTH;
87
88 strncpy(kbdbuffer, text, bufferlen);
89 kbdbuffer[bufferlen] = 0;
90
91 lcd_clear_display();
92
93 /* Initial setup */
94 lcd_puts(0, 0, kbdbuffer);
95 kbd_show_legend(screen);
96 lcd_cursor(cursorpos, 0);
97 lcd_write_command(LCD_BLINKCUR);
98
99 pstart = pcursor = kbdbuffer;
100
101 while(!done) {
102 /* We want all the keys except the releases and the repeats */
103 key = button_get(true);
104
105 if( key & BUTTON_IR)
106 ctl = key & (NEO_IR_BUTTON_PLAY|NEO_IR_BUTTON_STOP|NEO_IR_BUTTON_BROWSE);
107 else
108 ctl = key & (BUTTON_PLAY|BUTTON_STOP|BUTTON_MENU);
109
110 if( ctl ) {
111 /* These key do not change the first line */
112 switch( key ) {
113 case BUTTON_MENU:
114 case BUTTON_IR|NEO_IR_BUTTON_BROWSE:
115
116 /* Toggle legend screen */
117 screen++;
118 if( screen == 3 )
119 screen = 0;
120
121 pcurscreen = kbd_screens[screen];
122
123 screenidx = -1;
124 kbd_show_legend( screen );
125
126 /* Restore cursor */
127 lcd_cursor( cursorpos, 0 );
128 break;
129
130 case BUTTON_PLAY:
131 case BUTTON_IR|NEO_IR_BUTTON_PLAY:
132 if( bufferlen ) {
133 strncpy(text, kbdbuffer, bufferlen);
134 text[bufferlen] = 0;
135 ret = bufferlen;
136 }
137 /* fallthrough */
138
139 case BUTTON_STOP:
140 case BUTTON_IR|NEO_IR_BUTTON_STOP:
141
142 /* Remove blinking cursor */
143 lcd_write_command(LCD_OFFCUR);
144 done = true;
145 }
146 }
147 else {
148
149 switch( key ) {
150
151 case BUTTON_PROGRAM:
152 case BUTTON_PROGRAM|BUTTON_REPEAT:
153 case BUTTON_IR|NEO_IR_BUTTON_PROGRAM:
154
155 /* Delete char at pcursor */
156 /* Check if we are at the last char */
157
158 if( *(pcursor+1) != 0 ) {
159 /* move rest of the string to the left in buffer */
160 pold = pcursor;
161 while( *pcursor ){
162 *pcursor = *(pcursor+1);
163 pcursor++;
164 }
165
166 /* Restore position */
167 pcursor = pold;
168 }
169 else {
170 *pcursor = 0;
171 pcursor--;
172 cursorpos--;
173 }
174
175 bufferlen--;
176 break;
177
178 case BUTTON_IR|NEO_IR_BUTTON_EQ:
179 case BUTTON_SELECT|BUTTON_LEFT:
180
181 /* Insert left */
182
183 if(bufferlen >= buflen)
184 break;
185
186 pold = pcursor;
187
188 /* Goto end */
189 while( *pcursor )
190 pcursor++;
191
192 /* Move string content to the right */
193 while( pcursor >= pold ){
194 *(pcursor+1) = *pcursor;
195 pcursor--;
196 }
197
198 pcursor = pold;
199 *pcursor = ' ';
200
201 bufferlen++;
202 break;
203
204 case BUTTON_IR|NEO_IR_BUTTON_MUTE:
205 case BUTTON_SELECT|BUTTON_RIGHT:
206
207 /* Insert Right */
208
209 if(bufferlen >= buflen)
210 break;
211
212 pold = pcursor;
213
214 /* Goto end */
215 while(*pcursor)
216 pcursor++;
217
218 /* Move string content to the right */
219 while(pcursor > pold){
220 *(pcursor+1) = *pcursor;
221 pcursor--;
222 }
223
224 pcursor = pold;
225 *(pcursor+1) = ' ';
226
227 bufferlen++;
228
229 button_add( BUTTON_RIGHT );
230 break;
231
232 case BUTTON_LEFT:
233 case BUTTON_REPEAT|BUTTON_LEFT:
234 case BUTTON_IR|NEO_IR_BUTTON_REWIND:
235 case BUTTON_IR|NEO_IR_BUTTON_REWIND|BUTTON_REPEAT:
236
237 /* Move cursor left. Shift text right if all the way to the
238 left */
239
240 /* Check for start of string */
241 if(pcursor > kbdbuffer) {
242
243 screenidx = -1;
244 cursorpos--;
245 pcursor--;
246
247 /* Check if were going off the screen */
248 if( cursorpos == -1 ) {
249 cursorpos = 0;
250
251 /* Shift text right if we are */
252 pstart--;
253 }
254 }
255 break;
256
257 case BUTTON_RIGHT:
258 case BUTTON_REPEAT|BUTTON_RIGHT:
259 case BUTTON_IR|NEO_IR_BUTTON_FFORWARD:
260 case BUTTON_IR|NEO_IR_BUTTON_FFORWARD|BUTTON_REPEAT:
261
262 /* Move cursor right. Shift text left if all the way to
263 the right */
264
265 /* Check for end of string */
266 if( *(pcursor+1) != 0 ) {
267 screenidx = -1;
268 cursorpos++;
269 pcursor++;
270
271 /* Check if were going of the screen */
272 if( cursorpos == 20 ) {
273 cursorpos = 19;
274
275 /* Shift text left if we are */
276 pstart++;
277 }
278 }
279 break;
280
281 case BUTTON_UP:
282 case BUTTON_UP|BUTTON_REPEAT:
283 case BUTTON_IR|NEO_IR_BUTTON_VOLUP:
284 case BUTTON_IR|NEO_IR_BUTTON_VOLUP|BUTTON_REPEAT:
285 screenidx += 2;
286 /* fallthrough */
287 case BUTTON_DOWN:
288 case BUTTON_DOWN|BUTTON_REPEAT:
289 case BUTTON_IR|NEO_IR_BUTTON_VOLDN:
290 case BUTTON_IR|NEO_IR_BUTTON_VOLDN|BUTTON_REPEAT:
291 screenidx--;
292
293 if( screenidx < 0 )
294 screenidx = strlen(pcurscreen)-1;
295
296 if( pcurscreen[screenidx] == 0 )
297 screenidx = 0;
298
299 /* Changes the character over the cursor */
300 *pcursor = pcurscreen[screenidx];
301 }
302
303 lcd_puts( 0, 0, pstart);
304 lcd_cursor( cursorpos, 0 );
305 }
306 }
307 return ret;
308}
diff --git a/apps/neo/lcd-charset.h b/apps/neo/lcd-charset.h
deleted file mode 100644
index 24e3b223c2..0000000000
--- a/apps/neo/lcd-charset.h
+++ /dev/null
@@ -1,46 +0,0 @@
1#define CGRAM0 0x00
2#define CGRAM1 0x01
3#define CGRAM2 0x02
4#define CGRAM3 0x03
5#define CGRAM4 0x04
6#define CGRAM5 0x05
7#define CGRAM6 0x06
8#define CGRAM7 0x07
9
10#define CGRAM0_CHAR 0x10
11#define CGRAM1_CHAR 0x11
12#define CGRAM2_CHAR 0x12
13#define CGRAM3_CHAR 0x13
14#define CGRAM4_CHAR 0x14
15#define CGRAM5_CHAR 0x15
16#define CGRAM6_CHAR 0x16
17#define CGRAM7_CHAR 0x17
18
19#define RESERVED_CHAR 0xff
20#define NOCHAR_OLD 0x24
21#define UNKNOWN_CHAR 0x3f
22
23#define LARROW_CHAR 0x1e
24#define RARROW_CHAR 0x1f
25#define FULLGRID_CHAR 0x7f
26
27#define BACKSLASH_LCD CGRAM0
28#define RARROW_LCD 0x7e
29#define LARROW_LCD 0x7f
30#define FULLGRID_LCD 0xff
31
32#define PROGRESS1_LCD CGRAM1
33#define PROGRESS2_LCD CGRAM2
34#define PROGRESS3_LCD CGRAM3
35#define PROGRESS4_LCD CGRAM4
36#define PROGRESS5_LCD FULLGRID_LCD
37
38#define PROGRESS1_CHAR CGRAM1_CHAR
39#define PROGRESS2_CHAR CGRAM2_CHAR
40#define PROGRESS3_CHAR CGRAM3_CHAR
41#define PROGRESS4_CHAR CGRAM4_CHAR
42#define PROGRESS5_CHAR FULLGRID_CHAR
43
44
45extern unsigned char latin1_to_lcd[256];
46
diff --git a/apps/wps-display.c b/apps/wps-display.c
index 238c8d3f19..2612b92d2a 100644
--- a/apps/wps-display.c
+++ b/apps/wps-display.c
@@ -461,7 +461,6 @@ static char* get_tag(struct mp3entry* cid3,
461#endif 461#endif
462 case 'f': /* full-line progress bar */ 462 case 'f': /* full-line progress bar */
463#ifdef HAVE_LCD_CHARCELLS 463#ifdef HAVE_LCD_CHARCELLS
464#ifndef HAVE_NEO_LCD
465 if(has_new_lcd()) { 464 if(has_new_lcd()) {
466 *flags |= WPS_REFRESH_PLAYER_PROGRESS; 465 *flags |= WPS_REFRESH_PLAYER_PROGRESS;
467 *flags |= WPS_REFRESH_DYNAMIC; 466 *flags |= WPS_REFRESH_DYNAMIC;
@@ -471,7 +470,6 @@ static char* get_tag(struct mp3entry* cid3,
471 snprintf(buf, buf_size, " "); 470 snprintf(buf, buf_size, " ");
472 } 471 }
473 else 472 else
474#endif /* HAVE_NEO_LCD */
475 { 473 {
476 /* Tell the user if we have an OldPlayer */ 474 /* Tell the user if we have an OldPlayer */
477 snprintf(buf, buf_size, " <Old LCD> "); 475 snprintf(buf, buf_size, " <Old LCD> ");
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 25cdd3d96b..263dce4d16 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -385,42 +385,6 @@ static int button_read(void)
385 return btn; 385 return btn;
386} 386}
387 387
388#elif defined(HAVE_NEO_KEYPAD)
389static bool mStation = false;
390void button_init(void)
391{
392 /* set port pins as input */
393 PAIOR &= ~0x4000; /* PA14 for stop button */
394
395 queue_init(&button_queue);
396 lastbtn = 0;
397 tick_add_task(button_tick);
398
399 reset_poweroff_timer();
400}
401int button_read(void)
402{
403 int btn=BUTTON_NONE;
404
405 btn|=((~PCDR)&0xFF);
406
407 /* mStation does not have a stop button and this floods the button queue
408 with stops if used on a mStation */
409 if (!mStation)
410 btn|=((~(PADR>>6))&0x100);
411
412 return btn;
413}
414
415/* This function adds a button press event to the button queue, and this
416 really isn't anything Neo-specific but might be subject for adding to
417 the generic button driver */
418int button_add(unsigned int button)
419{
420 queue_post(&button_queue,button,NULL);
421 return 1;
422}
423
424#elif defined HAVE_ONDIO_KEYPAD 388#elif defined HAVE_ONDIO_KEYPAD
425 389
426/* 390/*
diff --git a/firmware/drivers/lcd-player.c b/firmware/drivers/lcd-player.c
index fb870f232a..01d7cfdb6e 100644
--- a/firmware/drivers/lcd-player.c
+++ b/firmware/drivers/lcd-player.c
@@ -488,11 +488,7 @@ void lcd_set_contrast(int val)
488 488
489void lcd_init (void) 489void lcd_init (void)
490{ 490{
491#ifdef HAVE_NEO_LCD
492 new_lcd = true;
493#else
494 new_lcd = has_new_lcd(); 491 new_lcd = has_new_lcd();
495#endif
496 memset(extended_chars_mapped, NO_CHAR, sizeof(extended_chars_mapped)); 492 memset(extended_chars_mapped, NO_CHAR, sizeof(extended_chars_mapped));
497 memset(extended_pattern_content, NO_CHAR,sizeof(extended_pattern_content)); 493 memset(extended_pattern_content, NO_CHAR,sizeof(extended_pattern_content));
498 memset(extended_pattern_usage, 0, sizeof(extended_pattern_usage)); 494 memset(extended_pattern_usage, 0, sizeof(extended_pattern_usage));
@@ -731,46 +727,4 @@ static void scroll_thread(void)
731 } 727 }
732} 728}
733 729
734#ifdef HAVE_NEO_LCD
735
736/*
737 * Function use by the Neo code, but could/should be made a generic one.
738 */
739void lcd_cursor(int x, int y)
740{
741 /* If we make sure the display size is setup with proper defines in the
742 config-*.h files, this should work on all displays */
743 if ((cursor.y_pos==y && cursor.x_pos==x) ||
744 x>=20 ||
745 y>3 ||
746 x<0 ||
747 y<0) {
748 DEBUGF("ignoring request for cursor to %d,%d - currently %d,%d\n",
749 x,y,cursor.x_pos,cursor.y_pos);
750 return;
751 }
752
753 char value=0;
754
755 cursor.y_pos=y;
756 cursor.x_pos=x;
757
758 switch (y) {
759 case 0:
760 value=0x80|x;
761 break;
762 case 1:
763 value=0x80|(x+0x40);
764 break;
765 case 2:
766 value=0x80|(x+0x14);
767 break;
768 case 3:
769 value=0x80|(x+0x54);
770 break;
771 }
772 lcd_write_command(value);
773}
774#endif
775
776#endif /* HAVE_LCD_CHARCELLS */ 730#endif /* HAVE_LCD_CHARCELLS */
diff --git a/firmware/drivers/serial.c b/firmware/drivers/serial.c
index e1e0eb82e9..a66f3b1fa4 100644
--- a/firmware/drivers/serial.c
+++ b/firmware/drivers/serial.c
@@ -85,7 +85,7 @@ int remote_control_rx(void)
85 } 85 }
86 else 86 else
87 { 87 {
88#if !defined(HAVE_NEO_KEYPAD) && !defined(HAVE_ONDIO_KEYPAD) 88#ifndef HAVE_ONDIO_KEYPAD
89 switch (btn) 89 switch (btn)
90 { 90 {
91 case STOP: 91 case STOP:
diff --git a/firmware/export/button.h b/firmware/export/button.h
index 7ec484440f..50a9b1d8fd 100644
--- a/firmware/export/button.h
+++ b/firmware/export/button.h
@@ -36,49 +36,6 @@ void button_set_flip(bool flip); /* turn 180 degrees */
36 36
37#define BUTTON_NONE 0x0000 37#define BUTTON_NONE 0x0000
38 38
39#ifdef HAVE_NEO_KEYPAD
40/* neo button codes */
41#define BUTTON_UP 0x0080
42#define BUTTON_DOWN 0x0010
43#define BUTTON_LEFT 0x0001
44#define BUTTON_RIGHT 0x0002
45
46#define BUTTON_SELECT 0x0040
47
48#define BUTTON_ON BUTTON_SELECT
49
50#define BUTTON_PROGRAM 0x0020
51#define BUTTON_MENU 0x0004
52#define BUTTON_PLAY 0x0008
53#define BUTTON_STOP 0x0100
54
55#define BUTTON_IR 0x2000
56#define BUTTON_REPEAT 0x4000
57#define BUTTON_REL 0x8000
58
59#define BUTTON_FLAG_MASK 0xF000
60#define BUTTON_MASK 0x0FFF
61#define BUTTON_ALL BUTTON_MASK
62#define BUTTON_ALL_FLAGS BUTTON_FLAG_MASK
63
64#define NEO_IR_BUTTON_POWER 0x0001
65#define NEO_IR_BUTTON_SETTING 0x0002
66#define NEO_IR_BUTTON_REWIND 0x0004
67#define NEO_IR_BUTTON_FFORWARD 0x0008
68#define NEO_IR_BUTTON_PLAY 0x0010
69#define NEO_IR_BUTTON_VOLUP 0x0020
70#define NEO_IR_BUTTON_VOLDN 0x0040
71#define NEO_IR_BUTTON_BROWSE 0x0080
72#define NEO_IR_BUTTON_EQ 0x0100
73#define NEO_IR_BUTTON_MUTE 0x0200
74#define NEO_IR_BUTTON_PROGRAM 0x0400
75#define NEO_IR_BUTTON_STOP 0x0800
76#define NEO_IR_BUTTON_NONE 0x0000
77
78#define NEO_IR_BUTTON_REPEAT 0x1000
79
80#else
81
82/* Shared button codes */ 39/* Shared button codes */
83#define BUTTON_LEFT 0x0040 40#define BUTTON_LEFT 0x0040
84#define BUTTON_RIGHT 0x0080 41#define BUTTON_RIGHT 0x0080
@@ -130,7 +87,5 @@ void button_set_flip(bool flip); /* turn 180 degrees */
130 87
131#endif /* HAVE_RECORDER/PLAYER/ONDIO_KEYPAD */ 88#endif /* HAVE_RECORDER/PLAYER/ONDIO_KEYPAD */
132 89
133#endif /* HAVE_NEO_KEYPAD */
134
135#endif /* _BUTTON_H_ */ 90#endif /* _BUTTON_H_ */
136 91
diff --git a/firmware/export/config-neo35.h b/firmware/export/config-neo35.h
deleted file mode 100644
index fd5592f153..0000000000
--- a/firmware/export/config-neo35.h
+++ /dev/null
@@ -1,52 +0,0 @@
1/* define this if you have a charcell LCD display */
2#define HAVE_LCD_CHARCELLS 1
3
4/* define this if you have a neo-style LCD */
5#define HAVE_NEO_LCD 1
6
7/* define this if you have the Player's keyboard */
8#define HAVE_NEO_KEYPAD 1
9
10/* Define this if you have a SH7034 */
11#define HAVE_SH7034
12
13/* Define this if you have a MAS3507D */
14#define HAVE_MAS3507D
15
16/* Define this if you have a DAC3550A */
17#define HAVE_DAC3550A
18
19/* Define this to the CPU frequency */
20#define CPU_FREQ 12000000 /* cycle time ~83.3ns */
21
22/* Battery scale factor (?) */
23#define BATTERY_SCALE_FACTOR 6546
24
25/* Define this if you must discharge the data line by driving it low
26 and then set it to input to see if it stays low or goes high */
27#define HAVE_I2C_LOW_FIRST
28
29/* Define this if you control power on PADR (instead of PBDR) */
30#define HAVE_POWEROFF_ON_PADR
31
32/* Offset ( in the firmware file's header ) to the file length */
33#define FIRMWARE_OFFSET_FILE_LENGTH 0
34
35/* Offset ( in the firmware file's header ) to the file CRC */
36#define FIRMWARE_OFFSET_FILE_CRC 4
37
38/* Offset ( in the firmware file's header ) to the real data */
39#define FIRMWARE_OFFSET_FILE_DATA 6
40
41/* How to detect USB */
42#define USB_NONE 1
43
44/* If this is a Neo-style memory architecture platform */
45#define NEO_MEMORY 1
46
47/* Define this for programmable LED available */
48#define HAVE_LED
49
50/* Define this for LCD backlight available */
51#define HAVE_BACKLIGHT
52
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 359eadd82d..49306d4e81 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -28,8 +28,6 @@
28#include "config-fmrecorder.h" 28#include "config-fmrecorder.h"
29#elif defined(ARCHOS_RECORDERV2) 29#elif defined(ARCHOS_RECORDERV2)
30#include "config-recorderv2.h" 30#include "config-recorderv2.h"
31#elif defined(NEO_35)
32#include "config-neo35.h"
33#elif defined(ARCHOS_ONDIOSP) 31#elif defined(ARCHOS_ONDIOSP)
34#include "config-ondiosp.h" 32#include "config-ondiosp.h"
35#elif defined(ARCHOS_ONDIOFM) 33#elif defined(ARCHOS_ONDIOFM)
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 21d1f4cc55..306e525b99 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -142,25 +142,4 @@ extern int lcd_getstringsize(const unsigned char *str, int *w, int *h);
142 142
143#endif /* CHARCELLS / BITMAP */ 143#endif /* CHARCELLS / BITMAP */
144 144
145/* These control codes may only work on the Neo LCD display */
146#ifdef HAVE_NEO_LCD
147
148/* Cursor Control Instructions */
149#define LCD_OFFCUR 0x0C
150#define LCD_LINECUR 0x0E
151#define LCD_BLINKCUR 0x0D
152#define LCD_COMBNCUR 0x0F
153#define LCD_HOMECUR 0x02
154#define LCD_SHLFCUR 0x10
155#define LCD_SHRTCUR 0x14
156
157/* Display Control Instructions */
158#define LCD_CLEAR 0x01
159#define LCD_OFFDISP 0x08
160#define LCD_ONDISP 0x0C
161#define LCD_SHLFDISP 0x18
162#define LCD_SHRTDISP 0x1C
163#define LCD_SET_CGRAM 0x40
164#endif
165
166#endif /* __LCD_H__ */ 145#endif /* __LCD_H__ */
diff --git a/tools/configure b/tools/configure
index f941850593..7fea1f2311 100755
--- a/tools/configure
+++ b/tools/configure
@@ -208,8 +208,6 @@ if [ -z "$archos" ]; then
208 echo "2 - Archos Recorder" 208 echo "2 - Archos Recorder"
209 echo "3 - Archos FM Recorder" 209 echo "3 - Archos FM Recorder"
210 echo "4 - Archos Recorder v2" 210 echo "4 - Archos Recorder v2"
211 echo "5 - Neo mStation"
212 echo "6 - Neo 35"
213 echo "7 - Archos Ondio SP" 211 echo "7 - Archos Ondio SP"
214 echo "8 - Archos Ondio FM" 212 echo "8 - Archos Ondio FM"
215 echo "9 - Iriver H100" 213 echo "9 - Iriver H100"
@@ -233,16 +231,6 @@ if [ -z "$archos" ]; then
233 target="-DARCHOS_RECORDERV2" 231 target="-DARCHOS_RECORDERV2"
234 ;; 232 ;;
235 233
236 5)
237 archos="neomstation"
238 target="-DNEO_MSTATION"
239 ;;
240
241 6)
242 archos="neo35"
243 target="-DNEO_35"
244 ;;
245
246 7) 234 7)
247 archos="ondiosp" 235 archos="ondiosp"
248 target="-DARCHOS_ONDIOSP" 236 target="-DARCHOS_ONDIOSP"
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-23 08:26:54 +0000