Changeset 14cbf07 in mainline for uspace/app/display-cfg/display-cfg.c

Timestamp:

2023-05-15T16:19:52Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2b5628c, 8a4ceaa

Parents:

aace43d8

Message:

Fill in tests seats_list_populate and avail_devices_insert

File:

• uspace/app/display-cfg/display-cfg.c (modified) (4 diffs)

uspace/app/display-cfg/display-cfg.c

@@ -65 +65 @@
  *
  * @param display_spec Display specification
+ * @param dcfg_svc Display configuration service name or DISPCFG_DEFAULT
  * @param rdcfg Place to store pointer to new display configuration
  * @return EOK on success or an error code
@@ -82 +83 @@
                 printf("Out of memory.\n");
                 return ENOMEM;
-        }
-
-        rc = dispcfg_open(DISPCFG_DEFAULT, NULL, NULL, &dcfg->dispcfg);
-        if (rc != EOK) {
-                printf("Error opening display configuration service.\n");
-                goto error;
         }
 
@@ -150 +145 @@
         ui_window_add(window, ui_fixed_ctl(dcfg->fixed));
 
-        rc = ui_window_paint(window);
-        if (rc != EOK) {
-                printf("Error painting window.\n");
-                return rc;
-        }
-
         *rdcfg = dcfg;
         return EOK;
@@ -167 +156 @@
         if (dcfg->ui != NULL)
                 ui_destroy(ui);
+        free(dcfg);
+        return rc;
+}
+
+/** Open display configuration service.
+ *
+ * @param dcfg Display configuration dialog
+ * @param dcfg_svc Display configuration service name or DISPCFG_DEFAULT
+ * @return EOK on success or an error code
+ */
+errno_t display_cfg_open(display_cfg_t *dcfg, const char *dcfg_svc)
+{
+        errno_t rc;
+
+        rc = dispcfg_open(dcfg_svc, NULL, NULL, &dcfg->dispcfg);
+        if (rc != EOK) {
+                printf("Error opening display configuration service.\n");
+                goto error;
+        }
+
+        return EOK;
+error:
+        return rc;
+}
+
+/** Populate display configuration from isplay configuration service.
+ *
+ * @param dcfg Display configuration dialog
+ * @return EOK on success or an error code
+ */
+errno_t display_cfg_populate(display_cfg_t *dcfg)
+{
+        errno_t rc;
+
+        rc = dcfg_seats_populate(dcfg->seats);
+        if (rc != EOK)
+                return rc;
+
+        rc = ui_window_paint(dcfg->window);
+        if (rc != EOK) {
+                printf("Error painting window.\n");
+                return rc;
+        }
+
+        return EOK;
+}
+
+/** Destroy display configuration dialog.
+ *
+ * @param dcfg Display configuration dialog
+ */
+void display_cfg_destroy(display_cfg_t *dcfg)
+{
         if (dcfg->dispcfg != NULL)
                 dispcfg_close(dcfg->dispcfg);
-        free(dcfg);
-        return rc;
-}
-
-/** Destroy display configuration dialog.
- *
- * @param dcfg Display configuration dialog
- */
-void display_cfg_destroy(display_cfg_t *dcfg)
-{
         ui_window_destroy(dcfg->window);
         ui_destroy(dcfg->ui);