Changeset b669092 in mainline

Timestamp:

2017-10-05T07:34:46Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f4665bdc

Parents:

fe8961d

Message:

Kfb should not map the frame buffer until it is claimed.

File:

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

uspace/drv/fb/kfb/port.c

@@ -66 +66 @@
 
 typedef struct {
+        sysarg_t paddr;
         sysarg_t width;
         sysarg_t height;
@@ -87 +88 @@
 static int kfb_claim(visualizer_t *vs)
 {
-        return EOK;
+        return physmem_map(kfb.paddr + kfb.offset,
+            ALIGN_UP(kfb.size, PAGE_SIZE) >> PAGE_WIDTH,
+            AS_AREA_READ | AS_AREA_WRITE, (void *) &kfb.addr);
 }
 
@@ -96 +99 @@
         }
 
-        return EOK;
+        return physmem_unmap(kfb.addr);
 }
 
@@ -210 +213 @@
         kfb.width = width;
         kfb.height = height;
+        kfb.paddr = paddr;
         kfb.offset = offset;
         kfb.scanline = scanline;
@@ -287 +291 @@
         kfb.size = scanline * height;
         kfb.addr = AS_AREA_ANY;
-        
-        rc = physmem_map(paddr + offset,
-            ALIGN_UP(kfb.size, PAGE_SIZE) >> PAGE_WIDTH,
-            AS_AREA_READ | AS_AREA_WRITE, (void *) &kfb.addr);
-        if (rc != EOK)
-                return rc;
         
         ddf_fun_t *fun_vs = ddf_fun_create(dev, fun_exposed, "vsl0");