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

Timestamp:

2023-09-16T19:58:18Z (18 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/output/output.c (modified) (4 diffs)

uspace/srv/hid/output/output.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2011 Martin Decky
  * All rights reserved.
@@ -468 +469 @@
 int main(int argc, char *argv[])
 {
+        loc_srv_t *srv;
+
         if (argc < 2) {
                 usage(argv[0]);
@@ -477 +480 @@
         /* Register server */
         async_set_fallback_port_handler(client_connection, NULL);
-        errno_t rc = loc_server_register(NAME);
+        errno_t rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
                 printf("%s: Unable to register driver\n", NAME);
@@ -484 +487 @@
 
         service_id_t service_id;
-        rc = loc_service_register(argv[1], &service_id);
+        rc = loc_service_register(srv, argv[1], &service_id);
         if (rc != EOK) {
+                loc_server_unregister(srv);
+
                 printf("%s: Unable to register service %s\n", NAME, argv[1]);
                 return rc;