Consistent naming scheme the various blit functions. * Removed lcd_blit_mono() for colour targets. Plugin API became incompatible, so sort, clean up & bump. * Implemented lcd_blit_mono() for M3.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16775 a1c6a512-1295-4272-9138-f99709370657

5 files changed, 14 insertions, 13 deletions

diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c
index 7e6fda0..0f7e24b 100644
--- a/apps/plugins/chip8.c
+++ b/apps/plugins/chip8.c
@@ -1178,11 +1178,12 @@ static void chip8_update_display(void)
     }
 #if defined(SIMULATOR) || (LCD_DEPTH > 1)
     rb->lcd_set_drawmode(DRMODE_SOLID);
-    rb->lcd_mono_bitmap(lcd_framebuf[0], CHIP8_X, CHIP8_Y, CHIP8_LCDWIDTH, CHIP8_HEIGHT);
+    rb->lcd_mono_bitmap(lcd_framebuf[0], CHIP8_X, CHIP8_Y, CHIP8_LCDWIDTH,
+                        CHIP8_HEIGHT);
     rb->lcd_update();
 #else
-    rb->lcd_blit(lcd_framebuf[0], CHIP8_X, CHIP8_Y>>3, CHIP8_LCDWIDTH, CHIP8_HEIGHT>>3
-                 , CHIP8_LCDWIDTH);
+    rb->lcd_blit_mono(lcd_framebuf[0], CHIP8_X, CHIP8_Y>>3, CHIP8_LCDWIDTH,
+                      CHIP8_HEIGHT>>3, CHIP8_LCDWIDTH);
 #endif
 }
 
diff --git a/apps/plugins/lib/grey_core.c b/apps/plugins/lib/grey_core.c
index 80daf49..caa7af2 100644
--- a/apps/plugins/lib/grey_core.c
+++ b/apps/plugins/lib/grey_core.c
@@ -239,12 +239,12 @@ static unsigned long _grey_get_pixel(int x, int y)
 static void _timer_isr(void)
 {
 #if LCD_PIXELFORMAT == HORIZONTAL_PACKING
-    _grey_info.rb->lcd_grey_phase_blit(_grey_info.values, _grey_info.phases,
+    _grey_info.rb->lcd_blit_grey_phase(_grey_info.values, _grey_info.phases,
                                        _grey_info.bx, _grey_info.y,
                                        _grey_info.bwidth, _grey_info.height,
                                        _grey_info.width);
 #else
-    _grey_info.rb->lcd_grey_phase_blit(_grey_info.values, _grey_info.phases,
+    _grey_info.rb->lcd_blit_grey_phase(_grey_info.values, _grey_info.phases,
                                        _grey_info.x, _grey_info.by,
                                        _grey_info.width, _grey_info.bheight,
                                        _grey_info.width);
@@ -457,7 +457,7 @@ void grey_release(void)
    grey_deferred_update() instead.
 
  Other functions to avoid are:
-   lcd_blit() (obviously), lcd_update_rect(), lcd_set_contrast(),
+   lcd_blit_mono(), lcd_update_rect(), lcd_set_contrast(),
    lcd_set_invert_display(), lcd_set_flip() */
 void grey_show(bool enable)
 {
diff --git a/apps/plugins/mpegplayer/video_out_rockbox.c b/apps/plugins/mpegplayer/video_out_rockbox.c
index 86a18cd..c8245cc 100644
--- a/apps/plugins/mpegplayer/video_out_rockbox.c
+++ b/apps/plugins/mpegplayer/video_out_rockbox.c
@@ -104,7 +104,7 @@ static inline void yuv_blit(uint8_t * const * buf, int src_x, int src_y,
     video_lock();
 
 #ifdef HAVE_LCD_COLOR
-    rb->lcd_yuv_blit(buf, src_x, src_y, stride, x, y , width, height);
+    rb->lcd_blit_yuv(buf, src_x, src_y, stride, x, y , width, height);
 #else
     grey_ub_gray_bitmap_part(buf[0], src_x, src_y, stride, x, y, width, height);
 #endif
diff --git a/apps/plugins/test_fps.c b/apps/plugins/test_fps.c
index e8ceaed..7c86fab 100644
--- a/apps/plugins/test_fps.c
+++ b/apps/plugins/test_fps.c
@@ -192,7 +192,7 @@ static void time_main_yuv(void)
     time_start = *rb->current_tick;
     while((time_end = *rb->current_tick) - time_start < DURATION)
     {
-        rb->lcd_yuv_blit(yuvbuf, 0, 0, YUV_WIDTH,
+        rb->lcd_blit_yuv(yuvbuf, 0, 0, YUV_WIDTH,
                          0, 0, YUV_WIDTH, YUV_HEIGHT);
         frame_count++;
     }
@@ -208,7 +208,7 @@ static void time_main_yuv(void)
     time_start = *rb->current_tick;
     while((time_end = *rb->current_tick) - time_start < DURATION)
     {
-        rb->lcd_yuv_blit(yuvbuf, 0, 0, YUV_WIDTH,
+        rb->lcd_blit_yuv(yuvbuf, 0, 0, YUV_WIDTH,
                          part14_x, part14_y, part14_w, part14_h);
         frame_count++;
     }
@@ -260,7 +260,7 @@ static void time_remote_update(void)
 }
 #endif
 
-#if LCD_DEPTH < 4
+#if (LCD_DEPTH < 4) && !defined(IAUDIO_M3)
 
 GREY_INFO_STRUCT_IRAM
 static unsigned char greydata[LCD_HEIGHT][LCD_WIDTH];
@@ -357,7 +357,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
     log_text("Main LCD YUV");
     time_main_yuv();
 #endif
-#if LCD_DEPTH < 4
+#if (LCD_DEPTH < 4) && !defined(IAUDIO_M3)
     log_text("Greyscale library");
     time_greyscale();
 #endif
diff --git a/apps/plugins/video.c b/apps/plugins/video.c
index 2799e3d..fa1646d 100644
--- a/apps/plugins/video.c
+++ b/apps/plugins/video.c
@@ -361,13 +361,13 @@ void timer4_isr(void)
         height = MIN(LCD_HEIGHT/8-1, height); /* reserve bottom line */
         if (gPlay.bDirtyOSD)
         {   /* OSD to bottom line */
-            rb->lcd_blit(gBuf.pOSD, 0, LCD_HEIGHT/8-1, 
+            rb->lcd_blit_mono(gBuf.pOSD, 0, LCD_HEIGHT/8-1,
                 LCD_WIDTH, 1, LCD_WIDTH);
             gPlay.bDirtyOSD = false;
         }
     }
 
-    rb->lcd_blit(gBuf.pReadVideo, 0, 0, 
+    rb->lcd_blit_mono(gBuf.pReadVideo, 0, 0,
         gFileHdr.video_width, height, gFileHdr.video_width);
 
     available = Available(gBuf.pReadVideo);