Added memmove() to codec API & plugin API, and changed codeclib and plugin libs to use it.

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

2 files changed, 14 insertions, 59 deletions

diff --git a/apps/plugins/lib/gray_scroll.c b/apps/plugins/lib/gray_scroll.c
index 341024a67e..89ca2f37c3 100644
--- a/apps/plugins/lib/gray_scroll.c
+++ b/apps/plugins/lib/gray_scroll.c
@@ -29,29 +29,6 @@
 #ifdef HAVE_LCD_BITMAP /* and also not for the Player */
 #include "gray.h"
 
-/* FIXME: intermediate solution until we have properly optimised memmove() */
-static void *my_memmove(void *dst0, const void *src0, size_t len0)
-{
-    char *dst = (char *) dst0;
-    char *src = (char *) src0;
-    
-    if (dst <= src)
-    {
-        while (len0--)
-            *dst++ = *src++;
-    }
-    else
-    {
-        dst += len0;
-        src += len0;
-        
-        while (len0--)
-            *(--dst) = *(--src);
-    }
-
-    return dst0;
-}
-
 /*** Scrolling ***/
 
 /* Scroll left */
@@ -68,7 +45,7 @@ void gray_scroll_left(int count)
     blank = (_gray_info.drawmode & DRMODE_INVERSEVID) ?
             _gray_info.fg_brightness : _gray_info.bg_brightness;
 
-    my_memmove(_gray_info.cur_buffer, _gray_info.cur_buffer + shift, length);
+    _gray_rb->memmove(_gray_info.cur_buffer, _gray_info.cur_buffer + shift, length);
     _gray_rb->memset(_gray_info.cur_buffer + length, blank, shift);
 }
 
@@ -86,7 +63,7 @@ void gray_scroll_right(int count)
     blank = (_gray_info.drawmode & DRMODE_INVERSEVID) ?
             _gray_info.fg_brightness : _gray_info.bg_brightness;
 
-    my_memmove(_gray_info.cur_buffer + shift, _gray_info.cur_buffer, length);
+    _gray_rb->memmove(_gray_info.cur_buffer + shift, _gray_info.cur_buffer, length);
     _gray_rb->memset(_gray_info.cur_buffer, blank, shift);
 }
 
@@ -107,7 +84,7 @@ void gray_scroll_up(int count)
 
     do
     {
-        my_memmove(data, data + count, length);
+        _gray_rb->memmove(data, data + count, length);
         _gray_rb->memset(data + length, blank, count);
         data += _gray_info.height;
     }
@@ -131,7 +108,7 @@ void gray_scroll_down(int count)
 
     do
     {
-        my_memmove(data + count, data, length);
+        _gray_rb->memmove(data + count, data, length);
         _gray_rb->memset(data, blank, count);
         data += _gray_info.height;
     }
@@ -161,7 +138,7 @@ void gray_ub_scroll_left(int count)
                                + MULU16(_gray_info.plane_size, _gray_info.depth);
         do
         {
-            my_memmove(ptr_row, ptr_row + count, length);
+            _gray_rb->memmove(ptr_row, ptr_row + count, length);
             _gray_rb->memset(ptr_row + length, 0, count);
             ptr_row += _gray_info.plane_size;
         }
@@ -193,7 +170,7 @@ void gray_ub_scroll_right(int count)
                                + MULU16(_gray_info.plane_size, _gray_info.depth);
         do
         {
-            my_memmove(ptr_row + count, ptr_row, length);
+            _gray_rb->memmove(ptr_row + count, ptr_row, length);
             _gray_rb->memset(ptr_row, 0, count);
             ptr_row += _gray_info.plane_size;
         }
diff --git a/apps/plugins/lib/xlcd.c b/apps/plugins/lib/xlcd.c
index 33d807f2f3..a842cf5eb7 100644
--- a/apps/plugins/lib/xlcd.c
+++ b/apps/plugins/lib/xlcd.c
@@ -106,28 +106,6 @@ void xlcd_filltriangle(int x1, int y1, int x2, int y2, int x3, int y3)
 }
 
 #if LCD_DEPTH >= 8
-/* FIXME: intermediate solution until we have properly optimised memmove() */
-static void *my_memmove(void *dst0, const void *src0, size_t len0)
-{
-    char *dst = (char *) dst0;
-    char *src = (char *) src0;
-    
-    if (dst <= src)
-    {
-        while (len0--)
-            *dst++ = *src++;
-    }
-    else
-    {
-        dst += len0;
-        src += len0;
-        
-        while (len0--)
-            *(--dst) = *(--src);
-    }
-
-    return dst0;
-}
 
 void xlcd_scroll_left(int count)
 {
@@ -143,7 +121,7 @@ void xlcd_scroll_left(int count)
 
     do
     {
-        my_memmove(data, data + count, length * sizeof(fb_data));
+        local_rb->memmove(data, data + count, length * sizeof(fb_data));
         data += LCD_WIDTH;
     }
     while (data < data_end);
@@ -168,7 +146,7 @@ void xlcd_scroll_right(int count)
 
     do
     {
-        my_memmove(data + count, data, length * sizeof(fb_data));
+        local_rb->memmove(data + count, data, length * sizeof(fb_data));
         data += LCD_WIDTH;
     }
     while (data < data_end);
@@ -188,9 +166,9 @@ void xlcd_scroll_up(int count)
 
     length = LCD_HEIGHT - count;
 
-    my_memmove(local_rb->lcd_framebuffer,
-               local_rb->lcd_framebuffer + count * LCD_WIDTH,
-               length * LCD_WIDTH * sizeof(fb_data));
+    local_rb->memmove(local_rb->lcd_framebuffer,
+                      local_rb->lcd_framebuffer + count * LCD_WIDTH,
+                      length * LCD_WIDTH * sizeof(fb_data));
 
     oldmode = local_rb->lcd_get_drawmode();
     local_rb->lcd_set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID);
@@ -207,9 +185,9 @@ void xlcd_scroll_down(int count)
 
     length = LCD_HEIGHT - count;
 
-    my_memmove(local_rb->lcd_framebuffer + count * LCD_WIDTH,
-               local_rb->lcd_framebuffer,
-               length * LCD_WIDTH * sizeof(fb_data));
+    local_rb->memmove(local_rb->lcd_framebuffer + count * LCD_WIDTH,
+                      local_rb->lcd_framebuffer,
+                      length * LCD_WIDTH * sizeof(fb_data));
 
     oldmode = local_rb->lcd_get_drawmode();
     local_rb->lcd_set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID);