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

Timestamp:

2023-10-22T17:55:33Z (17 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/remcons/remcons.c (modified) (5 diffs)

uspace/srv/hid/remcons/remcons.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2012 Vojtech Horky
  * All rights reserved.
@@ -110 +111 @@
 };
 
+static loc_srv_t *remcons_srv;
+
 static telnet_user_t *srv_to_user(con_srv_t *srv)
 {
@@ -301 +304 @@
         telnet_user_add(user);
 
-        errno_t rc = loc_service_register(user->service_name, &user->service_id);
+        errno_t rc = loc_service_register(remcons_srv, user->service_name,
+            &user->service_id);
         if (rc != EOK) {
                 telnet_user_error(user, "Unable to register %s with loc: %s.",
@@ -332 +336 @@
         fibril_mutex_unlock(&user->guard);
 
-        rc = loc_service_unregister(user->service_id);
+        rc = loc_service_unregister(remcons_srv, user->service_id);
         if (rc != EOK) {
                 telnet_user_error(user,
@@ -351 +355 @@
 
         async_set_fallback_port_handler(client_connection, NULL);
-        rc = loc_server_register(NAME);
+        rc = loc_server_register(NAME, &remcons_srv);
         if (rc != EOK) {
                 fprintf(stderr, "%s: Unable to register server\n", NAME);