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

Timestamp:

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

uspace/srv/hid/rfb/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2013 Martin Sucha
  * All rights reserved.
@@ -443 +443 @@
 {
         rfb_t rfb;
+        loc_srv_t *srv;
 
         log_init(NAME);
@@ -482 +483 @@
         async_set_fallback_port_handler(client_connection, &rfb);
 
-        errno_t rc = loc_server_register(NAME);
+        errno_t rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
                 printf("%s: Unable to register server.\n", NAME);
@@ -497 +498 @@
         service_id_t service_id;
 
-        rc = loc_service_register(service_name, &service_id);
+        rc = loc_service_register(srv, service_name, &service_id);
         if (rc != EOK) {
                 printf(NAME ": Unable to register service %s.\n", service_name);
@@ -512 +513 @@
         }
 
-        rc = loc_service_add_to_cat(service_id, ddev_cid);
+        rc = loc_service_add_to_cat(srv, service_id, ddev_cid);
         if (rc != EOK) {
                 fprintf(stderr, NAME ": Unable to add service to display device category.\n");