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

Timestamp:

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

uspace/srv/hid/isdv4_tablet/main.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2012 Martin Sucha
  * All rights reserved.
@@ -184 +185 @@
         serial_t *serial;
         char *serial_port_name = NULL;
+        loc_srv_t *srv;
 
         int arg = 1;
@@ -315 +317 @@
 
         async_set_fallback_port_handler(mouse_connection, NULL);
-        rc = loc_server_register(NAME);
+        rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
                 printf("%s: Unable to register driver.\n", NAME);
@@ -329 +331 @@
         }
 
-        rc = loc_service_register(service_name, &service_id);
-        if (rc != EOK) {
+        rc = loc_service_register(srv, service_name, &service_id);
+        if (rc != EOK) {
+                loc_server_unregister(srv);
                 printf(NAME ": Unable to register service %s.\n", service_name);
                 return rc;
@@ -340 +343 @@
                 printf(NAME ": Unable to get mouse category id.\n");
         } else {
-                rc = loc_service_add_to_cat(service_id, mouse_category);
+                rc = loc_service_add_to_cat(srv, service_id, mouse_category);
                 if (rc != EOK) {
                         printf(NAME ": Unable to add device to mouse category.\n");