Changeset 8f6c7785 in mainline for uspace/lib/gpt

Timestamp:

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

Files:

• libgpt.c (modified) (8 diffs)
• libgpt.h (modified) (2 diffs)

uspace/lib/gpt/libgpt.c

@@ -67 +67 @@
         int rc;
         size_t b_size;
-
+        
+        rc = block_init(EXCHANGE_ATOMIC, dev_handle, 512);
+        if (rc != EOK)
+                return NULL;
+        
         rc = block_get_bsize(dev_handle, &b_size);
         if (rc != EOK) {
@@ -73 +77 @@
                 return NULL;
         }
-
+        
         gpt_t * gpt = malloc(sizeof(gpt_t));
         if (gpt == NULL) {
@@ -80 +84 @@
         }
 
-        gpt->raw_data = malloc(b_size);// We might need only sizeof(gpt_header_t),
+        gpt->raw_data = malloc(b_size); // We might need only sizeof(gpt_header_t),
         if (gpt == NULL) {                              // but we should follow specs and have
                 free(gpt);                                      // zeroes through all the rest of the block
@@ -86 +90 @@
                 return NULL;
         }
-
-
+        
+        
         rc = load_and_check_header(dev_handle, GPT_HDR_BA, b_size, gpt->raw_data);
         if (rc == EBADCHECKSUM || rc == EINVAL) {
@@ -103 +107 @@
                 }
         }
-
+        
         gpt->device = dev_handle;
-
+        block_fini(dev_handle);
         return gpt;
-
+        
 fail:
+        block_fini(dev_handle);
         gpt_free_gpt(gpt);
         return NULL;
@@ -130 +135 @@
                                         uint32_t_le2host(gpt->raw_data->header_size));
 
+        rc = block_init(EXCHANGE_ATOMIC, dev_handle, b_size);
+        if (rc != EOK)
+                return rc;
+
         rc = block_get_bsize(dev_handle, &b_size);
-        if (rc != EOK)
-                return rc;
-
-        rc = block_init(EXCHANGE_ATOMIC, dev_handle, b_size);
         if (rc != EOK)
                 return rc;
@@ -252 +257 @@
         gpt->raw_data->pe_array_crc32 = compute_crc32((uint8_t *) parts->part_array, parts->fill * gpt->raw_data->entry_size);
 
+        rc = block_init(EXCHANGE_ATOMIC, dev_handle, b_size);
+        if (rc != EOK)
+                return rc;
+
         rc = block_get_bsize(dev_handle, &b_size);
-        if (rc != EOK)
-                return rc;
-
-        rc = block_init(EXCHANGE_ATOMIC, dev_handle, b_size);
         if (rc != EOK)
                 return rc;
@@ -473 +478 @@
         int rc;
 
-        rc = block_init(EXCHANGE_ATOMIC, dev_handle, b_size);
-        if (rc != EOK)
-                return rc;
-
         rc = block_read_direct(dev_handle, addr, GPT_HDR_BS, header);
-        block_fini(dev_handle);
-        if (rc != EOK)
-                return rc;
-
+        if (rc != EOK)
+                return rc;
 
         unsigned int i;

uspace/lib/gpt/libgpt.h

@@ -153 +153 @@
 extern void                                     gpt_set_start_lba       (gpt_part_t * p, uint64_t start);
 extern uint64_t                         gpt_get_start_lba       (gpt_part_t * p);
-extern void                                     gpt_set_end_lba         (gpt_part_t * p, uint64_t start);
+extern void                                     gpt_set_end_lba         (gpt_part_t * p, uint64_t end);
 extern uint64_t                         gpt_get_end_lba         (gpt_part_t * p);
 extern unsigned char *          gpt_get_part_name       (gpt_part_t * p);
@@ -162 +162 @@
 
 
-#define gpt_foreach(parts, i, iterator) \
-                for(size_t i = 0, gpt_part_t * iterator = parts->part_array; \
-                    i < parts->fill; i++, iterator++)
+#define gpt_part_foreach(parts, iterator) \
+                for(gpt_part_t * iterator = (parts)->part_array; \
+                    iterator < (parts)->part_array + (parts)->fill; ++iterator)
 
 extern void gpt_free_gpt(gpt_t * gpt);