Changeset 0b63dc2 in mainline for uspace/app/init/init.c

Timestamp:

2019-12-07T20:26:28Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

df1a019

Parents:

71cbe5c

Message:

Switch compositor → display server

Convert KFB from visualizer to display device interface. Add ability
of display device implementor to provide client with arg2, arg3 needed
to connect to GC.

File:

• uspace/app/init/init.c (modified) (5 diffs)

uspace/app/init/init.c

@@ -34 +34 @@
  */
 
+#include <fibril.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -47 +48 @@
 #include <config.h>
 #include <io/logctl.h>
+#include <vfs/vfs.h>
 #include <vol.h>
 #include "untar.h"
@@ -63 +65 @@
 #define APP_GETTERM  "/app/getterm"
 
-#define SRV_COMPOSITOR  "/srv/hid/compositor"
+#define SRV_DISPLAY  "/srv/hid/display"
 
 #define HID_INPUT              "hid/input"
@@ -254 +256 @@
 }
 
-static errno_t compositor(const char *isvc, const char *name)
-{
-        /* Wait for the input service to be ready */
-        service_id_t service_id;
-        errno_t rc = loc_service_get_id(isvc, &service_id, IPC_FLAG_BLOCKING);
-        if (rc != EOK) {
-                printf("%s: Error waiting on %s (%s)\n", NAME, isvc,
-                    str_error(rc));
-                return rc;
-        }
-
-        return srv_start(SRV_COMPOSITOR, isvc, name);
-}
-
-static int gui_start(const char *app, const char *srv_name)
-{
-        char winreg[50];
-        snprintf(winreg, sizeof(winreg), "%s%s%s", "comp", srv_name, "/winreg");
-
-        printf("%s: Spawning %s %s\n", NAME, app, winreg);
+static errno_t display_server(void)
+{
+        return srv_start(SRV_DISPLAY);
+}
+
+static int gui_start(const char *app)
+{
+        printf("%s: Spawning %s\n", NAME, app);
 
         task_id_t id;
         task_wait_t wait;
-        errno_t rc = task_spawnl(&id, &wait, app, app, winreg, NULL);
-        if (rc != EOK) {
-                printf("%s: Error spawning %s %s (%s)\n", NAME, app,
-                    winreg, str_error(rc));
+        errno_t rc = task_spawnl(&id, &wait, app, app, NULL);
+        if (rc != EOK) {
+                printf("%s: Error spawning %s (%s)\n", NAME, app,
+                    str_error(rc));
                 return -1;
         }
@@ -458 +448 @@
 
         if (!config_key_exists("console")) {
-                rc = compositor(HID_INPUT, HID_COMPOSITOR_SERVER);
+                rc = display_server();
                 if (rc == EOK) {
-                        gui_start("/app/barber", HID_COMPOSITOR_SERVER);
-                        gui_start("/app/vlaunch", HID_COMPOSITOR_SERVER);
-                        gui_start("/app/vterm", HID_COMPOSITOR_SERVER);
+                        fibril_sleep(1);
+                        gui_start("/app/gfxdemo");
                 }
         }