diff options
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/lcd-charcell.h | 68 | ||||
-rw-r--r-- | firmware/export/lcd.h | 40 | ||||
-rw-r--r-- | firmware/export/scroll_engine.h | 4 |
3 files changed, 0 insertions, 112 deletions
diff --git a/firmware/export/lcd-charcell.h b/firmware/export/lcd-charcell.h deleted file mode 100644 index 8dace07d8e..0000000000 --- a/firmware/export/lcd-charcell.h +++ /dev/null | |||
@@ -1,68 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2007 by Jens Arnold | ||
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 | #include "config.h" | ||
23 | |||
24 | /* target dependent - to be adjusted for other charcell targets */ | ||
25 | #define HW_PATTERN_SIZE 7 /* number of bytes per pattern */ | ||
26 | #define MAX_HW_PATTERNS 8 /* max. number of user-definable hw patterns */ | ||
27 | |||
28 | struct cursor_info { | ||
29 | unsigned char hw_char; | ||
30 | unsigned char subst_char; | ||
31 | bool enabled; | ||
32 | bool visible; | ||
33 | int x; | ||
34 | int y; | ||
35 | int divider; | ||
36 | int downcount; | ||
37 | }; | ||
38 | |||
39 | /* map unicode characters to hardware or extended lcd characters */ | ||
40 | struct xchar_info { | ||
41 | unsigned short ucs; | ||
42 | unsigned short glyph; | ||
43 | /* 0x0000..0x7fff: fixed extended characters | ||
44 | * 0x8000..0xffff: variable extended characters | ||
45 | * Dontcare if priority == 0 */ | ||
46 | unsigned char priority; | ||
47 | unsigned char hw_char; /* direct or substitute */ | ||
48 | }; | ||
49 | |||
50 | /* track usage of user-definable characters */ | ||
51 | struct pattern_info { | ||
52 | short count; | ||
53 | unsigned short glyph; | ||
54 | unsigned char priority; | ||
55 | unsigned char pattern[HW_PATTERN_SIZE]; | ||
56 | }; | ||
57 | |||
58 | extern int lcd_pattern_count; /* actual number of user-definable hw patterns */ | ||
59 | |||
60 | extern unsigned char lcd_charbuffer[LCD_HEIGHT][LCD_WIDTH]; | ||
61 | extern struct pattern_info lcd_patterns[MAX_HW_PATTERNS]; | ||
62 | extern struct cursor_info lcd_cursor; | ||
63 | |||
64 | extern const struct xchar_info *xchar_info; | ||
65 | extern int xchar_info_size; /* number of entries */ | ||
66 | extern const unsigned char xfont_fixed[][HW_PATTERN_SIZE]; | ||
67 | |||
68 | void lcd_charset_init(void); | ||
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 80ef45a573..0975df4c79 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h | |||
@@ -144,9 +144,6 @@ typedef unsigned long fb_data; | |||
144 | #endif | 144 | #endif |
145 | #define FB_DATA_SZ 4 | 145 | #define FB_DATA_SZ 4 |
146 | #endif /* LCD_DEPTH */ | 146 | #endif /* LCD_DEPTH */ |
147 | |||
148 | #else /* LCD_CHARCELLS */ | ||
149 | typedef unsigned char fb_data; | ||
150 | #endif | 147 | #endif |
151 | 148 | ||
152 | #if defined(HAVE_LCD_MODES) | 149 | #if defined(HAVE_LCD_MODES) |
@@ -226,43 +223,6 @@ extern void lcd_remote_update_rect(int x, int y, int width, int height); | |||
226 | #endif /* HAVE_REMOTE_LCD */ | 223 | #endif /* HAVE_REMOTE_LCD */ |
227 | #endif /* HAVE_LCD_BITMAP */ | 224 | #endif /* HAVE_LCD_BITMAP */ |
228 | 225 | ||
229 | #ifdef HAVE_LCD_CHARCELLS | ||
230 | |||
231 | /* Icon definitions for lcd_icon() */ | ||
232 | enum | ||
233 | { | ||
234 | ICON_BATTERY = 0, | ||
235 | ICON_BATTERY_1, | ||
236 | ICON_BATTERY_2, | ||
237 | ICON_BATTERY_3, | ||
238 | ICON_USB, | ||
239 | ICON_PLAY, | ||
240 | ICON_RECORD, | ||
241 | ICON_PAUSE, | ||
242 | ICON_AUDIO, | ||
243 | ICON_REPEAT, | ||
244 | ICON_1, | ||
245 | ICON_VOLUME, | ||
246 | ICON_VOLUME_1, | ||
247 | ICON_VOLUME_2, | ||
248 | ICON_VOLUME_3, | ||
249 | ICON_VOLUME_4, | ||
250 | ICON_VOLUME_5, | ||
251 | ICON_PARAM | ||
252 | }; | ||
253 | |||
254 | void lcd_icon(int icon, bool enable); | ||
255 | void lcd_double_height(bool on); | ||
256 | void lcd_define_pattern(unsigned long ucs, const char *pattern); | ||
257 | unsigned long lcd_get_locked_pattern(void); | ||
258 | void lcd_unlock_pattern(unsigned long ucs); | ||
259 | void lcd_put_cursor(int x, int y, unsigned long cursor_ucs); | ||
260 | void lcd_remove_cursor(void); | ||
261 | #define JUMP_SCROLL_ALWAYS 5 | ||
262 | extern void lcd_jump_scroll(int mode); /* 0=off, 1=once, ..., ALWAYS */ | ||
263 | extern void lcd_jump_scroll_delay(int ms); | ||
264 | #endif /* HAVE_LCD_CHARCELLS */ | ||
265 | |||
266 | /* Bitmap formats */ | 226 | /* Bitmap formats */ |
267 | enum | 227 | enum |
268 | { | 228 | { |
diff --git a/firmware/export/scroll_engine.h b/firmware/export/scroll_engine.h index 1326812265..051e367506 100644 --- a/firmware/export/scroll_engine.h +++ b/firmware/export/scroll_engine.h | |||
@@ -95,10 +95,6 @@ struct scroll_screen_info | |||
95 | long ticks; /* # of ticks between updates*/ | 95 | long ticks; /* # of ticks between updates*/ |
96 | long delay; /* ticks delay before start */ | 96 | long delay; /* ticks delay before start */ |
97 | int bidir_limit; /* percent */ | 97 | int bidir_limit; /* percent */ |
98 | #ifdef HAVE_LCD_CHARCELLS | ||
99 | long jump_scroll_delay; /* delay between jump scroll jumps */ | ||
100 | int jump_scroll; /* 0=off, 1=once, ..., JUMP_SCROLL_ALWAYS */ | ||
101 | #endif | ||
102 | #if defined(HAVE_LCD_BITMAP) || defined(HAVE_REMOTE_LCD) | 98 | #if defined(HAVE_LCD_BITMAP) || defined(HAVE_REMOTE_LCD) |
103 | int step; /* pixels per scroll step */ | 99 | int step; /* pixels per scroll step */ |
104 | #endif | 100 | #endif |