Changeset 4c6fd56 in mainline for uspace/srv/devman

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.

Location:

uspace/srv/devman

Files:

• drv_conn.c (modified) (2 diffs)
• loc.c (modified) (4 diffs)
• main.c (modified) (4 diffs)
• main.h (modified) (2 diffs)

uspace/srv/devman/drv_conn.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
  * All rights reserved.
@@ -360 +361 @@
         rc = loc_category_get_id(cat_name, &cat_id, IPC_FLAG_BLOCKING);
         if (rc == EOK)
-                rc = loc_service_add_to_cat(fun->service_id, cat_id);
+                rc = loc_service_add_to_cat(devman_srv, fun->service_id, cat_id);
         if (rc == EOK) {
                 log_msg(LOG_DEFAULT, LVL_NOTE, "Function `%s' added to category `%s'.",

uspace/srv/devman/loc.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
  * All rights reserved.
@@ -37 +38 @@
 #include "fun.h"
 #include "loc.h"
+#include "main.h"
 
 /** Create loc path and name for the function. */
@@ -59 +61 @@
         }
 
-        loc_service_register(loc_pathname, &fun->service_id);
+        loc_service_register(devman_srv, loc_pathname, &fun->service_id);
 
         tree_add_loc_function(tree, fun);
@@ -69 +71 @@
 errno_t loc_unregister_tree_function(fun_node_t *fun, dev_tree_t *tree)
 {
-        errno_t rc = loc_service_unregister(fun->service_id);
+        errno_t rc = loc_service_unregister(devman_srv, fun->service_id);
         tree_rem_loc_function(tree, fun);
         return rc;

uspace/srv/devman/main.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
  * All rights reserved.
@@ -64 +65 @@
 driver_list_t drivers_list;
 dev_tree_t device_tree;
+loc_srv_t *devman_srv;
 
 static void devman_connection_device(ipc_call_t *icall, void *arg)
@@ -280 +282 @@
 static bool devman_init(void)
 {
+        errno_t rc;
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "devman_init - looking for available drivers.");
 
@@ -305 +309 @@
          * not work.
          */
-        loc_server_register(NAME);
+        rc = loc_server_register(NAME, &devman_srv);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_FATAL, "Error registering devman server.");
+                return false;
+        }
 
         return true;

uspace/srv/devman/main.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2013 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -34 +34 @@
 #define MAIN_H_
 
+#include <loc.h>
 #include "devman.h"
 
 extern driver_list_t drivers_list;
 extern dev_tree_t device_tree;
+extern loc_srv_t *devman_srv;
 
 #endif