Changeset f1d6866 in mainline for uspace/srv/hid/fb/port/kfb.c

Timestamp:

2011-09-18T21:22:59Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

dcc44ca1

Parents:

85ff862 (diff), 45a9cf4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/srv/hid/fb/port/kfb.c (modified) (2 diffs)

uspace/srv/hid/fb/port/kfb.c

@@ -422 +422 @@
 {
         if (kfb.backbuf == NULL) {
-                kfb.backbuf = malloc(kfb.size);
+                kfb.backbuf =
+                    malloc(kfb.width * kfb.height * kfb.pixel_bytes);
                 if (kfb.backbuf == NULL)
                         return ENOMEM;
         }
         
-        memcpy(kfb.backbuf, kfb.addr, kfb.size);
+        for (sysarg_t y = 0; y < kfb.height; y++)
+                memcpy(kfb.backbuf + y * kfb.width * kfb.pixel_bytes,
+                    kfb.addr + FB_POS(0, y), kfb.width * kfb.pixel_bytes);
+        
         return EOK;
 }
@@ -436 +440 @@
                 return ENOENT;
         
-        memcpy(kfb.addr, kfb.backbuf, kfb.size);
+        for (sysarg_t y = 0; y < kfb.height; y++)
+                memcpy(kfb.addr + FB_POS(0, y),
+                    kfb.backbuf + y * kfb.width * kfb.pixel_bytes,
+                    kfb.width * kfb.pixel_bytes);
+        
         return EOK;
 }