Changeset 469739f in mainline for uspace/app/hdisk/func_mbr.c

Timestamp:

2013-05-30T13:58:10Z (12 years ago)

Author:

Dominik Taborsky (AT DOT) <brembyseznamcz>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c9f61150, cb328ab

Parents:

9bda5d90 (diff), a2aa81cb (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.

Message:

API changes, bug fixing

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 table_data * data)
+static int set_mbr_partition(tinput_t *in, mbr_part_t *p);
+
+int add_mbr_part(tinput_t *in, union label_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.parts, part);
+        rc = mbr_add_partition(data->mbr, part);
         if (rc != EOK) {
                 printf("Error adding partition.\n");
         }
         
-        
-        return rc;
-}
-
-int delete_mbr_part(tinput_t * in, union table_data * data)
+        return EOK;
+}
+
+int delete_mbr_part(tinput_t *in, union label_data *data)
 {
         int rc;
@@ -72 +70 @@
                 return errno;
         
-        rc = mbr_remove_partition(data->mbr.parts, idx);
+        rc = mbr_remove_partition(data->mbr, idx);
         if(rc != EOK) {
                 printf("Error: something.\n");
@@ -80 +78 @@
 }
 
-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;
+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;
 }
 
 /** Print current partition scheme */
-int print_mbr_parts(union table_data * data)
+int print_mbr_parts(union label_data *data)
 {
         int num = 0;
@@ -96 +102 @@
         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;
@@ -117 +123 @@
 }
 
-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);
+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);
         if (rc != EOK) {
                 printf("Error occured during writing: ERR: %d: %s\n", rc, str_error(rc));
@@ -127 +151 @@
 }
 
-int extra_mbr_funcs(tinput_t * in, service_id_t dev_handle, union table_data * data)
+int extra_mbr_funcs(tinput_t *in, service_id_t dev_handle, union label_data *data)
 {
         printf("Not implemented.\n");
@@ -133 +157 @@
 }
 
-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;
@@ -159 +183 @@
                 return errno;
 
-        ///TODO: there can only be one bootable partition; let's do it just like fdisk
+        ///TODO: there can only be one boolabel partition; let's do it just like fdisk
         printf("Bootable? (y/n): ");
         c = getchar();