Changeset 8f6c7785 in mainline for uspace/app/hdisk

Timestamp:

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

Location:

uspace/app/hdisk

Files:

• func_gpt.c (modified) (8 diffs)
• func_mbr.c (modified) (3 diffs)
• hdisk.c (modified) (5 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;
 }

uspace/app/hdisk/func_mbr.c

@@ -83 +83 @@
 
         printf("Current partition scheme:\n");
-        printf("\t\tBootable:\tStart:\tEnd:\tLength:\tType:\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.parts, it) {
                 if (it->type == PT_UNUSED)
                         continue;
 
-                printf("\t P%d:\t", num);
+                printf("\tP%d:\t", num);
                 if (mbr_get_flag(it, ST_BOOT))
                         printf("*");
@@ -95 +97 @@
                         printf(" ");
 
-                printf("\t%10u %10u %10u %3d\n", it->start_addr, it->start_addr + it->length, it->length, it->type);
+                printf("\t%10u %10u %10u %7x\n", it->start_addr, it->start_addr + it->length, it->length, it->type);
 
                 ++num;
@@ -101 +103 @@
 
         printf("%d partitions found.\n", num);
+        printf("DEBUG: primary: %hhu, logical: %u\n", data->mbr.parts->n_primary, data->mbr.parts->n_logical);
         
         return EOK;

uspace/app/hdisk/hdisk.c

@@ -73 +73 @@
                 return -1;
         }
-        
+
         init_table();
-        
+
         mbr_t * mbr = mbr_read_mbr(dev_handle);
         if(mbr == NULL) {
@@ -98 +98 @@
                 mbr_free_mbr(mbr);
                 gpt_t * gpt = gpt_read_gpt_header(dev_handle);
+                printf("here3\n");
                 if(gpt == NULL) {
                         printf("Failed to read and parse GPT header. Exiting.\n");
@@ -103 +104 @@
                 }
                 set_table_gpt(gpt);
+                printf("here4\n");
                 gpt_partitions_t * parts = gpt_read_partitions(gpt);
+                printf("here5\n");
                 if(parts == NULL) {
                         printf("Failed to read and parse partitions.\n" \
@@ -114 +117 @@
 
         rc = interact(dev_handle);
-
+        
         free_table();
-
+        
         return rc;
 }
@@ -188 +191 @@
                 input = getchar();
                 printf("%c\n", input);
-                
+
 
                 //rc = tinput_read(in, &str);