Changeset 8630748 in mainline for uspace/drv

Timestamp:

2020-06-24T22:43:00Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

78445be8

Parents:

62018a0

Message:

Handle attempt to launch second display server gracefully

File:

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

uspace/drv/fb/kfb/port.c

@@ -377 +377 @@
                 assert(gc_id == 42);
 
+                if (kfb->addr != AS_AREA_ANY) {
+                        /* This means there already is a GC connection */
+                        async_answer_0(icall, EBUSY);
+                        return;
+                }
+
                 rc = physmem_map(kfb->paddr + kfb->offset,
                     ALIGN_UP(kfb->size, PAGE_SIZE) >> PAGE_WIDTH,
@@ -392 +398 @@
                 rc = physmem_unmap(kfb->addr);
                 if (rc == EOK)
-                        kfb->addr = NULL;
+                        kfb->addr = AS_AREA_ANY;
         }
 
         return;
 error:
-        if (kfb->addr != NULL) {
+        if (kfb->addr != AS_AREA_ANY) {
                 if (physmem_unmap(kfb->addr) == EOK)
-                        kfb->addr = NULL;
+                        kfb->addr = AS_AREA_ANY;
         }