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 /apps/screen_access.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 'apps/screen_access.h')
-rw-r--r-- | apps/screen_access.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/apps/screen_access.h b/apps/screen_access.h index eab84c9129..79ad79c153 100644 --- a/apps/screen_access.h +++ b/apps/screen_access.h | |||
@@ -50,9 +50,7 @@ struct screen | |||
50 | int lcdwidth, lcdheight; | 50 | int lcdwidth, lcdheight; |
51 | int depth; | 51 | int depth; |
52 | int (*getnblines)(void); | 52 | int (*getnblines)(void); |
53 | #ifdef HAVE_LCD_BITMAP | ||
54 | int pixel_format; | 53 | int pixel_format; |
55 | #endif | ||
56 | int (*getcharwidth)(void); | 54 | int (*getcharwidth)(void); |
57 | int (*getcharheight)(void); | 55 | int (*getcharheight)(void); |
58 | bool is_color; | 56 | bool is_color; |
@@ -64,7 +62,6 @@ struct screen | |||
64 | int (*getwidth)(void); | 62 | int (*getwidth)(void); |
65 | int (*getheight)(void); | 63 | int (*getheight)(void); |
66 | int (*getstringsize)(const unsigned char *str, int *w, int *h); | 64 | int (*getstringsize)(const unsigned char *str, int *w, int *h); |
67 | #if defined(HAVE_LCD_BITMAP) || defined(HAVE_REMOTE_LCD) /* always bitmap */ | ||
68 | void (*setfont)(int newfont); | 65 | void (*setfont)(int newfont); |
69 | int (*getuifont)(void); | 66 | int (*getuifont)(void); |
70 | void (*setuifont)(int newfont); | 67 | void (*setuifont)(int newfont); |
@@ -104,7 +101,6 @@ struct screen | |||
104 | void (*drawline)(int x1, int y1, int x2, int y2); | 101 | void (*drawline)(int x1, int y1, int x2, int y2); |
105 | void (*vline)(int x, int y1, int y2); | 102 | void (*vline)(int x, int y1, int y2); |
106 | void (*hline)(int x1, int x2, int y); | 103 | void (*hline)(int x1, int x2, int y); |
107 | #endif /* HAVE_LCD_BITMAP || HAVE_REMOTE_LCD */ | ||
108 | 104 | ||
109 | void (*putsxy)(int x, int y, const unsigned char *str); | 105 | void (*putsxy)(int x, int y, const unsigned char *str); |
110 | void (*puts)(int x, int y, const unsigned char *str); | 106 | void (*puts)(int x, int y, const unsigned char *str); |
@@ -130,7 +126,6 @@ struct screen | |||
130 | bool (*backdrop_load)(const char *filename, char* backdrop_buffer); | 126 | bool (*backdrop_load)(const char *filename, char* backdrop_buffer); |
131 | void (*backdrop_show)(char* backdrop_buffer); | 127 | void (*backdrop_show)(char* backdrop_buffer); |
132 | #endif | 128 | #endif |
133 | #if defined(HAVE_LCD_BITMAP) | ||
134 | void (*set_framebuffer)(void *framebuffer); | 129 | void (*set_framebuffer)(void *framebuffer); |
135 | #if defined(HAVE_LCD_COLOR) | 130 | #if defined(HAVE_LCD_COLOR) |
136 | void (*gradient_fillrect)(int x, int y, int width, int height, | 131 | void (*gradient_fillrect)(int x, int y, int width, int height, |
@@ -138,15 +133,11 @@ struct screen | |||
138 | void (*gradient_fillrect_part)(int x, int y, int width, int height, | 133 | void (*gradient_fillrect_part)(int x, int y, int width, int height, |
139 | unsigned start, unsigned end, int src_height, int row_skip); | 134 | unsigned start, unsigned end, int src_height, int row_skip); |
140 | #endif | 135 | #endif |
141 | #endif | ||
142 | #if defined(HAVE_LCD_BITMAP) | ||
143 | void (*nine_segment_bmp)(const struct bitmap* bm, int x, int y, | 136 | void (*nine_segment_bmp)(const struct bitmap* bm, int x, int y, |
144 | int width, int height); | 137 | int width, int height); |
145 | #endif | ||
146 | void (*put_line)(int x, int y, struct line_desc *line, const char *fmt, ...); | 138 | void (*put_line)(int x, int y, struct line_desc *line, const char *fmt, ...); |
147 | }; | 139 | }; |
148 | 140 | ||
149 | #if defined(HAVE_LCD_BITMAP) || defined(HAVE_REMOTE_LCD) | ||
150 | /* | 141 | /* |
151 | * Clear only a given area of the screen | 142 | * Clear only a given area of the screen |
152 | * - screen : the screen structure | 143 | * - screen : the screen structure |
@@ -155,7 +146,6 @@ struct screen | |||
155 | */ | 146 | */ |
156 | void screen_clear_area(struct screen * display, int xstart, int ystart, | 147 | void screen_clear_area(struct screen * display, int xstart, int ystart, |
157 | int width, int height); | 148 | int width, int height); |
158 | #endif | ||
159 | 149 | ||
160 | /* | 150 | /* |
161 | * exported screens array that should be used | 151 | * exported screens array that should be used |