Changeset fb06476f in mainline for uspace/lib/device/src/hr.c

Timestamp:

2025-04-21T13:20:05Z (3 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

c6d2af8

Parents:

5cb1631

Message:

hr: use enum for RAID layouts

File:

• uspace/lib/device/src/hr.c (modified) (2 diffs)

uspace/lib/device/src/hr.c

@@ -207 +207 @@
         if (vol_info->level == HR_LVL_4 || vol_info->level == HR_LVL_5) {
                 printf("layout: %s\n",
-                    hr_get_layout_str(vol_info->level, vol_info->layout));
+                    hr_get_layout_str(vol_info->layout));
         }
         if (vol_info->level == HR_LVL_0 || vol_info->level == HR_LVL_4) {
@@ -428 +428 @@
 }
 
-const char *hr_get_layout_str(hr_level_t level, uint8_t layout)
-{
-        switch (level) {
-        case HR_LVL_4:
-                switch (layout) {
-                case HR_RLQ_RAID4_0:
-                        return "RAID-4 Non-Rotating Parity 0";
-                case HR_RLQ_RAID4_N:
-                        return "RAID-4 Non-Rotating Parity N";
-                default:
-                        return "Invalid RAID 4 layout";
-                }
-        case HR_LVL_5:
-                switch (layout) {
-                case HR_RLQ_RAID5_0R:
-                        return "RAID-5 Rotating Parity 0 with Data Restart";
-                case HR_RLQ_RAID5_NR:
-                        return "RAID-5 Rotating Parity N with Data Restart";
-                case HR_RLQ_RAID5_NC:
-                        return "RAID-5 Rotating Parity N with Data Continuation";
-                default:
-                        return "Invalid RAID 5 layout";
-                }
+const char *hr_get_layout_str(hr_layout_t layout)
+{
+        switch (layout) {
+        case HR_RLQ_NONE:
+                return "RAID layout not set";
+        case HR_RLQ_RAID4_0:
+                return "RAID-4 Non-Rotating Parity 0";
+        case HR_RLQ_RAID4_N:
+                return "RAID-4 Non-Rotating Parity N";
+        case HR_RLQ_RAID5_0R:
+                return "RAID-5 Rotating Parity 0 with Data Restart";
+        case HR_RLQ_RAID5_NR:
+                return "RAID-5 Rotating Parity N with Data Restart";
+        case HR_RLQ_RAID5_NC:
+                return "RAID-5 Rotating Parity N with Data Continuation";
         default:
-                return "Invalid RAID level";
+                return "Invalid RAID layout";
         }
 }