Changeset 8630748 in mainline

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

Location:

uspace

Files:

• drv/fb/kfb/port.c (modified) (2 diffs)
• srv/hid/display/main.c (modified) (1 diff)
• srv/hid/display/output.c (modified) (1 diff)

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;
         }
 

uspace/srv/hid/display/main.c

@@ -121 +121 @@
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server: %s.", str_error(rc));
                 rc = EEXIST;
+                goto error;
         }
 

uspace/srv/hid/display/output.c

@@ -163 +163 @@
         fibril_mutex_unlock(&output->lock);
 
+        /* Fail if we did not open at least one device */
+        if (list_empty(&output->ddevs)) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "No output device found.");
+                return ENOENT;
+        }
+
         return rc;
 }