Changeset b3eeae5 in mainline for uspace/srv

Timestamp:

2023-01-15T09:24:50Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

46a47c0

Parents:

46b02cb

Message:

Assigning devices to seats

Location:

uspace/srv/hid/display

Files:

• cfgops.c (modified) (4 diffs)
• display.c (modified) (4 diffs)
• display.h (modified) (2 diffs)
• idevcfg.c (added)
• idevcfg.h (added)
• meson.build (modified) (2 diffs)
• test/display.c (modified) (2 diffs)
• types/display/display.h (modified) (1 diff)
• types/display/idevcfg.h (added)

uspace/srv/hid/display/cfgops.c

@@ -40 +40 @@
 #include <dispcfg_srv.h>
 #include "display.h"
+#include "idevcfg.h"
 #include "seat.h"
 #include "cfgclient.h"
@@ -47 +48 @@
 static errno_t dispc_seat_create(void *, const char *, sysarg_t *);
 static errno_t dispc_seat_delete(void *, sysarg_t);
+static errno_t dispc_dev_assign(void *, sysarg_t, sysarg_t);
+static errno_t dispc_dev_unassign(void *, sysarg_t);
 static errno_t dispc_get_event(void *, dispcfg_ev_t *);
 
@@ -54 +57 @@
         .seat_create = dispc_seat_create,
         .seat_delete = dispc_seat_delete,
+        .dev_assign = dispc_dev_assign,
+        .dev_unassign = dispc_dev_unassign,
         .get_event = dispc_get_event,
 };
@@ -207 +212 @@
 }
 
+/** Assign device to seat.
+ *
+ * @param arg Argument (CFG client)
+ * @param svc_id Device service ID
+ * @param seat_id Seat ID
+ * @return EOK on success or an error code
+ */
+static errno_t dispc_dev_assign(void *arg, sysarg_t svc_id, sysarg_t seat_id)
+{
+        ds_cfgclient_t *cfgclient = (ds_cfgclient_t *)arg;
+        ds_seat_t *seat;
+        ds_idevcfg_t *idevcfg;
+        errno_t rc;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "dispcfg_dev_assign()");
+
+        ds_display_lock(cfgclient->display);
+        seat = ds_display_find_seat(cfgclient->display, seat_id);
+        if (seat == NULL) {
+                ds_display_unlock(cfgclient->display);
+                return ENOENT;
+        }
+
+        rc = ds_idevcfg_create(cfgclient->display, svc_id, seat, &idevcfg);
+        if (rc != EOK) {
+                assert(rc == ENOMEM);
+                ds_display_unlock(cfgclient->display);
+                return ENOMEM;
+        }
+
+        (void)idevcfg;
+
+        ds_display_unlock(cfgclient->display);
+        return EOK;
+}
+
+/** Unassign device from any seat.
+ *
+ * @param arg Argument (CFG client)
+ * @param svc_id Device service ID
+ * @return EOK on success or an error code
+ */
+static errno_t dispc_dev_unassign(void *arg, sysarg_t svc_id)
+{
+        ds_cfgclient_t *cfgclient = (ds_cfgclient_t *)arg;
+        ds_idevcfg_t *idevcfg;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "dispcfg_dev_unassign()");
+
+        ds_display_lock(cfgclient->display);
+
+        idevcfg = ds_display_first_idevcfg(cfgclient->display);
+        while (idevcfg != NULL) {
+                if (idevcfg->svc_id == svc_id)
+                        break;
+
+                idevcfg = ds_display_next_idevcfg(idevcfg);
+        }
+
+        if (idevcfg == NULL) {
+                ds_display_unlock(cfgclient->display);
+                return ENOENT;
+        }
+
+        ds_idevcfg_destroy(idevcfg);
+        ds_display_unlock(cfgclient->display);
+        return EOK;
+}
+
 /** Get display configuration event.
  *

uspace/srv/hid/display/display.c

@@ -101 +101 @@
         disp->next_wnd_id = 1;
         list_initialize(&disp->ddevs);
+        list_initialize(&disp->idevcfgs);
         list_initialize(&disp->seats);
         list_initialize(&disp->windows);
@@ -124 +125 @@
         assert(list_empty(&disp->seats));
         assert(list_empty(&disp->ddevs));
+        assert(list_empty(&disp->idevcfgs));
         assert(list_empty(&disp->seats));
         assert(list_empty(&disp->windows));
@@ -623 +625 @@
 ds_seat_t *ds_display_seat_by_idev(ds_display_t *disp, ds_idev_id_t idev_id)
 {
-        // TODO Multi-seat
-        (void) idev_id;
-
+        ds_idevcfg_t *idevcfg;
+
+        /*
+         * Find input device configuration entry that maps this input device
+         * to a seat.
+         */
+        idevcfg = ds_display_first_idevcfg(disp);
+        while (idevcfg != NULL) {
+                if (idevcfg->svc_id == idev_id)
+                        return idevcfg->seat;
+
+                idevcfg = ds_display_next_idevcfg(idevcfg);
+        }
+
+        /* If none was found, return the default seat */
         return ds_display_first_seat(disp);
 }
@@ -772 +786 @@
 
         return list_get_instance(link, ds_ddev_t, lddevs);
+}
+
+/** Add input device configuration entry to display.
+ *
+ * @param disp Display
+ * @param idevcfg Input device configuration
+ */
+void ds_display_add_idevcfg(ds_display_t *disp, ds_idevcfg_t *idevcfg)
+{
+        assert(idevcfg->display == NULL);
+        assert(!link_used(&idevcfg->lidevcfgs));
+
+        idevcfg->display = disp;
+        list_append(&idevcfg->lidevcfgs, &disp->idevcfgs);
+}
+
+/** Remove input device configuration entry from display.
+ *
+ * @param idevcfg Input device configuration entry
+ */
+void ds_display_remove_idevcfg(ds_idevcfg_t *idevcfg)
+{
+        list_remove(&idevcfg->lidevcfgs);
+        idevcfg->display = NULL;
+}
+
+/** Get first input device configuration entry in display.
+ *
+ * @param disp Display
+ * @return First input device configuration entry or @c NULL if there is none
+ */
+ds_idevcfg_t *ds_display_first_idevcfg(ds_display_t *disp)
+{
+        link_t *link = list_first(&disp->idevcfgs);
+
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, ds_idevcfg_t, lidevcfgs);
+}
+
+/** Get next input device configuration entry in display.
+ *
+ * @param idevcfg Current input device configuration entry
+ * @return Next input device configuration entry or @c NULL if there is none
+ */
+ds_idevcfg_t *ds_display_next_idevcfg(ds_idevcfg_t *idevcfg)
+{
+        link_t *link = list_next(&idevcfg->lidevcfgs, &idevcfg->display->idevcfgs);
+
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, ds_idevcfg_t, lidevcfgs);
 }
 

uspace/srv/hid/display/display.h

@@ -48 +48 @@
 #include "types/display/display.h"
 #include "types/display/idev.h"
+#include "types/display/idevcfg.h"
 #include "types/display/ptd_event.h"
 #include "types/display/seat.h"
@@ -90 +91 @@
 extern ds_ddev_t *ds_display_first_ddev(ds_display_t *);
 extern ds_ddev_t *ds_display_next_ddev(ds_ddev_t *);
+extern void ds_display_add_idevcfg(ds_display_t *, ds_idevcfg_t *);
+extern void ds_display_remove_idevcfg(ds_idevcfg_t *);
+extern ds_idevcfg_t *ds_display_first_idevcfg(ds_display_t *);
+extern ds_idevcfg_t *ds_display_next_idevcfg(ds_idevcfg_t *);
 extern void ds_display_add_cursor(ds_display_t *, ds_cursor_t *);
 extern void ds_display_remove_cursor(ds_cursor_t *);

uspace/srv/hid/display/meson.build

@@ -39 +39 @@
         'display.c',
         'dsops.c',
+        'idevcfg.c',
         'input.c',
         'main.c',
@@ -56 +57 @@
         'ddev.c',
         'display.c',
+        'idevcfg.c',
         'seat.c',
         'window.c',

uspace/srv/hid/display/test/display.c

@@ -35 +35 @@
 #include "../client.h"
 #include "../display.h"
+#include "../idevcfg.h"
 #include "../seat.h"
 #include "../window.h"
@@ -397 +398 @@
 }
 
+/** Basic idevcfg operation */
+PCUT_TEST(display_idevcfg)
+{
+        ds_display_t *disp;
+        ds_seat_t *seat;
+        ds_idevcfg_t *idevcfg;
+        errno_t rc;
+
+        rc = ds_display_create(NULL, df_none, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_seat_create(disp, "Alice", &seat);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_idevcfg_create(disp, 42, seat, &idevcfg);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ds_idevcfg_destroy(idevcfg);
+
+        ds_seat_destroy(seat);
+        ds_display_destroy(disp);
+}
+
 /** Basic seat operation. */
 PCUT_TEST(display_seat)

uspace/srv/hid/display/types/display/display.h

@@ -90 +90 @@
         list_t ddevs;
 
+        /** Input device configuration entries (of ds_idevcfg_t) */
+        list_t idevcfgs;
+
         /** Background color */
         gfx_color_t *bg_color;