Changeset c1b3d37 in mainline

Timestamp:

2025-05-20T19:34:13Z (24 hours ago)

Author:

GitHub <noreply@…>

Parents:

61f28c4 (diff), 49da044 (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:

Miroslav Cimerman <70661600+mcimerman@…> (2025-05-20 19:34:13)

git-committer:

GitHub <noreply@…> (2025-05-20 19:34:13)

Message:

Merge 49da04407e5900013a273fd9ee22ded0a7af5acb into 61f28c405b3c98cda69d286db31ae3b984b11cfd

Files:

• abi/include/abi/ipc/interfaces.h (modified) (1 diff)
• uspace/app/bdwrite/bdwrite.c (added)
• uspace/app/bdwrite/meson.build (added)
• uspace/app/hrctl/create_file_bd_disks.bdsh (added)
• uspace/app/hrctl/hrctl.c (added)
• uspace/app/hrctl/meson.build (added)
• uspace/app/hrctl/sample_hrconfig_file_bd.sif (added)
• uspace/app/hrctl/sample_hrconfig_pci.sif (added)
• uspace/app/meson.build (modified) (2 diffs)
• uspace/lib/c/include/ipc/services.h (modified) (1 diff)
• uspace/lib/device/include/hr.h (added)
• uspace/lib/device/include/ipc/hr.h (added)
• uspace/lib/device/meson.build (modified) (1 diff)
• uspace/lib/device/src/hr.c (added)
• uspace/srv/bd/hr/fge.c (added)
• uspace/srv/bd/hr/fge.h (added)
• uspace/srv/bd/hr/hr.c (added)
• uspace/srv/bd/hr/io.c (added)
• uspace/srv/bd/hr/io.h (added)
• uspace/srv/bd/hr/meson.build (added)
• uspace/srv/bd/hr/metadata/foreign/geom/g_mirror.h (added)
• uspace/srv/bd/hr/metadata/foreign/geom/g_stripe.h (added)
• uspace/srv/bd/hr/metadata/foreign/geom/hr_g_mirror.c (added)
• uspace/srv/bd/hr/metadata/foreign/geom/hr_g_stripe.c (added)
• uspace/srv/bd/hr/metadata/foreign/geom/sys_endian.h (added)
• uspace/srv/bd/hr/metadata/foreign/softraid/hr_softraid.c (added)
• uspace/srv/bd/hr/metadata/foreign/softraid/softraid.c (added)
• uspace/srv/bd/hr/metadata/foreign/softraid/softraidvar.h (added)
• uspace/srv/bd/hr/metadata/native.c (added)
• uspace/srv/bd/hr/metadata/native.h (added)
• uspace/srv/bd/hr/raid0.c (added)
• uspace/srv/bd/hr/raid1.c (added)
• uspace/srv/bd/hr/raid5.c (added)
• uspace/srv/bd/hr/superblock.c (added)
• uspace/srv/bd/hr/superblock.h (added)
• uspace/srv/bd/hr/util.c (added)
• uspace/srv/bd/hr/util.h (added)
• uspace/srv/bd/hr/var.h (added)
• uspace/srv/locsrv/locsrv.c (modified) (1 diff)
• uspace/srv/meson.build (modified) (1 diff)
• uspace/srv/system/system.c (modified) (1 diff)

abi/include/abi/ipc/interfaces.h

@@ -206 +206 @@
             FOURCC_COMPACT('s', 's', 't', 'm') | IFACE_EXCHANGE_SERIALIZE,
         INTERFACE_SYSTEM_CB =
-            FOURCC_COMPACT('s', 's', 't', 'm') | IFACE_EXCHANGE_SERIALIZE | IFACE_MOD_CALLBACK
+            FOURCC_COMPACT('s', 's', 't', 'm') | IFACE_EXCHANGE_SERIALIZE | IFACE_MOD_CALLBACK,
+        INTERFACE_HR =
+            FOURCC_COMPACT('h', 'r', ' ', ' ') | IFACE_EXCHANGE_SERIALIZE
 } iface_t;
 

uspace/app/meson.build

@@ -31 +31 @@
         'barber',
         'bdsh',
+        'bdwrite',
         'bithenge',
         'blkdump',
@@ -52 +53 @@
         'hbench',
         'hello',
+        'hrctl',
         'inet',
         'init',

uspace/lib/c/include/ipc/services.h

@@ -58 +58 @@
 #define SERVICE_NAME_DISPLAY  "hid/display"
 #define SERVICE_NAME_WNDMGT   "hid/display"
+#define SERVICE_NAME_HR       "hr"
 #define SERVICE_NAME_DHCP     "net/dhcp"
 #define SERVICE_NAME_DNSR     "net/dnsr"

uspace/lib/device/meson.build

@@ -32 +32 @@
         'src/devman.c',
         'src/device/led_dev.c',
+        'src/hr.c',
         'src/io/chardev.c',
         'src/io/chardev_srv.c',

uspace/srv/locsrv/locsrv.c

@@ -1330 +1330 @@
         categ_dir_add_cat(&cdir, cat);
 
+        cat = category_new("raid");
+        categ_dir_add_cat(&cdir, cat);
+
         cat = category_new("partition");
         categ_dir_add_cat(&cdir, cat);

uspace/srv/meson.build

@@ -31 +31 @@
         'audio/hound',
         'bd/file_bd',
+        'bd/hr',
         'bd/rd',
         'bd/sata_bd',

uspace/srv/system/system.c

@@ -477 +477 @@
         srv_start("/srv/bd/vbd");
         srv_start("/srv/volsrv");
+        srv_start("/srv/bd/hr");
 
         init_sysvol();