Changeset d8503fd in mainline for uspace/srv/hid/display/main.c

Timestamp:

2023-01-09T21:14:04Z (16 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

46b02cb

Parents:

e04b72d6

Message:

Display configuration utility and server support

Currently we can only create, list and delete seats using the
'disp' utility (but no way to assign devices).

File:

• uspace/srv/hid/display/main.c (modified) (11 diffs)

uspace/srv/hid/display/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -36 +36 @@
 #include <async.h>
 #include <disp_srv.h>
+#include <dispcfg_srv.h>
 #include <errno.h>
 #include <gfx/context.h>
@@ -48 +49 @@
 #include <task.h>
 #include <wndmgt_srv.h>
+#include "cfgclient.h"
+#include "cfgops.h"
 #include "client.h"
 #include "display.h"
@@ -62 +65 @@
 static void display_client_ev_pending(void *);
 static void display_wmclient_ev_pending(void *);
+static void display_cfgclient_ev_pending(void *);
 static void display_gc_conn(ipc_call_t *, void *);
 static void display_wndmgt_conn(ipc_call_t *, void *);
+static void display_dispcfg_conn(ipc_call_t *, void *);
 
 #ifdef CONFIG_DISP_DOUBLE_BUF
@@ -86 +91 @@
 };
 
+static ds_cfgclient_cb_t display_cfgclient_cb = {
+        .ev_pending = display_cfgclient_ev_pending
+};
+
 static void display_client_ev_pending(void *arg)
 {
@@ -98 +107 @@
 
         wndmgt_srv_ev_pending(srv);
+}
+
+static void display_cfgclient_ev_pending(void *arg)
+{
+        dispcfg_srv_t *srv = (dispcfg_srv_t *) arg;
+
+        dispcfg_srv_ev_pending(srv);
 }
 
@@ -110 +126 @@
         port_id_t gc_port;
         port_id_t wm_port;
+        port_id_t dc_port;
         errno_t rc;
 
@@ -118 +135 @@
                 goto error;
 
-        rc = ds_seat_create(disp, &seat);
+        rc = ds_seat_create(disp, "Alice", &seat);
         if (rc != EOK)
                 goto error;
@@ -146 +163 @@
         rc = async_create_port(INTERFACE_WNDMGT, display_wndmgt_conn, disp,
             &wm_port);
+        if (rc != EOK)
+                goto error;
+
+        rc = async_create_port(INTERFACE_DISPCFG, display_dispcfg_conn, disp,
+            &dc_port);
         if (rc != EOK)
                 goto error;
@@ -170 +192 @@
         // XXX destroy gc_port
         // XXX destroy wm_port
+        // XXX destroy dc_port
 #if 0
         if (disp->input != NULL)
@@ -284 +307 @@
 }
 
+/** Handle configuration connection to display server */
+static void display_dispcfg_conn(ipc_call_t *icall, void *arg)
+{
+        ds_display_t *disp = (ds_display_t *) arg;
+        errno_t rc;
+        dispcfg_srv_t srv;
+        ds_cfgclient_t *cfgclient = NULL;
+
+        /* Create CFG client object */
+        ds_display_lock(disp);
+        rc = ds_cfgclient_create(disp, &display_cfgclient_cb, &srv, &cfgclient);
+        ds_display_unlock(disp);
+        if (rc != EOK) {
+                async_answer_0(icall, ENOMEM);
+                return;
+        }
+
+        /* Set up protocol structure */
+        dispcfg_srv_initialize(&srv);
+        srv.ops = &dispcfg_srv_ops;
+        srv.arg = cfgclient;
+
+        /* Handle connection */
+        dispcfg_conn(icall, &srv);
+
+        ds_display_lock(disp);
+        ds_cfgclient_destroy(cfgclient);
+        ds_display_unlock(disp);
+}
+
 int main(int argc, char *argv[])
 {