summaryrefslogtreecommitdiffstats
path: root/firmware/export
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-07-19 19:38:45 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-07-24 21:20:13 +0000
commit0c4f89370d05056faa789aa9cabcccc4e509fb9f (patch)
tree6ddf7fff0a47564db41d39927ea1acbdb03e74ee /firmware/export
parent092c340a2062fa98b7387fc5fd63578ddae7d0b6 (diff)
downloadrockbox-0c4f89370d05056faa789aa9cabcccc4e509fb9f.tar.gz
rockbox-0c4f89370d05056faa789aa9cabcccc4e509fb9f.tar.bz2
rockbox-0c4f89370d05056faa789aa9cabcccc4e509fb9f.zip
[2/4] get rid of HAVE_LCD_CHARCELLS
HAVE_LCD_BITMAP is now redundant. lcd_bitmap is always-on in features.txt so manual and lang strings don't have to change Change-Id: I08eeb20de48099ffc2dc23782711af368c2ec794
Diffstat (limited to 'firmware/export')
-rw-r--r--firmware/export/lcd-charcell.h68
-rw-r--r--firmware/export/lcd.h40
-rw-r--r--firmware/export/scroll_engine.h4
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 @@
-/***************************************************************************
- * __________ __ ___.
- * Open \______ \ ____ ____ | | _\_ |__ _______ ___
- * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
- * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
- * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
- * \/ \/ \/ \/ \/
- * $Id$
- *
- * Copyright (C) 2007 by Jens Arnold
- *
- * 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"
-
-/* target dependent - to be adjusted for other charcell targets */
-#define HW_PATTERN_SIZE 7 /* number of bytes per pattern */
-#define MAX_HW_PATTERNS 8 /* max. number of user-definable hw patterns */
-
-struct cursor_info {
- unsigned char hw_char;
- unsigned char subst_char;
- bool enabled;
- bool visible;
- int x;
- int y;
- int divider;
- int downcount;
-};
-
-/* map unicode characters to hardware or extended lcd characters */
-struct xchar_info {
- unsigned short ucs;
- unsigned short glyph;
- /* 0x0000..0x7fff: fixed extended characters
- * 0x8000..0xffff: variable extended characters
- * Dontcare if priority == 0 */
- unsigned char priority;
- unsigned char hw_char; /* direct or substitute */
-};
-
-/* track usage of user-definable characters */
-struct pattern_info {
- short count;
- unsigned short glyph;
- unsigned char priority;
- unsigned char pattern[HW_PATTERN_SIZE];
-};
-
-extern int lcd_pattern_count; /* actual number of user-definable hw patterns */
-
-extern unsigned char lcd_charbuffer[LCD_HEIGHT][LCD_WIDTH];
-extern struct pattern_info lcd_patterns[MAX_HW_PATTERNS];
-extern struct cursor_info lcd_cursor;
-
-extern const struct xchar_info *xchar_info;
-extern int xchar_info_size; /* number of entries */
-extern const unsigned char xfont_fixed[][HW_PATTERN_SIZE];
-
-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;
#endif
#define FB_DATA_SZ 4
#endif /* LCD_DEPTH */
-
-#else /* LCD_CHARCELLS */
-typedef unsigned char fb_data;
#endif
#if defined(HAVE_LCD_MODES)
@@ -226,43 +223,6 @@ extern void lcd_remote_update_rect(int x, int y, int width, int height);
#endif /* HAVE_REMOTE_LCD */
#endif /* HAVE_LCD_BITMAP */
-#ifdef HAVE_LCD_CHARCELLS
-
-/* Icon definitions for lcd_icon() */
-enum
-{
- ICON_BATTERY = 0,
- ICON_BATTERY_1,
- ICON_BATTERY_2,
- ICON_BATTERY_3,
- ICON_USB,
- ICON_PLAY,
- ICON_RECORD,
- ICON_PAUSE,
- ICON_AUDIO,
- ICON_REPEAT,
- ICON_1,
- ICON_VOLUME,
- ICON_VOLUME_1,
- ICON_VOLUME_2,
- ICON_VOLUME_3,
- ICON_VOLUME_4,
- ICON_VOLUME_5,
- ICON_PARAM
-};
-
-void lcd_icon(int icon, bool enable);
-void lcd_double_height(bool on);
-void lcd_define_pattern(unsigned long ucs, const char *pattern);
-unsigned long lcd_get_locked_pattern(void);
-void lcd_unlock_pattern(unsigned long ucs);
-void lcd_put_cursor(int x, int y, unsigned long cursor_ucs);
-void lcd_remove_cursor(void);
-#define JUMP_SCROLL_ALWAYS 5
-extern void lcd_jump_scroll(int mode); /* 0=off, 1=once, ..., ALWAYS */
-extern void lcd_jump_scroll_delay(int ms);
-#endif /* HAVE_LCD_CHARCELLS */
-
/* Bitmap formats */
enum
{
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
long ticks; /* # of ticks between updates*/
long delay; /* ticks delay before start */
int bidir_limit; /* percent */
-#ifdef HAVE_LCD_CHARCELLS
- long jump_scroll_delay; /* delay between jump scroll jumps */
- int jump_scroll; /* 0=off, 1=once, ..., JUMP_SCROLL_ALWAYS */
-#endif
#if defined(HAVE_LCD_BITMAP) || defined(HAVE_REMOTE_LCD)
int step; /* pixels per scroll step */
#endif