Changeset 1c6c3e1d in mainline for uspace/srv/hid/console/console.c

Timestamp:

2023-10-22T17:55:33Z (14 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

ticket/834-toolchain-update

Children:

350ec74

Parents:

315d487 (diff), 133461c (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.

Message:

Merge branch 'master' into ticket

File:

• uspace/srv/hid/console/console.c (modified) (4 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.
@@ -89 +89 @@
 } console_t;
 
+static loc_srv_t *console_srv;
+
 /** Input server proxy */
 static input_t *input;
@@ -902 +904 @@
         /* 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 +954 @@
                         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;