Changes in uspace/app/hdisk/func_mbr.c [a2aa81cb:9bda5d90] in mainline

File:

• uspace/app/hdisk/func_mbr.c (modified) (8 diffs)

uspace/app/hdisk/func_mbr.c

@@ -41 +41 @@
 #include "input.h"
 
-static int set_mbr_partition(tinput_t *in, mbr_part_t *p);
-
-int add_mbr_part(tinput_t *in, union label_data *data)
+static int set_mbr_partition(tinput_t * in, mbr_part_t * p);
+
+
+int add_mbr_part(tinput_t * in, union table_data * data)
 {
         int rc;
         
-        mbr_part_t *part = mbr_alloc_partition();
+        mbr_part_t * part = mbr_alloc_partition();
 
         set_mbr_partition(in, part);
 
-        rc = mbr_add_partition(data->mbr, part);
+        rc = mbr_add_partition(data->mbr.parts, part);
         if (rc != EOK) {
                 printf("Error adding partition.\n");
         }
         
-        return EOK;
-}
-
-int delete_mbr_part(tinput_t *in, union label_data *data)
+        
+        return rc;
+}
+
+int delete_mbr_part(tinput_t * in, union table_data * data)
 {
         int rc;
@@ -70 +72 @@
                 return errno;
         
-        rc = mbr_remove_partition(data->mbr, idx);
+        rc = mbr_remove_partition(data->mbr.parts, idx);
         if(rc != EOK) {
                 printf("Error: something.\n");
@@ -78 +80 @@
 }
 
-int destroy_mbr_label(union label_data *data)
-{
-        mbr_free_label(data->mbr);
-        return EOK;
-}
-
-int new_mbr_label(union label_data *data)
-{
-        data->mbr = mbr_alloc_label();
-        if (data->mbr == NULL)
-                return ENOMEM;
-        else
-                return EOK;
+int new_mbr_table(tinput_t * in, union table_data * data)
+{
+        data->mbr.mbr = mbr_alloc_mbr();
+        data->mbr.parts = mbr_alloc_partitions();
+        return EOK;
 }
 
 /** Print current partition scheme */
-int print_mbr_parts(union label_data *data)
+int print_mbr_parts(union table_data * data)
 {
         int num = 0;
@@ -102 +96 @@
         printf("\t\t%10s  %10s %10s %10s %7s\n", "Bootable:", "Start:", "End:", "Length:", "Type:");
         
-        mbr_part_t *it;
-        mbr_part_foreach(data->mbr->parts, it) {
+        mbr_part_t * it;
+        mbr_part_foreach(data->mbr.parts, it) {
                 if (it->type == PT_UNUSED)
                         continue;
@@ -123 +117 @@
 }
 
-int read_mbr_parts(service_id_t dev_handle, union label_data *data)
-{
-        int rc;
-        printf("mbr\n");
-        rc = mbr_read_mbr(data->mbr, dev_handle);
-        if (rc != EOK)
-                return rc;
-        printf("ismbr\n");
-        if (!mbr_is_mbr(data->mbr))
-                return EINVAL;
-        printf("parts\n");
-        rc = mbr_read_partitions(data->mbr);
-        if (rc != EOK)
-                return rc;
-        printf("end\n");
-        return EOK;
-}
-
-int write_mbr_parts(service_id_t dev_handle, union label_data *data)
-{
-        int rc = mbr_write_partitions(data->mbr, dev_handle);
+int write_mbr_parts(service_id_t dev_handle, union table_data * data)
+{
+        int rc = mbr_write_partitions(data->mbr.parts, data->mbr.mbr, dev_handle);
         if (rc != EOK) {
                 printf("Error occured during writing: ERR: %d: %s\n", rc, str_error(rc));
@@ -151 +127 @@
 }
 
-int extra_mbr_funcs(tinput_t *in, service_id_t dev_handle, union label_data *data)
+int extra_mbr_funcs(tinput_t * in, service_id_t dev_handle, union table_data * data)
 {
         printf("Not implemented.\n");
@@ -157 +133 @@
 }
 
-static int set_mbr_partition(tinput_t *in, mbr_part_t *p)
+static int set_mbr_partition(tinput_t * in, mbr_part_t * p)
 {
         int c;
@@ -183 +159 @@
                 return errno;
 
-        ///TODO: there can only be one boolabel partition; let's do it just like fdisk
+        ///TODO: there can only be one bootable partition; let's do it just like fdisk
         printf("Bootable? (y/n): ");
         c = getchar();