Changeset c0757e1f in mainline for uspace/lib/dispcfg/src

Timestamp:

2023-04-19T11:13:06Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

37087c8

Parents:

ec8ef12

Message:

UI display configuration utility

In addition to the command-line utility 'disp', we introduce its UI
equivalent 'display-cfg'. Currently this allows the user to configure
seats in a very comfortable way.

Location:

uspace/lib/dispcfg/src

Files:

• dispcfg.c (modified) (3 diffs)
• dispcfg_srv.c (modified) (2 diffs)

uspace/lib/dispcfg/src/dispcfg.c

@@ -206 +206 @@
 /** Free seat list.
  *
- * @param list Display configuration list
+ * @param list Seat list
  */
 void dispcfg_free_seat_list(dispcfg_seat_list_t *list)
@@ -277 +277 @@
 /** Free seat information.
  *
- * @param info Display configuration information
+ * @param info Seat information
  */
 void dispcfg_free_seat_info(dispcfg_seat_info_t *info)
@@ -378 +378 @@
         async_exchange_end(exch);
         return rc;
+}
+
+/** Get list of devices assigned to a seat.
+ *
+ * @param dispcfg Display configuration
+ * @param seat_id Seat ID
+ * @param rlist Place to store pointer to new device list structure
+ * @return EOK on success or an error code
+ */
+errno_t dispcfg_get_asgn_dev_list(dispcfg_t *dispcfg, sysarg_t seat_id,
+    dispcfg_dev_list_t **rlist)
+{
+        async_exch_t *exch;
+        aid_t req;
+        ipc_call_t answer;
+        dispcfg_dev_list_t *list;
+        sysarg_t ndevs;
+        sysarg_t *devs;
+        errno_t rc;
+
+        exch = async_exchange_begin(dispcfg->sess);
+        req = async_send_1(exch, DISPCFG_GET_ASGN_DEV_LIST, seat_id, &answer);
+
+        /* Receive device list length */
+        rc = async_data_read_start(exch, &ndevs, sizeof (ndevs));
+        if (rc != EOK) {
+                async_exchange_end(exch);
+                async_wait_for(req, &rc);
+                return rc;
+        }
+
+        devs = calloc(ndevs, sizeof(sysarg_t));
+        if (devs == NULL) {
+                async_exchange_end(exch);
+                async_forget(req);
+                return ENOMEM;
+        }
+
+        /* Receive device list */
+        rc = async_data_read_start(exch, devs, ndevs * sizeof (sysarg_t));
+        async_exchange_end(exch);
+
+        if (rc != EOK) {
+                async_forget(req);
+                return rc;
+        }
+
+        async_wait_for(req, &rc);
+        if (rc != EOK)
+                return rc;
+
+        list = calloc(1, sizeof(dispcfg_dev_list_t));
+        if (list == NULL)
+                return ENOMEM;
+
+        list->ndevs = ndevs;
+        list->devs = devs;
+        *rlist = list;
+        return EOK;
+}
+
+/** Free device list.
+ *
+ * @param list Device list
+ */
+void dispcfg_free_dev_list(dispcfg_dev_list_t *list)
+{
+        free(list->devs);
+        free(list);
 }
 

uspace/lib/dispcfg/src/dispcfg_srv.c

@@ -293 +293 @@
 }
 
+static void dispcfg_get_asgn_dev_list_srv(dispcfg_srv_t *srv, ipc_call_t *icall)
+{
+        sysarg_t seat_id;
+        ipc_call_t call;
+        dispcfg_dev_list_t *list = NULL;
+        size_t size;
+        errno_t rc;
+
+        seat_id = ipc_get_arg1(icall);
+
+        if (srv->ops->get_asgn_dev_list == NULL) {
+                async_answer_0(icall, ENOTSUP);
+                return;
+        }
+
+        rc = srv->ops->get_asgn_dev_list(srv->arg, seat_id, &list);
+        if (rc != EOK) {
+                async_answer_0(icall, rc);
+                return;
+        }
+
+        /* Send list size */
+
+        if (!async_data_read_receive(&call, &size)) {
+                dispcfg_free_dev_list(list);
+                async_answer_0(&call, EREFUSED);
+                async_answer_0(icall, EREFUSED);
+                return;
+        }
+
+        if (size != sizeof(list->ndevs)) {
+                dispcfg_free_dev_list(list);
+                async_answer_0(&call, EINVAL);
+                async_answer_0(icall, EINVAL);
+                return;
+        }
+
+        rc = async_data_read_finalize(&call, &list->ndevs, size);
+        if (rc != EOK) {
+                dispcfg_free_dev_list(list);
+                async_answer_0(&call, rc);
+                async_answer_0(icall, rc);
+                return;
+        }
+
+        /* Send device list */
+
+        if (!async_data_read_receive(&call, &size)) {
+                dispcfg_free_dev_list(list);
+                async_answer_0(&call, EREFUSED);
+                async_answer_0(icall, EREFUSED);
+                return;
+        }
+
+        if (size != list->ndevs * sizeof(sysarg_t)) {
+                dispcfg_free_dev_list(list);
+                async_answer_0(&call, EINVAL);
+                async_answer_0(icall, EINVAL);
+                return;
+        }
+
+        rc = async_data_read_finalize(&call, list->devs, size);
+        if (rc != EOK) {
+                dispcfg_free_dev_list(list);
+                async_answer_0(&call, rc);
+                async_answer_0(icall, rc);
+                return;
+        }
+
+        async_answer_0(icall, EOK);
+        dispcfg_free_dev_list(list);
+}
+
 static void dispcfg_get_event_srv(dispcfg_srv_t *srv, ipc_call_t *icall)
 {
@@ -372 +445 @@
                 case DISPCFG_DEV_UNASSIGN:
                         dispcfg_dev_unassign_srv(srv, &call);
+                        break;
+                case DISPCFG_GET_ASGN_DEV_LIST:
+                        dispcfg_get_asgn_dev_list_srv(srv, &call);
                         break;
                 case DISPCFG_GET_EVENT: