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

File:

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

uspace/app/hdisk/func_gpt.c

@@ -43 +43 @@
 static int set_gpt_partition(tinput_t *, gpt_part_t *);
 
-
-int construct_gpt_label(label_t *this)
+int add_gpt_part(tinput_t * in, union label_data * data)
 {
-        this->layout = LYT_GPT;
-        this->alignment = 1;
-        
-        this->add_part    = add_gpt_part;
-        this->delete_part = delete_gpt_part;
-        this->new_label   = new_gpt_label;
-        this->print_parts = print_gpt_parts;
-        this->read_parts  = read_gpt_parts;
-        this->write_parts = write_gpt_parts;
-        this->extra_funcs = extra_gpt_funcs;
-        
-        return this->new_label(this);
-}
-
-int add_gpt_part(label_t *this, tinput_t * in)
-{
-        gpt_part_t * p = gpt_alloc_partition(this->data.gpt->parts);
+        gpt_part_t * p = gpt_alloc_partition(data->gpt->parts);
         if (p == NULL) {
                 return ENOMEM;
@@ -70 +53 @@
 }
 
-int delete_gpt_part(label_t *this, tinput_t * in)
+int delete_gpt_part(tinput_t * in, union label_data * data)
 {
         size_t idx;
@@ -77 +60 @@
         idx = get_input_size_t(in);
 
-        if (gpt_remove_partition(this->data.gpt->parts, idx) == -1) {
+        if (gpt_remove_partition(data->gpt->parts, idx) == -1) {
                 printf("Warning: running low on memory, not resizing...\n");
         }
@@ -84 +67 @@
 }
 
-int destroy_gpt_label(label_t *this)
+int destroy_gpt_label(union label_data *data)
 {
         return EOK;
 }
 
-int new_gpt_label(label_t *this)
+int new_gpt_label(union label_data *data)
 {
-        this->data.gpt->gpt = gpt_alloc_gpt_header();
-        this->data.gpt->parts = gpt_alloc_partitions();
+        data->gpt->gpt = gpt_alloc_gpt_header();
+        data->gpt->parts = gpt_alloc_partitions();
         return EOK;
 }
 
-int print_gpt_parts(label_t *this)
+int print_gpt_parts(union label_data *data)
 {
         //int rc;
@@ -104 +87 @@
         size_t i = 0;
         
-        gpt_part_foreach(this->data.gpt->parts, iter) {
-                //FIXMEE!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-                if (gpt_get_part_type(iter) == 62)
-                        continue;
-                
+        gpt_part_foreach(data->gpt->parts, iter) {
                 //printf("\t%10u %10u %10u %3d\n", iter->start_addr, iter->start_addr + iter->length,
                 //              iter->length, gpt_get_part_type(iter), gpt_get_part_name(iter));
@@ -121 +100 @@
 }
 
-int read_gpt_parts(label_t *this, service_id_t dev_handle)
+int read_gpt_parts(service_id_t dev_handle, union label_data *data)
 {
         return EOK;
 }
 
-int write_gpt_parts(label_t *this, service_id_t dev_handle)
+int write_gpt_parts(service_id_t dev_handle, union label_data * data)
 {
         int rc;
 
-        rc = gpt_write_partitions(this->data.gpt->parts, this->data.gpt->gpt, dev_handle);
+        rc = gpt_write_partitions(data->gpt->parts, data->gpt->gpt, dev_handle);
         if (rc != EOK) {
                 printf("Error: Writing partitions failed: %d (%s)\n", rc, str_error(rc));
@@ -136 +115 @@
         }
 
-        rc = gpt_write_gpt_header(this->data.gpt->gpt, dev_handle);
+        rc = gpt_write_gpt_header(data->gpt->gpt, dev_handle);
         if (rc != EOK) {
                 printf("Error: Writing partitions failed: %d (%s)\n", rc, str_error(rc));
@@ -145 +124 @@
 }
 
-int extra_gpt_funcs(label_t *this, tinput_t * in, service_id_t dev_handle)
+int extra_gpt_funcs(tinput_t * in, service_id_t dev_handle, union label_data * data)
 {
         printf("Not implemented.\n");