diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-19 19:38:45 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 0c4f89370d05056faa789aa9cabcccc4e509fb9f (patch) | |
tree | 6ddf7fff0a47564db41d39927ea1acbdb03e74ee /apps/gui/splash.c | |
parent | 092c340a2062fa98b7387fc5fd63578ddae7d0b6 (diff) | |
download | rockbox-0c4f89370d05056faa789aa9cabcccc4e509fb9f.tar.gz 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 'apps/gui/splash.c')
-rw-r--r-- | apps/gui/splash.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/apps/gui/splash.c b/apps/gui/splash.c index 2608a2e02e..56df77d57a 100644 --- a/apps/gui/splash.c +++ b/apps/gui/splash.c | |||
@@ -38,12 +38,6 @@ | |||
38 | #define RECT_SPACING 2 | 38 | #define RECT_SPACING 2 |
39 | #define SPLASH_MEMORY_INTERVAL (HZ) | 39 | #define SPLASH_MEMORY_INTERVAL (HZ) |
40 | 40 | ||
41 | #else /* HAVE_LCD_CHARCELLS */ | ||
42 | |||
43 | #define MAXLINES 2 | ||
44 | #define MAXBUFFER 64 | ||
45 | #define RECT_SPACING 0 | ||
46 | |||
47 | #endif | 41 | #endif |
48 | 42 | ||
49 | 43 | ||
@@ -68,12 +62,6 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap) | |||
68 | screen->set_viewport(&vp); | 62 | screen->set_viewport(&vp); |
69 | 63 | ||
70 | screen->getstringsize(" ", &space_w, &h); | 64 | screen->getstringsize(" ", &space_w, &h); |
71 | #else /* HAVE_LCD_CHARCELLS */ | ||
72 | vp.width = screen->lcdwidth; | ||
73 | vp.height = screen->lcdheight; | ||
74 | |||
75 | space_w = h = 1; | ||
76 | screen->double_height (false); | ||
77 | #endif | 65 | #endif |
78 | y = h; | 66 | y = h; |
79 | 67 | ||
@@ -178,9 +166,6 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap) | |||
178 | 166 | ||
179 | /* prepare putting the text */ | 167 | /* prepare putting the text */ |
180 | y = RECT_SPACING; | 168 | y = RECT_SPACING; |
181 | #else /* HAVE_LCD_CHARCELLS */ | ||
182 | y = 0; /* vertical centering on 2 lines would be silly */ | ||
183 | screen->clear_display(); | ||
184 | #endif | 169 | #endif |
185 | 170 | ||
186 | /* print the message to screen */ | 171 | /* print the message to screen */ |
@@ -188,8 +173,6 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap) | |||
188 | { | 173 | { |
189 | #ifdef HAVE_LCD_BITMAP | 174 | #ifdef HAVE_LCD_BITMAP |
190 | screen->putsxy(0, y, lines[i]); | 175 | screen->putsxy(0, y, lines[i]); |
191 | #else | ||
192 | screen->puts(0, y, lines[i]); | ||
193 | #endif | 176 | #endif |
194 | } | 177 | } |
195 | screen->update_viewport(); | 178 | screen->update_viewport(); |