Changeset dc5c303 in mainline for uspace/srv/hid/console/console.c

Timestamp:

2023-12-28T13:59:23Z (14 months ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (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@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

File:

• uspace/srv/hid/console/console.c (modified) (5 diffs)

uspace/srv/hid/console/console.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2011 Martin Decky
  * All rights reserved.
@@ -37 +37 @@
 #include <stdio.h>
 #include <adt/prodcons.h>
+#include <io/console.h>
 #include <io/input.h>
 #include <ipc/vfs.h>
@@ -88 +89 @@
         con_srvs_t srvs;         /**< Console service setup */
 } console_t;
+
+static loc_srv_t *console_srv;
 
 /** Input server proxy */
@@ -902 +905 @@
         /* Register server */
         async_set_fallback_port_handler(client_connection, NULL);
-        rc = loc_server_register(NAME);
+        rc = loc_server_register(NAME, &console_srv);
         if (rc != EOK) {
                 printf("%s: Unable to register server (%s)\n", NAME,
@@ -952 +955 @@
                         snprintf(vc, LOC_NAME_MAXLEN, "%s/vc%zu", NAMESPACE, i);
 
-                        if (loc_service_register(vc, &consoles[i].dsid) != EOK) {
+                        if (loc_service_register(console_srv, vc,
+                            &consoles[i].dsid) != EOK) {
                                 printf("%s: Unable to register device %s\n", NAME, vc);
                                 return false;