diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2022-10-13 11:03:53 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2022-10-13 11:08:06 -0400 |
commit | 418169aff8faf2cf90124cd95dba0af821cea73d (patch) | |
tree | 4fc206af57c9a07fba6cbcb3517fa946a7b84668 /firmware/export | |
parent | f9ea1fc79d6aaff9949a5b11ae011b4e04e0e9d9 (diff) | |
download | rockbox-418169aff8faf2cf90124cd95dba0af821cea73d.tar.gz rockbox-418169aff8faf2cf90124cd95dba0af821cea73d.zip |
Revert "Remove YUV blitting functions and LCD modes"
This reverts commit fe6aa21e9eb88f49005863efd2003d0982920048.
Change-Id: I8bb1e5d6c52ed1478002d2140ef494ec5d62b8e3
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/config/mrobe500.h | 2 | ||||
-rw-r--r-- | firmware/export/lcd.h | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/firmware/export/config/mrobe500.h b/firmware/export/config/mrobe500.h index 0ecec80e02..621c0b75ca 100644 --- a/firmware/export/config/mrobe500.h +++ b/firmware/export/config/mrobe500.h | |||
@@ -220,7 +220,7 @@ | |||
220 | #define HAVE_USB_HID_MOUSE | 220 | #define HAVE_USB_HID_MOUSE |
221 | 221 | ||
222 | /* Define this if hardware supports alternate blitting */ | 222 | /* Define this if hardware supports alternate blitting */ |
223 | #define HAVE_LCD_MODES (LCD_MODE_RGB565 | LCD_MODE_PAL256) | 223 | #define HAVE_LCD_MODES (LCD_MODE_RGB565 | LCD_MODE_YUV | LCD_MODE_PAL256) |
224 | 224 | ||
225 | #define CONFIG_CPU DM320 | 225 | #define CONFIG_CPU DM320 |
226 | 226 | ||
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 29c34b698b..67b22190ad 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h | |||
@@ -145,6 +145,7 @@ struct scrollinfo; | |||
145 | #if defined(HAVE_LCD_MODES) | 145 | #if defined(HAVE_LCD_MODES) |
146 | void lcd_set_mode(int mode); | 146 | void lcd_set_mode(int mode); |
147 | #define LCD_MODE_RGB565 0x00000001 | 147 | #define LCD_MODE_RGB565 0x00000001 |
148 | #define LCD_MODE_YUV 0x00000002 | ||
148 | #define LCD_MODE_PAL256 0x00000004 | 149 | #define LCD_MODE_PAL256 0x00000004 |
149 | 150 | ||
150 | #if HAVE_LCD_MODES & LCD_MODE_PAL256 | 151 | #if HAVE_LCD_MODES & LCD_MODE_PAL256 |
@@ -235,7 +236,15 @@ extern bool lcd_putsxy_scroll_func(int x, int y, const unsigned char *string, | |||
235 | void *data, int x_offset); | 236 | void *data, int x_offset); |
236 | 237 | ||
237 | /* performance function */ | 238 | /* performance function */ |
238 | #if !defined(HAVE_LCD_COLOR) | 239 | #if defined(HAVE_LCD_COLOR) |
240 | #if MEMORYSIZE > 2 | ||
241 | #define LCD_YUV_DITHER 0x1 | ||
242 | extern void lcd_yuv_set_options(unsigned options); | ||
243 | extern void lcd_blit_yuv(unsigned char * const src[3], | ||
244 | int src_x, int src_y, int stride, | ||
245 | int x, int y, int width, int height); | ||
246 | #endif /* MEMORYSIZE > 2 */ | ||
247 | #else | ||
239 | extern void lcd_blit_mono(const unsigned char *data, int x, int by, int width, | 248 | extern void lcd_blit_mono(const unsigned char *data, int x, int by, int width, |
240 | int bheight, int stride); | 249 | int bheight, int stride); |
241 | extern void lcd_blit_grey_phase(unsigned char *values, unsigned char *phases, | 250 | extern void lcd_blit_grey_phase(unsigned char *values, unsigned char *phases, |