len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[4/4] Remove HAVE_LCD_BITMAP, as it's now the only choice.

Browse source 
Note:  I left behind lcd_bitmap in features.txt, because removing it
would require considerable work in the manual and the translations.

Change-Id: Ia8ca7761f610d9332a0d22a7d189775fb15ec88a
This commit is contained in:
Solomon Peachy 2020-07-17 10:31:31 -04:00
parent 8cb555460f
commit 658026e626
240 changed files with 288 additions and 1759 deletions
Download patch file Download diff file Expand all files Collapse all files

34
apps/plugins/cube.c
View file

@ -451,9 +451,6 @@
#endif
#endif
#ifdef HAVE_LCD_BITMAP
#define DIST (10 * MIN(LCD_HEIGHT, LCD_WIDTH) / 16)
static int x_off = LCD_WIDTH/2;
static int y_off = LCD_HEIGHT/2;
@ -486,16 +483,6 @@ static struct my_lcd *mylcd = &greyfuncs;
#define ASPECT 256 /* = 1.00 */
#endif
#else /* !LCD_BITMAP */
#define MYLCD(fn) pgfx_ ## fn
#define DIST 9
static int x_off = 10;
static int y_off = 7;
#define ASPECT 300 /* = 1.175 */
#endif /* !LCD_BITMAP */
struct point_3D {
long x, y, z;
};
@ -771,7 +758,6 @@ enum plugin_status plugin_start(const void* parameter)
(void)(parameter);
#ifdef HAVE_LCD_BITMAP
#if defined(USEGSLIB)
gbuf = (unsigned char *)rb->plugin_get_buffer(&gbuf_size);
if (!grey_init(gbuf, gbuf_size, GREY_BUFFERED,
@ -794,7 +780,6 @@ enum plugin_status plugin_start(const void* parameter)
grey_setfont(FONT_SYSFIXED);
#endif
rb->lcd_setfont(FONT_SYSFIXED);
#endif
atexit(cleanup);
while(!quit)
@ -808,7 +793,6 @@ enum plugin_status plugin_start(const void* parameter)
redraw = false;
}
#ifdef HAVE_LCD_BITMAP
if (t_disp > 0)
{
char buffer[30];
@ -821,24 +805,6 @@ enum plugin_status plugin_start(const void* parameter)
if (t_disp == 0)
redraw = true;
}
#else
if (t_disp > 0)
{
if (t_disp == DISP_TIME)
{
rb->lcd_puts(5, 0, axes[curr].label);
rb->lcd_putsf(5, 1, "%d %c",
paused ? axes[curr].angle : axes[curr].speed,
highspeed ? 'H' : ' ');
}
t_disp--;
if (t_disp == 0)
{
rb->lcd_clear_display();
pgfx_display(0, 0);
}
}
#endif
#ifdef USEGSLIB
if (mode_switch)
{