Changeset f0cc1c64 in mainline for uspace/srv/bd

Timestamp:

2025-06-20T19:26:13Z (4 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

817cb83

Parents:

f0360ec (diff), 5caad1d (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 upstream into helenraid

Location:

uspace/srv/bd

Files:

• file_bd/file_bd.c (modified) (2 diffs)
• rd/rd.c (modified) (2 diffs)
• sata_bd/doc/doxygroups.h (deleted)
• sata_bd/meson.build (deleted)
• sata_bd/sata_bd.c (deleted)
• sata_bd/sata_bd.h (deleted)
• vbd/disk.c (modified) (1 diff)
• vbd/vbd.c (modified) (2 diffs)

uspace/srv/bd/file_bd/file_bd.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -138 +138 @@
                 return -1;
 
-        rc = loc_service_register(srv, device_name, &service_id);
+        rc = loc_service_register(srv, device_name, fallback_port_id,
+            &service_id);
         if (rc != EOK) {
                 printf("%s: Unable to register device '%s': %s.\n",

uspace/srv/bd/rd/rd.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2007 Michal Konopa
  * Copyright (c) 2007 Martin Jelen
@@ -187 +187 @@
 
         service_id_t service_id;
-        ret = loc_service_register(srv, "bd/initrd", &service_id);
+        ret = loc_service_register(srv, "bd/initrd", fallback_port_id,
+            &service_id);
         if (ret != EOK) {
                 printf("%s: Unable to register device service\n", NAME);

uspace/srv/bd/vbd/disk.c

@@ -1165 +1165 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "loc_service_register('%s')",
             name);
-        rc = loc_service_register(vbds_srv, name, &psid);
+        rc = loc_service_register(vbds_srv, name, fallback_port_id, &psid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering "

uspace/srv/bd/vbd/vbd.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -74 +74 @@
         }
 
-        rc = loc_service_register(vbds_srv, SERVICE_NAME_VBD, &ctl_sid);
+        rc = loc_service_register(vbds_srv, SERVICE_NAME_VBD,
+            fallback_port_id, &ctl_sid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service: %s.", str_error(rc));