Changeset 1c6c3e1d in mainline for uspace/srv/devman/loc.c

Timestamp:

2023-10-22T17:55:33Z (15 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/devman/loc.c (modified) (4 diffs)

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;