Changeset 4c6fd56 in mainline for uspace/srv/bd/sata_bd/sata_bd.c

Timestamp:

2023-09-16T19:58:18Z (9 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/bd/sata_bd/sata_bd.c (modified) (5 diffs)

uspace/srv/bd/sata_bd/sata_bd.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2012 Petr Jerman
  * All rights reserved.
@@ -57 +58 @@
 #define MAXDISKS  256
 
+static loc_srv_t *srv;
 static sata_bd_dev_t disk[MAXDISKS];
 static int disk_count;
@@ -249 +251 @@
 
         async_set_fallback_port_handler(sata_bd_connection, NULL);
-        rc = loc_server_register(NAME);
+        rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
                 printf(NAME ": Unable to register driver: %s.\n", str_error(rc));
@@ -270 +272 @@
                 char name[1024];
                 snprintf(name, 1024, "%s/%s", NAMESPACE, disk[i].dev_name);
-                rc = loc_service_register(name, &disk[i].service_id);
+                rc = loc_service_register(srv, name, &disk[i].service_id);
                 if (rc != EOK) {
                         printf(NAME ": Unable to register device %s: %s\n", name, str_error(rc));
@@ -276 +278 @@
                 }
 
-                rc = loc_service_add_to_cat(disk[i].service_id, disk_cat);
+                rc = loc_service_add_to_cat(srv, disk[i].service_id, disk_cat);
                 if (rc != EOK) {
                         printf("%s: Failed adding %s to category: %s.",