Changeset 283ea3d in mainline for uspace/app/hdisk/func_gpt.c

Timestamp:

2013-07-28T22:52:16Z (11 years ago)

Author:

Dominik Taborsky (AT DOT) <brembyseznamcz>

Branches:

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

Children:

e3bc355

Parents:

8559fa0 (diff), 675de6d (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:

libmbr, libgpt and hdisk fixes and polishing

File:

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

uspace/app/hdisk/func_gpt.c

@@ -42 +42 @@
 #include "input.h"
 
-static int set_gpt_partition(tinput_t *, gpt_part_t *);
-
+static int set_gpt_partition(tinput_t *, gpt_part_t *, unsigned int);
 
 int construct_gpt_label(label_t *this)
@@ -50 +49 @@
         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;
+        this->add_part      = add_gpt_part;
+        this->delete_part   = delete_gpt_part;
+        this->destroy_label = destroy_gpt_label;
+        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);
@@ -68 +68 @@
         }
         
-        return set_gpt_partition(in, p);
+        return set_gpt_partition(in, p, this->alignment);
 }
 
@@ -80 +80 @@
         
         rc = gpt_remove_partition(this->data.gpt, idx);
-        if (rc != EOK) {
+        if (rc == ENOMEM) {
                 printf("Warning: running low on memory, not resizing...\n");
                 return rc;
+        } else if (rc == EINVAL) {
+                printf("Invalid index.\n");
+                return rc;
         }
         
@@ -102 +105 @@
 int print_gpt_parts(label_t *this)
 {
-        //int rc;
         printf("Current partition scheme (GPT):\n");
-        printf("\t\tStart:\tEnd:\tLength:\tType:\tName:\n");
+        printf("%15s %10s %10s Type: Name:\n", "Start:", "End:", "Length:");
         
         size_t i = 0;
@@ -110 +112 @@
         gpt_part_foreach(this->data.gpt, iter) {
                 i++;
-                //FIXMEE!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+                
                 if (gpt_get_part_type(iter) == GPT_PTE_UNUSED)
                         continue;
@@ -117 +119 @@
                         printf("%15s %10s %10s Type: Name:\n", "Start:", "End:", "Length:");
                 
-                //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));
+                
                 printf("%3u  %10llu %10llu %10llu    %3d %s\n", i-1, gpt_get_start_lba(iter), gpt_get_end_lba(iter),
                                 gpt_get_end_lba(iter) - gpt_get_start_lba(iter), gpt_get_part_type(iter),
                                 gpt_get_part_name(iter));
-        }
-        
-        //return rc;
+                
+        }
+        
         return EOK;
 }
@@ -172 +173 @@
 }
 
-static int set_gpt_partition(tinput_t *in, gpt_part_t *p)
+static int set_gpt_partition(tinput_t *in, gpt_part_t *p, unsigned int alignment)
 {
         int rc;
@@ -180 +181 @@
         printf("Set starting address (number): ");
         sa = get_input_uint64(in);
+        if (sa % alignment != 0)
+                sa = gpt_get_next_aligned(sa, alignment);
         
         printf("Set end addres (number): ");
@@ -192 +195 @@
         gpt_set_end_lba(p, ea);
         
+        //printf("Set type : ");
+        //size_t idx = get_input_size_t(in);
+        //gpt_set_part_type(p, idx);
+        
+        gpt_set_random_uuid(p->part_type);
+        gpt_set_random_uuid(p->part_id);
         
         char *name;
@@ -201 +210 @@
         }
         
-        printf("name: %s, len: %d\n", name, str_size(name));
         gpt_set_part_name(p, name, str_size(name));