Changeset dc5c303 in mainline for uspace/srv/bd/rd/rd.c

Timestamp:

2023-12-28T13:59:23Z (15 months ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (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.

git-author:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

File:

• uspace/srv/bd/rd/rd.c (modified) (4 diffs)

uspace/srv/bd/rd/rd.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2007 Michal Konopa
  * Copyright (c) 2007 Martin Jelen
@@ -93 +94 @@
 
 static bd_srvs_t bd_srvs;
+static loc_srv_t *srv;
 
 static void rd_client_conn(ipc_call_t *icall, void *arg)
@@ -178 +180 @@
 
         async_set_fallback_port_handler(rd_client_conn, NULL);
-        ret = loc_server_register(NAME);
+        ret = loc_server_register(NAME, &srv);
         if (ret != EOK) {
                 printf("%s: Unable to register driver: %s\n", NAME, str_error(ret));
@@ -185 +187 @@
 
         service_id_t service_id;
-        ret = loc_service_register("bd/initrd", &service_id);
+        ret = loc_service_register(srv, "bd/initrd", &service_id);
         if (ret != EOK) {
                 printf("%s: Unable to register device service\n", NAME);