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

Timestamp:

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

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -81 +81 @@
 int main(int argc, char *argv[])
 {
+        loc_srv_t *srv;
+
         printf("%s: S3C24xx touchscreen driver\n", NAME);
 
         async_set_fallback_port_handler(s3c24xx_ts_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);
@@ -91 +93 @@
 
         ts = malloc(sizeof(s3c24xx_ts_t));
-        if (ts == NULL)
+        if (ts == NULL) {
+                loc_server_unregister(srv);
                 return -1;
-
-        if (s3c24xx_ts_init(ts) != EOK)
+        }
+
+        if (s3c24xx_ts_init(ts) != EOK) {
+                free(ts);
+                loc_server_unregister(srv);
                 return -1;
-
-        rc = loc_service_register(NAMESPACE "/mouse", &ts->service_id);
+        }
+
+        rc = loc_service_register(srv, NAMESPACE "/mouse", &ts->service_id);
         if (rc != EOK) {
+                // XXX s3c24xx_ts_fini();
+                free(ts);
+                loc_server_unregister(srv);
                 printf(NAME ": Unable to register device %s.\n",
                     NAMESPACE "/mouse");