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

Timestamp:

2024-10-13T08:23:40Z (8 weeks ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

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

uspace/srv/hid/display/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -62 +62 @@
 #include "wmops.h"
 
+const char *cfg_file_path = "/w/cfg/display.sif";
+
 static void display_client_conn(ipc_call_t *, void *);
 static void display_client_ev_pending(void *);
@@ -137 +139 @@
                 goto error;
 
-        rc = ds_seat_create(disp, "Alice", &seat);
-        if (rc != EOK)
-                goto error;
+        rc = ds_display_load_cfg(disp, cfg_file_path);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_NOTE,
+                    "Starting with fresh configuration.");
+
+                /* Create first seat */
+                rc = ds_seat_create(disp, "Alice", &seat);
+                if (rc != EOK)
+                        goto error;
+        }
 
         rc = ds_output_create(&output);