Changeset 8f6c7785 in mainline for uspace/app/hdisk/func_gpt.c

Timestamp:

2013-04-26T02:55:32Z (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:

700f89e

Parents:

d617050

Message:

logical write functional

File:

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

uspace/app/hdisk/func_gpt.c

@@ -49 +49 @@
                 return ENOMEM;
         }
-        
+
         return set_gpt_partition(in, p);
 }
@@ -59 +59 @@
         printf("Number of the partition to delete (counted from 0): ");
         idx = get_input_size_t(in);
-        
+
         if (gpt_remove_partition(data->gpt.parts, idx) == -1) {
                 printf("Warning: running low on memory, not resizing...\n");
         }
-        
+
         return EOK;
 }
@@ -69 +69 @@
 int print_gpt_parts(union table_data * data)
 {
+        //int rc;
         printf("Current partition scheme (GPT):\n");
         printf("\t\tStart:\tEnd:\tLength:\tType:\tName:\n");
         
-        gpt_foreach(data->gpt.parts, i, 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));
+        size_t i = 0;
+        
+        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));
+                printf("%3u\t%10llu %10llu %10llu %3d %s\n", i, 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));
+                i++;
         }
-        
-        return rc;
+
+        //return rc;
+        return EOK;
 }
 
@@ -83 +91 @@
 {
         int rc;
-        
+
         rc = gpt_write_partitions(data->gpt.parts, data->gpt.gpt, dev_handle);
         if (rc != EOK) {
@@ -89 +97 @@
                 return rc;
         }
-        
+
         rc = gpt_write_gpt_header(data->gpt.gpt, dev_handle);
         if (rc != EOK) {
@@ -95 +103 @@
                 return rc;
         }
-        
+
         return EOK;
 }
@@ -106 +114 @@
 static int set_gpt_partition(tinput_t * in, gpt_part_t * p)
 {
-        int rc;
-        
+        //int rc;
+
         uint64_t sa, ea;
-        
+
         printf("Set starting address (number): ");
         sa = get_input_uint64(in);
@@ -115 +123 @@
         printf("Set end addres (number): ");
         ea = get_input_uint64(in);
-        
+
         if (ea <= sa) {
                 printf("Invalid value.\n");
                 return EINVAL;
         }
-        
-        
-        p->start_addr = sa;
-        p->length = ea - sa;
-        
+
+
+        //p->start_addr = sa;
+        gpt_set_start_lba(p, sa);
+        //p->length = ea - sa;
+        gpt_set_end_lba(p, ea);
+
         return EOK;
 }