diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-17 10:31:31 -0400 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
| commit | 658026e6267277b27d297c481728f74d160a8481 (patch) | |
| tree | 915a9d2bb48469bdd5b9127dc19a61f230721a6c /firmware/export/lcd.h | |
| parent | 8cb555460ff79e636a7907fb2589e16db98c8600 (diff) | |
| download | rockbox-658026e6267277b27d297c481728f74d160a8481.tar.gz rockbox-658026e6267277b27d297c481728f74d160a8481.zip | |
[4/4] Remove HAVE_LCD_BITMAP, as it's now the only choice.
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
Diffstat (limited to 'firmware/export/lcd.h')
| -rw-r--r-- | firmware/export/lcd.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 0975df4c79..9346a6815b 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h @@ -40,14 +40,12 @@ struct viewport { int y; int width; int height; -#ifdef HAVE_LCD_BITMAP int flags; int font; int drawmode; /* needed for even for mono displays to support greylib */ unsigned fg_pattern; unsigned bg_pattern; -#endif }; /* Frame buffer stride @@ -114,7 +112,6 @@ struct scrollinfo; #define STRIDE(screen, w, h) (screen==SCREEN_MAIN?STRIDE_MAIN((w), \ (h)):STRIDE_REMOTE((w),(h))) -#ifdef HAVE_LCD_BITMAP #if LCD_DEPTH <=8 #if (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED) \ || (LCD_PIXELFORMAT == HORIZONTAL_INTERLEAVED) @@ -144,7 +141,6 @@ typedef unsigned long fb_data; #endif #define FB_DATA_SZ 4 #endif /* LCD_DEPTH */ -#endif #if defined(HAVE_LCD_MODES) void lcd_set_mode(int mode); @@ -193,8 +189,6 @@ extern bool lcd_putsxy_scroll_func(int x, int y, const unsigned char *string, void (*scroll_func)(struct scrollinfo *), void *data, int x_offset); -#ifdef HAVE_LCD_BITMAP - /* performance function */ #if defined(HAVE_LCD_COLOR) #if MEMORYSIZE > 2 @@ -221,7 +215,6 @@ extern void lcd_remote_update(void); /* update a fraction of the screen */ extern void lcd_remote_update_rect(int x, int y, int width, int height); #endif /* HAVE_REMOTE_LCD */ -#endif /* HAVE_LCD_BITMAP */ /* Bitmap formats */ enum @@ -249,8 +242,6 @@ typedef void lcd_blockfunc_type(fb_data *address, unsigned mask, unsigned bits); typedef void lcd_fastpixelfunc_type(fb_data *address); #endif -#ifdef HAVE_LCD_BITMAP - #if defined(HAVE_LCD_COLOR) && defined(LCD_REMOTE_DEPTH) && \ LCD_REMOTE_DEPTH > 1 /* Just return color for screens use */ @@ -593,6 +584,4 @@ static inline int lcd_get_dpi(void) { return LCD_DPI; } extern int lcd_get_dpi(void); #endif /* LCD_DPI */ -#endif /* HAVE_LCD_BITMAP */ - #endif /* __LCD_H__ */ |