diff options
Diffstat (limited to 'firmware/target/arm/ipod')
-rw-r--r-- | firmware/target/arm/ipod/lcd-color_nano.c | 16 | ||||
-rw-r--r-- | firmware/target/arm/ipod/lcd-gray.c | 6 | ||||
-rw-r--r-- | firmware/target/arm/ipod/video/lcd-video.c | 16 |
3 files changed, 5 insertions, 33 deletions
diff --git a/firmware/target/arm/ipod/lcd-color_nano.c b/firmware/target/arm/ipod/lcd-color_nano.c index b18b7ee712..482622bf57 100644 --- a/firmware/target/arm/ipod/lcd-color_nano.c +++ b/firmware/target/arm/ipod/lcd-color_nano.c | |||
@@ -109,20 +109,6 @@ void lcd_init_device(void) | |||
109 | 109 | ||
110 | /*** update functions ***/ | 110 | /*** update functions ***/ |
111 | 111 | ||
112 | /* Performance function that works with an external buffer | ||
113 | note that by and bheight are in 4-pixel units! */ | ||
114 | void lcd_blit(const fb_data* data, int x, int by, int width, | ||
115 | int bheight, int stride) | ||
116 | { | ||
117 | /* TODO: Implement lcd_blit() */ | ||
118 | (void)data; | ||
119 | (void)x; | ||
120 | (void)by; | ||
121 | (void)width; | ||
122 | (void)bheight; | ||
123 | (void)stride; | ||
124 | } | ||
125 | |||
126 | #define CSUB_X 2 | 112 | #define CSUB_X 2 |
127 | #define CSUB_Y 2 | 113 | #define CSUB_Y 2 |
128 | 114 | ||
@@ -155,7 +141,7 @@ void lcd_blit(const fb_data* data, int x, int by, int width, | |||
155 | #define MAX_6BIT 0x3f | 141 | #define MAX_6BIT 0x3f |
156 | 142 | ||
157 | /* Performance function to blit a YUV bitmap directly to the LCD */ | 143 | /* Performance function to blit a YUV bitmap directly to the LCD */ |
158 | void lcd_yuv_blit(unsigned char * const src[3], | 144 | void lcd_blit_yuv(unsigned char * const src[3], |
159 | int src_x, int src_y, int stride, | 145 | int src_x, int src_y, int stride, |
160 | int x, int y, int width, int height) | 146 | int x, int y, int width, int height) |
161 | { | 147 | { |
diff --git a/firmware/target/arm/ipod/lcd-gray.c b/firmware/target/arm/ipod/lcd-gray.c index b77d3eb7f6..e36a7efc1d 100644 --- a/firmware/target/arm/ipod/lcd-gray.c +++ b/firmware/target/arm/ipod/lcd-gray.c | |||
@@ -277,8 +277,8 @@ void lcd_mono_data(const unsigned char *data, int count); | |||
277 | 277 | ||
278 | /* Performance function that works with an external buffer | 278 | /* Performance function that works with an external buffer |
279 | note that x, bwidtht and stride are in 8-pixel units! */ | 279 | note that x, bwidtht and stride are in 8-pixel units! */ |
280 | void lcd_blit(const unsigned char* data, int bx, int y, int bwidth, | 280 | void lcd_blit_mono(const unsigned char *data, int bx, int y, int bwidth, |
281 | int height, int stride) | 281 | int height, int stride) |
282 | { | 282 | { |
283 | while (height--) | 283 | while (height--) |
284 | { | 284 | { |
@@ -295,7 +295,7 @@ void lcd_grey_data(unsigned char *values, unsigned char *phases, int count); | |||
295 | 295 | ||
296 | /* Performance function that works with an external buffer | 296 | /* Performance function that works with an external buffer |
297 | note that bx and bwidth are in 8-pixel units! */ | 297 | note that bx and bwidth are in 8-pixel units! */ |
298 | void lcd_grey_phase_blit(unsigned char *values, unsigned char *phases, | 298 | void lcd_blit_grey_phase(unsigned char *values, unsigned char *phases, |
299 | int bx, int y, int bwidth, int height, int stride) | 299 | int bx, int y, int bwidth, int height, int stride) |
300 | { | 300 | { |
301 | while (height--) | 301 | while (height--) |
diff --git a/firmware/target/arm/ipod/video/lcd-video.c b/firmware/target/arm/ipod/video/lcd-video.c index 0829114289..d0c82e905c 100644 --- a/firmware/target/arm/ipod/video/lcd-video.c +++ b/firmware/target/arm/ipod/video/lcd-video.c | |||
@@ -247,20 +247,6 @@ void lcd_init_device(void) | |||
247 | 247 | ||
248 | /*** update functions ***/ | 248 | /*** update functions ***/ |
249 | 249 | ||
250 | /* Performance function that works with an external buffer | ||
251 | note that by and bheight are in 4-pixel units! */ | ||
252 | void lcd_blit(const fb_data* data, int x, int by, int width, | ||
253 | int bheight, int stride) | ||
254 | { | ||
255 | /* TODO: Implement lcd_blit() */ | ||
256 | (void)data; | ||
257 | (void)x; | ||
258 | (void)by; | ||
259 | (void)width; | ||
260 | (void)bheight; | ||
261 | (void)stride; | ||
262 | } | ||
263 | |||
264 | /* Update a fraction of the display. */ | 250 | /* Update a fraction of the display. */ |
265 | void lcd_update_rect(int x, int y, int width, int height) | 251 | void lcd_update_rect(int x, int y, int width, int height) |
266 | { | 252 | { |
@@ -319,7 +305,7 @@ extern void lcd_write_yuv420_lines(unsigned char const * const src[3], | |||
319 | int stride); | 305 | int stride); |
320 | 306 | ||
321 | /* Performance function to blit a YUV bitmap directly to the LCD */ | 307 | /* Performance function to blit a YUV bitmap directly to the LCD */ |
322 | void lcd_yuv_blit(unsigned char * const src[3], | 308 | void lcd_blit_yuv(unsigned char * const src[3], |
323 | int src_x, int src_y, int stride, | 309 | int src_x, int src_y, int stride, |
324 | int x, int y, int width, int height) | 310 | int x, int y, int width, int height) |
325 | { | 311 | { |