Changeset 4c6fd56 in mainline for uspace/srv/hid/console/console.c

Timestamp:

2023-09-16T19:58:18Z (20 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7d7f5e3

Parents:

6a0b2cc

git-author:

Jiri Svoboda <jiri@…> (2023-09-16 19:48:07)

git-committer:

Jiri Svoboda <jiri@…> (2023-09-16 19:58:18)

Message:

loc_server_register() should be callable more than once (API only)

Now loc_server_register() returns a pointer to a loc_srv_t object,
that is then passed to loc_service_register() and
loc_service_add_to_cat().

Added loc_server_unregister() that unregisters the server
and frees the loc_srv_t object.

Updated all callers. The implementation, however, is a stub.
It is not actually possible to call loc_server_register() more
than once, yet.

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;