diff options
Diffstat (limited to 'firmware/target/coldfire/iriver')
-rw-r--r-- | firmware/target/coldfire/iriver/h100/lcd-h100.c | 6 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/h300/lcd-h300.c | 17 |
2 files changed, 4 insertions, 19 deletions
diff --git a/firmware/target/coldfire/iriver/h100/lcd-h100.c b/firmware/target/coldfire/iriver/h100/lcd-h100.c index 2ba19255da..fd22df81ef 100644 --- a/firmware/target/coldfire/iriver/h100/lcd-h100.c +++ b/firmware/target/coldfire/iriver/h100/lcd-h100.c | |||
@@ -140,8 +140,8 @@ void lcd_init_device(void) | |||
140 | 140 | ||
141 | /* Performance function that works with an external buffer | 141 | /* Performance function that works with an external buffer |
142 | note that by and bheight are in 8-pixel units! */ | 142 | note that by and bheight are in 8-pixel units! */ |
143 | void lcd_blit(const unsigned char* data, int x, int by, int width, | 143 | void lcd_blit_mono(const unsigned char *data, int x, int by, int width, |
144 | int bheight, int stride) | 144 | int bheight, int stride) |
145 | { | 145 | { |
146 | const unsigned char *src, *src_end; | 146 | const unsigned char *src, *src_end; |
147 | unsigned char *dst_u, *dst_l; | 147 | unsigned char *dst_u, *dst_l; |
@@ -185,7 +185,7 @@ void lcd_grey_data(unsigned char *values, unsigned char *phases, int count); | |||
185 | 185 | ||
186 | /* Performance function that works with an external buffer | 186 | /* Performance function that works with an external buffer |
187 | note that by and bheight are in 4-pixel units! */ | 187 | note that by and bheight are in 4-pixel units! */ |
188 | void lcd_grey_phase_blit(unsigned char *values, unsigned char *phases, | 188 | void lcd_blit_grey_phase(unsigned char *values, unsigned char *phases, |
189 | int x, int by, int width, int bheight, int stride) | 189 | int x, int by, int width, int bheight, int stride) |
190 | { | 190 | { |
191 | stride <<= 2; /* 4 pixels per block */ | 191 | stride <<= 2; /* 4 pixels per block */ |
diff --git a/firmware/target/coldfire/iriver/h300/lcd-h300.c b/firmware/target/coldfire/iriver/h300/lcd-h300.c index 00662e16f9..5081366d41 100644 --- a/firmware/target/coldfire/iriver/h300/lcd-h300.c +++ b/firmware/target/coldfire/iriver/h300/lcd-h300.c | |||
@@ -294,21 +294,6 @@ bool lcd_enabled(void) | |||
294 | 294 | ||
295 | /*** update functions ***/ | 295 | /*** update functions ***/ |
296 | 296 | ||
297 | /* Performance function that works with an external buffer | ||
298 | note that by and bheight are in 8-pixel units! */ | ||
299 | void lcd_blit(const fb_data* data, int x, int by, int width, | ||
300 | int bheight, int stride) | ||
301 | { | ||
302 | /* TODO: Implement lcd_blit() */ | ||
303 | (void)data; | ||
304 | (void)x; | ||
305 | (void)by; | ||
306 | (void)width; | ||
307 | (void)bheight; | ||
308 | (void)stride; | ||
309 | /*if(display_on)*/ | ||
310 | } | ||
311 | |||
312 | /* Line write helper function for lcd_yuv_blit. Write two lines of yuv420. | 297 | /* Line write helper function for lcd_yuv_blit. Write two lines of yuv420. |
313 | * y should have two lines of Y back to back, 2nd line first. | 298 | * y should have two lines of Y back to back, 2nd line first. |
314 | * c should contain the Cb and Cr data for the two lines of Y back to back. | 299 | * c should contain the Cb and Cr data for the two lines of Y back to back. |
@@ -321,7 +306,7 @@ extern void lcd_write_yuv420_lines(const unsigned char *y, | |||
321 | * src_x, src_y, width and height should be even | 306 | * src_x, src_y, width and height should be even |
322 | * x, y, width and height have to be within LCD bounds | 307 | * x, y, width and height have to be within LCD bounds |
323 | */ | 308 | */ |
324 | void lcd_yuv_blit(unsigned char * const src[3], | 309 | void lcd_blit_yuv(unsigned char * const src[3], |
325 | int src_x, int src_y, int stride, | 310 | int src_x, int src_y, int stride, |
326 | int x, int y, int width, int height) | 311 | int x, int y, int width, int height) |
327 | { | 312 | { |