Changeset 68c966e in mainline

Timestamp:

2024-10-11T17:37:03Z (7 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

abc2c4b

Parents:

4b759dc

Message:

hr: use HR_DEVNAME_LEN and HR_UUID_LEN defines

Location:

uspace

Files:

• lib/device/include/hr.h (modified) (2 diffs)
• srv/bd/hr/hr.c (modified) (1 diff)
• srv/bd/hr/superblock.c (modified) (1 diff)
• srv/bd/hr/superblock.h (modified) (2 diffs)
• srv/bd/hr/var.h (modified) (1 diff)

uspace/lib/device/include/hr.h

@@ -44 +44 @@
 #define HR_MAXDEVS 4
 
+#define HR_DEVNAME_LEN 32
+
 typedef struct hr {
         async_sess_t *sess;
@@ -58 +60 @@
 
 typedef struct hr_config {
-        char devname[32];
+        char devname[HR_DEVNAME_LEN];
         service_id_t devs[HR_MAXDEVS];
         size_t dev_no;

uspace/srv/bd/hr/hr.c

@@ -141 +141 @@
         }
 
-        str_cpy(new_volume->devname, 32, cfg->devname);
+        str_cpy(new_volume->devname, HR_DEVNAME_LEN, cfg->devname);
         for (i = 0; i < cfg->dev_no; i++)
                 new_volume->extents[i].svc_id = cfg->devs[i];

uspace/srv/bd/hr/superblock.c

@@ -97 +97 @@
                 uuid_encode(&uuid, metadata->uuid);
 
-                str_cpy(metadata->devname, 32, vol->devname);
+                str_cpy(metadata->devname, HR_DEVNAME_LEN, vol->devname);
 
                 rc = block_write_direct(vol->extents[i].svc_id, HR_META_OFF,

uspace/srv/bd/hr/superblock.h

@@ -44 +44 @@
 
 #define HR_MAGIC 0x4420492041205248LLU
+#define HR_UUID_LEN 16
 
 typedef struct hr_metadata {
@@ -55 +56 @@
         uint32_t strip_size;
         uint32_t status;        /* yet unused */
-        uint8_t uuid[16];
-        char devname[32];
+        uint8_t uuid[HR_UUID_LEN];
+        char devname[HR_DEVNAME_LEN];
 } hr_metadata_t;
 

uspace/srv/bd/hr/var.h

@@ -56 +56 @@
         bd_srvs_t hr_bds;
         link_t lvolumes;
-        char devname[32];
+        char devname[HR_DEVNAME_LEN];
         hr_extent_t extents[HR_MAXDEVS];
         uint64_t nblocks;