Changes in uspace/srv/hid/fb/port/kfb.c [7c014d1:aaa77ba0] in mainline

File:

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

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

@@ -409 +409 @@
         charfield_t *field = screenbuffer_field_at(vp->backbuf, col, row);
         
-        pixel_t bgcolor;
-        pixel_t fgcolor;
+        pixel_t bgcolor = 0;
+        pixel_t fgcolor = 0;
         attrs_rgb(field->attrs, &bgcolor, &fgcolor);
         
@@ -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;
 }
@@ -517 +525 @@
         }
         
-        pixel_t bgcolor;
-        pixel_t fgcolor;
+        pixel_t bgcolor = 0;
+        pixel_t fgcolor = 0;
         attrs_rgb(vp->attrs, &bgcolor, &fgcolor);
         
@@ -748 +756 @@
         
         kfb.size = scanline * height;
-        kfb.addr = as_get_mappable_page(kfb.size);
-        if (kfb.addr == NULL) {
-                free(kfb.glyphs);
-                return ENOMEM;
-        }
-        
-        rc = physmem_map((void *) paddr + offset, kfb.addr,
-            ALIGN_UP(kfb.size, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
+        
+        rc = physmem_map((void *) paddr + offset,
+            ALIGN_UP(kfb.size, PAGE_SIZE) >> PAGE_WIDTH,
+            AS_AREA_READ | AS_AREA_WRITE, (void *) &kfb.addr);
         if (rc != EOK) {
                 free(kfb.glyphs);