Changes in uspace/app/hdisk/func_mbr.c [6e8e4e19:a2aa81cb] in mainline

File:

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

uspace/app/hdisk/func_mbr.c

@@ -41 +41 @@
 #include "input.h"
 
-static int set_mbr_partition(tinput_t *in, mbr_part_t *p, unsigned int alignment);
-
-int construct_mbr_label(label_t *this)
-{
-        this->layout = LYT_MBR;
-        this->alignment = 1;
-        
-        this->add_part      = add_mbr_part;
-        this->delete_part   = delete_mbr_part;
-        this->destroy_label = destroy_mbr_label;
-        this->new_label     = new_mbr_label;
-        this->print_parts   = print_mbr_parts;
-        this->read_parts    = read_mbr_parts;
-        this->write_parts   = write_mbr_parts;
-        this->extra_funcs   = extra_mbr_funcs;
-        
-        return this->new_label(this);
-}
-
-int add_mbr_part(label_t *this, tinput_t *in)
+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();
-        
-        set_mbr_partition(in, part, this->alignment);
-        
-        rc = mbr_add_partition(this->data.mbr, part);
-        if (rc != ERR_OK) {
-                printf("Error adding partition: %d\n", rc);
-        }
-        
-        return EOK;
-}
-
-int delete_mbr_part(label_t *this, tinput_t *in)
+
+        set_mbr_partition(in, part);
+
+        rc = mbr_add_partition(data->mbr, part);
+        if (rc != EOK) {
+                printf("Error adding partition.\n");
+        }
+        
+        return EOK;
+}
+
+int delete_mbr_part(tinput_t *in, union label_data *data)
 {
         int rc;
         size_t idx;
-        
+
         printf("Number of the partition to delete (counted from 0): ");
         idx = get_input_size_t(in);
@@ -87 +70 @@
                 return errno;
         
-        rc = mbr_remove_partition(this->data.mbr, idx);
+        rc = mbr_remove_partition(data->mbr, idx);
         if(rc != EOK) {
                 printf("Error: something.\n");
         }
-        
-        return EOK;
-}
-
-int destroy_mbr_label(label_t *this)
-{
-        mbr_free_label(this->data.mbr);
-        return EOK;
-}
-
-int new_mbr_label(label_t *this)
-{
-        this->data.mbr = mbr_alloc_label();
-        if (this->data.mbr == NULL)
+
+        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
@@ -111 +94 @@
 
 /** Print current partition scheme */
-int print_mbr_parts(label_t *this)
+int print_mbr_parts(union label_data *data)
 {
         int num = 0;
-        
-        printf("Current partition scheme (MBR):\n");
+
+        printf("Current partition scheme:\n");
         //printf("\t\tBootable:\tStart:\tEnd:\tLength:\tType:\n");
         printf("\t\t%10s  %10s %10s %10s %7s\n", "Bootable:", "Start:", "End:", "Length:", "Type:");
         
         mbr_part_t *it;
-        //mbr_part_foreach(data->mbr, it) {
-        
-        for (it = mbr_get_first_partition(this->data.mbr); it != NULL;
-             it = mbr_get_next_partition(this->data.mbr, it), ++num) {
+        mbr_part_foreach(data->mbr->parts, it) {
                 if (it->type == PT_UNUSED)
                         continue;
-                
+
                 printf("\tP%d:\t", num);
                 if (mbr_get_flag(it, ST_BOOT))
@@ -132 +112 @@
                 else
                         printf(" ");
-                
+
                 printf("\t%10u %10u %10u %7u\n", it->start_addr, it->start_addr + it->length, it->length, it->type);
-                
-                //++num;
-        }
-        
+
+                ++num;
+        }
+
         printf("%d partitions found.\n", num);
         
@@ -143 +123 @@
 }
 
-int read_mbr_parts(label_t *this, service_id_t dev_handle)
+int read_mbr_parts(service_id_t dev_handle, union label_data *data)
 {
         int rc;
-        rc = mbr_read_mbr(this->data.mbr, dev_handle);
+        printf("mbr\n");
+        rc = mbr_read_mbr(data->mbr, dev_handle);
         if (rc != EOK)
                 return rc;
-        
-        if (!mbr_is_mbr(this->data.mbr))
+        printf("ismbr\n");
+        if (!mbr_is_mbr(data->mbr))
                 return EINVAL;
-        
-        rc = mbr_read_partitions(this->data.mbr);
+        printf("parts\n");
+        rc = mbr_read_partitions(data->mbr);
         if (rc != EOK)
                 return rc;
-        
-        return EOK;
-}
-
-int write_mbr_parts(label_t *this, service_id_t dev_handle)
-{
-        int rc = mbr_write_partitions(this->data.mbr, dev_handle);
+        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));
@@ -170 +151 @@
 }
 
-int extra_mbr_funcs(label_t *this, tinput_t *in, service_id_t dev_handle)
+int extra_mbr_funcs(tinput_t *in, service_id_t dev_handle, union label_data *data)
 {
         printf("Not implemented.\n");
@@ -176 +157 @@
 }
 
-static int set_mbr_partition(tinput_t *in, mbr_part_t *p, unsigned int alignment)
+static int set_mbr_partition(tinput_t *in, mbr_part_t *p)
 {
         int c;
@@ -193 +174 @@
                         break;
                 default:
-                        printf("Invalid type. Cancelled.\n");
+                        printf("Invalid type. Cancelled.");
                         return EINVAL;
         }
-        
-        printf("ST_LOGIC: %d, %hd\n", mbr_get_flag(p, ST_LOGIC), p->status);
         
         printf("Set type (0-255): ");
@@ -221 +200 @@
         if (sa == 0 && errno != EOK)
                 return errno;
-        
-        if (alignment != 0 && alignment != 1) {
-                sa = mbr_get_next_aligned(sa, alignment);
-                printf("Starting address was aligned to %u.\n", sa);
-        }
 
         printf("Set end addres (number): ");
@@ -232 +206 @@
                 return errno;
         
-        /* Align ending address, not in use */
-        /*if (alignment != 0 && alignment != 1) {
-                ea = mbr_get_next_aligned(ea, alignment) - alignment;
-                printf("Starting address was aligned to %u.\n", ea);
-        }*/
-        
         if(ea < sa) {
                 printf("Invalid value. Canceled.\n");