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/target/arm/rk27xx | |
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/target/arm/rk27xx')
-rw-r--r-- | firmware/target/arm/rk27xx/ihifi/lcd-ihifi.c | 15 | ||||
-rw-r--r-- | firmware/target/arm/rk27xx/ihifi2/lcd-ihifi770.c | 15 | ||||
-rw-r--r-- | firmware/target/arm/rk27xx/ihifi2/lcd-ihifi770c.c | 15 | ||||
-rw-r--r-- | firmware/target/arm/rk27xx/ihifi2/lcd-ihifi800.c | 15 | ||||
-rw-r--r-- | firmware/target/arm/rk27xx/lcd-hifiman.c | 19 | ||||
-rw-r--r-- | firmware/target/arm/rk27xx/ma/lcd-ma.c | 15 | ||||
-rw-r--r-- | firmware/target/arm/rk27xx/rk27generic/lcd-rk27generic.c | 19 |
7 files changed, 113 insertions, 0 deletions
diff --git a/firmware/target/arm/rk27xx/ihifi/lcd-ihifi.c b/firmware/target/arm/rk27xx/ihifi/lcd-ihifi.c index 9596dca98b..d5906b9dd5 100644 --- a/firmware/target/arm/rk27xx/ihifi/lcd-ihifi.c +++ b/firmware/target/arm/rk27xx/ihifi/lcd-ihifi.c | |||
@@ -207,3 +207,18 @@ bool lcd_active() | |||
207 | { | 207 | { |
208 | return display_on; | 208 | return display_on; |
209 | } | 209 | } |
210 | |||
211 | /* Blit a YUV bitmap directly to the LCD */ | ||
212 | void lcd_blit_yuv(unsigned char * const src[3], | ||
213 | int src_x, int src_y, int stride, | ||
214 | int x, int y, int width, int height) | ||
215 | { | ||
216 | (void)src; | ||
217 | (void)src_x; | ||
218 | (void)src_y; | ||
219 | (void)stride; | ||
220 | (void)x; | ||
221 | (void)y; | ||
222 | (void)width; | ||
223 | (void)height; | ||
224 | } | ||
diff --git a/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi770.c b/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi770.c index cef0186de5..23505d9fa0 100644 --- a/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi770.c +++ b/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi770.c | |||
@@ -268,3 +268,18 @@ bool lcd_active() | |||
268 | { | 268 | { |
269 | return display_on; | 269 | return display_on; |
270 | } | 270 | } |
271 | |||
272 | /* Blit a YUV bitmap directly to the LCD */ | ||
273 | void lcd_blit_yuv(unsigned char * const src[3], | ||
274 | int src_x, int src_y, int stride, | ||
275 | int x, int y, int width, int height) | ||
276 | { | ||
277 | (void)src; | ||
278 | (void)src_x; | ||
279 | (void)src_y; | ||
280 | (void)stride; | ||
281 | (void)x; | ||
282 | (void)y; | ||
283 | (void)width; | ||
284 | (void)height; | ||
285 | } | ||
diff --git a/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi770c.c b/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi770c.c index e2436e9b90..311b8057cb 100644 --- a/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi770c.c +++ b/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi770c.c | |||
@@ -231,3 +231,18 @@ bool lcd_active() | |||
231 | { | 231 | { |
232 | return display_on; | 232 | return display_on; |
233 | } | 233 | } |
234 | |||
235 | /* Blit a YUV bitmap directly to the LCD */ | ||
236 | void lcd_blit_yuv(unsigned char * const src[3], | ||
237 | int src_x, int src_y, int stride, | ||
238 | int x, int y, int width, int height) | ||
239 | { | ||
240 | (void)src; | ||
241 | (void)src_x; | ||
242 | (void)src_y; | ||
243 | (void)stride; | ||
244 | (void)x; | ||
245 | (void)y; | ||
246 | (void)width; | ||
247 | (void)height; | ||
248 | } | ||
diff --git a/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi800.c b/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi800.c index 8520715650..821b52dcb6 100644 --- a/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi800.c +++ b/firmware/target/arm/rk27xx/ihifi2/lcd-ihifi800.c | |||
@@ -211,3 +211,18 @@ bool lcd_active() | |||
211 | { | 211 | { |
212 | return display_on; | 212 | return display_on; |
213 | } | 213 | } |
214 | |||
215 | /* Blit a YUV bitmap directly to the LCD */ | ||
216 | void lcd_blit_yuv(unsigned char * const src[3], | ||
217 | int src_x, int src_y, int stride, | ||
218 | int x, int y, int width, int height) | ||
219 | { | ||
220 | (void)src; | ||
221 | (void)src_x; | ||
222 | (void)src_y; | ||
223 | (void)stride; | ||
224 | (void)x; | ||
225 | (void)y; | ||
226 | (void)width; | ||
227 | (void)height; | ||
228 | } | ||
diff --git a/firmware/target/arm/rk27xx/lcd-hifiman.c b/firmware/target/arm/rk27xx/lcd-hifiman.c index 95486b02e4..bde1d3546f 100644 --- a/firmware/target/arm/rk27xx/lcd-hifiman.c +++ b/firmware/target/arm/rk27xx/lcd-hifiman.c | |||
@@ -350,3 +350,22 @@ bool lcd_active() | |||
350 | { | 350 | { |
351 | return display_on; | 351 | return display_on; |
352 | } | 352 | } |
353 | |||
354 | /* Blit a YUV bitmap directly to the LCD | ||
355 | * provided by generic fallback in lcd-16bit-common.c | ||
356 | */ | ||
357 | #if 0 | ||
358 | void lcd_blit_yuv(unsigned char * const src[3], | ||
359 | int src_x, int src_y, int stride, | ||
360 | int x, int y, int width, int height) | ||
361 | { | ||
362 | (void)src; | ||
363 | (void)src_x; | ||
364 | (void)src_y; | ||
365 | (void)stride; | ||
366 | (void)x; | ||
367 | (void)y; | ||
368 | (void)width; | ||
369 | (void)height; | ||
370 | } | ||
371 | #endif | ||
diff --git a/firmware/target/arm/rk27xx/ma/lcd-ma.c b/firmware/target/arm/rk27xx/ma/lcd-ma.c index 8dfe874b44..fa3ccc5aa0 100644 --- a/firmware/target/arm/rk27xx/ma/lcd-ma.c +++ b/firmware/target/arm/rk27xx/ma/lcd-ma.c | |||
@@ -253,3 +253,18 @@ bool lcd_active() | |||
253 | { | 253 | { |
254 | return display_on; | 254 | return display_on; |
255 | } | 255 | } |
256 | |||
257 | /* Blit a YUV bitmap directly to the LCD */ | ||
258 | void lcd_blit_yuv(unsigned char * const src[3], | ||
259 | int src_x, int src_y, int stride, | ||
260 | int x, int y, int width, int height) | ||
261 | { | ||
262 | (void)src; | ||
263 | (void)src_x; | ||
264 | (void)src_y; | ||
265 | (void)stride; | ||
266 | (void)x; | ||
267 | (void)y; | ||
268 | (void)width; | ||
269 | (void)height; | ||
270 | } | ||
diff --git a/firmware/target/arm/rk27xx/rk27generic/lcd-rk27generic.c b/firmware/target/arm/rk27xx/rk27generic/lcd-rk27generic.c index e5cefd282d..b40f2860d7 100644 --- a/firmware/target/arm/rk27xx/rk27generic/lcd-rk27generic.c +++ b/firmware/target/arm/rk27xx/rk27generic/lcd-rk27generic.c | |||
@@ -178,3 +178,22 @@ void lcd_set_gram_area(int x_start, int y_start, | |||
178 | lcd_cmd(GRAM_WRITE); | 178 | lcd_cmd(GRAM_WRITE); |
179 | LCDC_CTRL &= ~RGB24B; | 179 | LCDC_CTRL &= ~RGB24B; |
180 | } | 180 | } |
181 | |||
182 | /* Blit a YUV bitmap directly to the LCD | ||
183 | * provided by generic fallback in lcd-16bit-common.c | ||
184 | */ | ||
185 | #if 0 | ||
186 | void lcd_blit_yuv(unsigned char * const src[3], | ||
187 | int src_x, int src_y, int stride, | ||
188 | int x, int y, int width, int height) | ||
189 | { | ||
190 | (void)src; | ||
191 | (void)src_x; | ||
192 | (void)src_y; | ||
193 | (void)stride; | ||
194 | (void)x; | ||
195 | (void)y; | ||
196 | (void)width; | ||
197 | (void)height; | ||
198 | } | ||
199 | #endif | ||