Changeset 8c95dff in mainline for uspace/app/hdisk/func_mbr.c

Timestamp:

2013-11-30T17:49:09Z (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:

f4a47e52

Parents:

802898f

Message:

various bugfixes

File:

• uspace/app/hdisk/func_mbr.c (modified) (13 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);
+static int set_mbr_partition(tinput_t *, mbr_part_t *, label_t *);
 
 int construct_mbr_label(label_t *this)
@@ -66 +66 @@
         mbr_part_t *part = mbr_alloc_partition();
         
-        set_mbr_partition(in, part, this->alignment);
+        rc = set_mbr_partition(in, part, this);
+        if (rc != EOK)
+                return rc;
         
         rc = mbr_add_partition(this->data.mbr, part);
@@ -89 +91 @@
         rc = mbr_remove_partition(this->data.mbr, idx);
         if (rc != EOK) {
-                printf("Error: something.\n");
+                printf("Error: partition does not exist?\n");
         }
         
@@ -106 +108 @@
         if (this->data.mbr == NULL)
                 return ENOMEM;
-        else
-                return EOK;
+        
+        mbr_set_device(this->data.mbr, this->device);
+        return EOK;
 }
 
@@ -115 +118 @@
         int num = 0;
         
-        printf("Current partition scheme (MBR):\n");
+        printf("Current partition scheme (MBR)(number of blocks: %" PRIu64 "):\n", this->nblocks);
         printf("\t\t%10s  %10s %10s %10s %7s\n", "Bootable:", "Start:", "End:", "Length:", "Type:");
         
@@ -121 +124 @@
         
         for (it = mbr_get_first_partition(this->data.mbr); it != NULL;
-             it = mbr_get_next_partition(this->data.mbr, it), ++num) {
+             it = mbr_get_next_partition(this->data.mbr, it)) {
                 if (it->type == PT_UNUSED)
                         continue;
@@ -133 +136 @@
                 printf("\t%10u %10u %10u %7u\n", it->start_addr, it->start_addr + it->length, it->length, it->type);
                 
+                num++;
         }
         
@@ -140 +144 @@
 }
 
-int read_mbr_parts(label_t *this, service_id_t dev_handle)
+int read_mbr_parts(label_t *this)
 {
         int rc;
-        rc = mbr_read_mbr(this->data.mbr, dev_handle);
+        rc = mbr_read_mbr(this->data.mbr, this->device);
         if (rc != EOK)
                 return rc;
@@ -157 +161 @@
 }
 
-int write_mbr_parts(label_t *this, service_id_t dev_handle)
-{
-        int rc = mbr_write_partitions(this->data.mbr, dev_handle);
+int write_mbr_parts(label_t *this)
+{
+        int rc = mbr_write_partitions(this->data.mbr, this->device);
         if (rc != EOK) {
                 printf("Error occured during writing: ERR: %d: %s\n", rc, str_error(rc));
@@ -167 +171 @@
 }
 
-int extra_mbr_funcs(label_t *this, tinput_t *in, service_id_t dev_handle)
+int extra_mbr_funcs(label_t *this, tinput_t *in)
 {
         printf("Not implemented.\n");
@@ -173 +177 @@
 }
 
-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, label_t * this)
 {
         int c;
@@ -214 +218 @@
         uint32_t sa, ea;
 
-        printf("Set starting address (number): ");
+        printf("Set starting address: ");
         sa = get_input_uint32(in);
         if (sa == 0 && errno != EOK)
                 return errno;
         
-        if (alignment != 0 && alignment != 1) {
-                sa = mbr_get_next_aligned(sa, alignment);
+        if (this->alignment != 0 && this->alignment != 1 && sa % this->alignment != 0) {
+                sa = mbr_get_next_aligned(sa, this->alignment);
                 printf("Starting address was aligned to %u.\n", sa);
         }
-
-        printf("Set end addres (number): ");
+        
+        printf("Set end addres (max: %" PRIu64 "): ", this->nblocks);
         ea = get_input_uint32(in);
         if (ea == 0 && errno != EOK)
@@ -233 +237 @@
                 return EINVAL;
         }
-
+        
         p->type = type;
         p->start_addr = sa;