diff options
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 { | |||
40 | int y; | 40 | int y; |
41 | int width; | 41 | int width; |
42 | int height; | 42 | int height; |
43 | #ifdef HAVE_LCD_BITMAP | ||
44 | int flags; | 43 | int flags; |
45 | int font; | 44 | int font; |
46 | int drawmode; | 45 | int drawmode; |
47 | /* needed for even for mono displays to support greylib */ | 46 | /* needed for even for mono displays to support greylib */ |
48 | unsigned fg_pattern; | 47 | unsigned fg_pattern; |
49 | unsigned bg_pattern; | 48 | unsigned bg_pattern; |
50 | #endif | ||
51 | }; | 49 | }; |
52 | 50 | ||
53 | /* Frame buffer stride | 51 | /* Frame buffer stride |
@@ -114,7 +112,6 @@ struct scrollinfo; | |||
114 | #define STRIDE(screen, w, h) (screen==SCREEN_MAIN?STRIDE_MAIN((w), \ | 112 | #define STRIDE(screen, w, h) (screen==SCREEN_MAIN?STRIDE_MAIN((w), \ |
115 | (h)):STRIDE_REMOTE((w),(h))) | 113 | (h)):STRIDE_REMOTE((w),(h))) |
116 | 114 | ||
117 | #ifdef HAVE_LCD_BITMAP | ||
118 | #if LCD_DEPTH <=8 | 115 | #if LCD_DEPTH <=8 |
119 | #if (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED) \ | 116 | #if (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED) \ |
120 | || (LCD_PIXELFORMAT == HORIZONTAL_INTERLEAVED) | 117 | || (LCD_PIXELFORMAT == HORIZONTAL_INTERLEAVED) |
@@ -144,7 +141,6 @@ typedef unsigned long fb_data; | |||
144 | #endif | 141 | #endif |
145 | #define FB_DATA_SZ 4 | 142 | #define FB_DATA_SZ 4 |
146 | #endif /* LCD_DEPTH */ | 143 | #endif /* LCD_DEPTH */ |
147 | #endif | ||
148 | 144 | ||
149 | #if defined(HAVE_LCD_MODES) | 145 | #if defined(HAVE_LCD_MODES) |
150 | void lcd_set_mode(int mode); | 146 | void lcd_set_mode(int mode); |
@@ -193,8 +189,6 @@ extern bool lcd_putsxy_scroll_func(int x, int y, const unsigned char *string, | |||
193 | void (*scroll_func)(struct scrollinfo *), | 189 | void (*scroll_func)(struct scrollinfo *), |
194 | void *data, int x_offset); | 190 | void *data, int x_offset); |
195 | 191 | ||
196 | #ifdef HAVE_LCD_BITMAP | ||
197 | |||
198 | /* performance function */ | 192 | /* performance function */ |
199 | #if defined(HAVE_LCD_COLOR) | 193 | #if defined(HAVE_LCD_COLOR) |
200 | #if MEMORYSIZE > 2 | 194 | #if MEMORYSIZE > 2 |
@@ -221,7 +215,6 @@ extern void lcd_remote_update(void); | |||
221 | /* update a fraction of the screen */ | 215 | /* update a fraction of the screen */ |
222 | extern void lcd_remote_update_rect(int x, int y, int width, int height); | 216 | extern void lcd_remote_update_rect(int x, int y, int width, int height); |
223 | #endif /* HAVE_REMOTE_LCD */ | 217 | #endif /* HAVE_REMOTE_LCD */ |
224 | #endif /* HAVE_LCD_BITMAP */ | ||
225 | 218 | ||
226 | /* Bitmap formats */ | 219 | /* Bitmap formats */ |
227 | enum | 220 | enum |
@@ -249,8 +242,6 @@ typedef void lcd_blockfunc_type(fb_data *address, unsigned mask, unsigned bits); | |||
249 | typedef void lcd_fastpixelfunc_type(fb_data *address); | 242 | typedef void lcd_fastpixelfunc_type(fb_data *address); |
250 | #endif | 243 | #endif |
251 | 244 | ||
252 | #ifdef HAVE_LCD_BITMAP | ||
253 | |||
254 | #if defined(HAVE_LCD_COLOR) && defined(LCD_REMOTE_DEPTH) && \ | 245 | #if defined(HAVE_LCD_COLOR) && defined(LCD_REMOTE_DEPTH) && \ |
255 | LCD_REMOTE_DEPTH > 1 | 246 | LCD_REMOTE_DEPTH > 1 |
256 | /* Just return color for screens use */ | 247 | /* Just return color for screens use */ |
@@ -593,6 +584,4 @@ static inline int lcd_get_dpi(void) { return LCD_DPI; } | |||
593 | extern int lcd_get_dpi(void); | 584 | extern int lcd_get_dpi(void); |
594 | #endif /* LCD_DPI */ | 585 | #endif /* LCD_DPI */ |
595 | 586 | ||
596 | #endif /* HAVE_LCD_BITMAP */ | ||
597 | |||
598 | #endif /* __LCD_H__ */ | 587 | #endif /* __LCD_H__ */ |