Changes in uspace/app/hdisk/hdisk.h [a2aa81cb:700f89e] in mainline

File:

• uspace/app/hdisk/hdisk.h (modified) (1 diff)

uspace/app/hdisk/hdisk.h

@@ -39 +39 @@
         LYT_MBR,
         LYT_GPT,
-} layouts_t;
+} LAYOUTS;
 
-typedef struct label {
-        layouts_t layout;
-        union label_data data;
-        int (* add_part)     (tinput_t *,   union label_data *);
-        int (* delete_part)  (tinput_t *,   union label_data *);
-        int (* destroy_label)(              union label_data *);
-        int (* new_label)    (              union label_data *);
-        int (* print_parts)  (              union label_data *);
-        int (* read_parts)   (service_id_t, union label_data *);
-        int (* write_parts)  (service_id_t, union label_data *);
-        int (* extra_funcs)  (tinput_t *, service_id_t, union label_data *);
-} label_t;
+typedef struct table {
+        LAYOUTS layout;
+        union table_data data;
+        int (* add_part)(tinput_t *, union table_data *);
+        int (* delete_part)(tinput_t *, union table_data *);
+        int (* new_table)(tinput_t *, union table_data *);
+        int (* print_parts)();
+        int (* write_parts)(service_id_t, union table_data *);
+        int (* extra_funcs)(tinput_t *, service_id_t, union table_data *);
+} table_t;
 
-#define init_label() \
-        label.layout = LYT_NONE
+#define init_table() \
+        table.layout = LYT_NONE
 
+#define set_table_mbr(m) \
+        table.data.mbr.mbr = (m)
+
+#define set_table_mbr_parts(p) \
+        table.data.mbr.parts = (p)
+
+#define set_table_gpt(g) \
+        table.data.gpt.gpt = (g)
+
+#define set_table_gpt_parts(p) \
+        table.data.gpt.parts = (p)