Changeset 8b74af07 in mainline

Timestamp:

2008-12-28T13:03:04Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

04b687b

Parents:

018e1e3

Message:

Two more cases of memmove() vs memcpy().

Files:

• kernel/arch/ia64/src/drivers/ega.c (modified) (1 diff)
• uspace/srv/fb/ega.c (modified) (2 diffs)

kernel/arch/ia64/src/drivers/ega.c

@@ -117 +117 @@
                 return;
 
-        memcpy((void *) videoram, (void *) (videoram + ROW * 2), (SCREEN - ROW) * 2);
+        memmove((void *) videoram, (void *) (videoram + ROW * 2), (SCREEN - ROW) * 2);
         _memsetw(videoram + (SCREEN - ROW) * 2, ROW, 0x0720);
         ega_cursor = ega_cursor - ROW;

uspace/srv/fb/ega.c

@@ -128 +128 @@
         int i;
         if (rows > 0) {
-                memcpy(scr_addr, ((char *) scr_addr) + rows * scr_width * 2,
+                memmove(scr_addr, ((char *) scr_addr) + rows * scr_width * 2,
                     scr_width * scr_height * 2 - rows * scr_width * 2);
                 for (i = 0; i < rows * scr_width; i++)
@@ -134 +134 @@
                             scr_width)[i] = ((style << 8) + ' ');
         } else if (rows < 0) {
-                memcpy(((char *)scr_addr) - rows * scr_width * 2, scr_addr,
+                memmove(((char *)scr_addr) - rows * scr_width * 2, scr_addr,
                     scr_width * scr_height * 2 + rows * scr_width * 2);
                 for (i = 0; i < -rows * scr_width; i++)