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

Timestamp:

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

uspace/srv/hid/display/main.c

@@ -127 +127 @@
         port_id_t wm_port;
         port_id_t dc_port;
+        loc_srv_t *srv = NULL;
+        service_id_t sid = 0;
         errno_t rc;
 
@@ -171 +173 @@
                 goto error;
 
-        rc = loc_server_register(NAME);
+        rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server: %s.", str_error(rc));
@@ -178 +180 @@
         }
 
-        service_id_t sid;
-        rc = loc_service_register(SERVICE_NAME_DISPLAY, &sid);
+        rc = loc_service_register(srv, SERVICE_NAME_DISPLAY, &sid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service: %s.", str_error(rc));
@@ -189 +190 @@
         return EOK;
 error:
+        if (sid != 0)
+                loc_service_unregister(srv, sid);
+        if (srv != NULL)
+                loc_server_unregister(srv);
         // XXX destroy disp_port
         // XXX destroy gc_port