diff options
Diffstat (limited to 'firmware/export/lcd.h')
-rw-r--r-- | firmware/export/lcd.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 669ef67f02..a6ecc975c2 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h | |||
@@ -71,7 +71,12 @@ struct viewport { | |||
71 | #endif /* SIMULATOR */ | 71 | #endif /* SIMULATOR */ |
72 | 72 | ||
73 | #if LCD_DEPTH <=8 | 73 | #if LCD_DEPTH <=8 |
74 | #if (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED) \ | ||
75 | || (LCD_PIXELFORMAT == HORIZONTAL_INTERLEAVED) | ||
76 | typedef unsigned short fb_data; | ||
77 | #else | ||
74 | typedef unsigned char fb_data; | 78 | typedef unsigned char fb_data; |
79 | #endif | ||
75 | #elif LCD_DEPTH <= 16 | 80 | #elif LCD_DEPTH <= 16 |
76 | typedef unsigned short fb_data; | 81 | typedef unsigned short fb_data; |
77 | #else /* LCD_DEPTH > 16 */ | 82 | #else /* LCD_DEPTH > 16 */ |
@@ -303,8 +308,10 @@ static inline unsigned lcd_color_to_native(unsigned color) | |||
303 | #elif LCD_DEPTH == 2 | 308 | #elif LCD_DEPTH == 2 |
304 | #if LCD_PIXELFORMAT == HORIZONTAL_PACKING | 309 | #if LCD_PIXELFORMAT == HORIZONTAL_PACKING |
305 | #define LCD_FBWIDTH ((LCD_WIDTH+3)/4) | 310 | #define LCD_FBWIDTH ((LCD_WIDTH+3)/4) |
306 | #else /* LCD_PIXELFORMAT == VERTICAL_PACKING */ | 311 | #elif LCD_PIXELFORMAT == VERTICAL_PACKING |
307 | #define LCD_FBHEIGHT ((LCD_HEIGHT+3)/4) | 312 | #define LCD_FBHEIGHT ((LCD_HEIGHT+3)/4) |
313 | #elif LCD_PIXELFORMAT == VERTICAL_INTERLEAVED | ||
314 | #define LCD_FBHEIGHT ((LCD_HEIGHT+7)/8) | ||
308 | #endif /* LCD_PIXELFORMAT */ | 315 | #endif /* LCD_PIXELFORMAT */ |
309 | #endif /* LCD_DEPTH */ | 316 | #endif /* LCD_DEPTH */ |
310 | /* Set defaults if not defined different yet. The defaults apply to both | 317 | /* Set defaults if not defined different yet. The defaults apply to both |