Changeset c47e1a8 in mainline for uspace/srv/bd/part/guid_part/guid_part.c

Timestamp:

2010-05-21T07:50:04Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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:

merge mainline changes (rev. 451)

File:

• uspace/srv/bd/part/guid_part/guid_part.c (modified) (7 diffs)

uspace/srv/bd/part/guid_part/guid_part.c

@@ -79 +79 @@
         bool present;
         /** Address of first block */
-        bn_t start_addr;
+        aoff64_t start_addr;
         /** Number of blocks */
-        bn_t length;
+        aoff64_t length;
         /** Device representing the partition (outbound device) */
         dev_handle_t dev;
@@ -101 +101 @@
 static void gpt_pte_to_part(const gpt_entry_t *pte, part_t *part);
 static void gpt_connection(ipc_callid_t iid, ipc_call_t *icall);
-static int gpt_bd_read(part_t *p, bn_t ba, size_t cnt, void *buf);
-static int gpt_bd_write(part_t *p, bn_t ba, size_t cnt, const void *buf);
-static int gpt_bsa_translate(part_t *p, bn_t ba, size_t cnt, bn_t *gba);
+static int gpt_bd_read(part_t *p, aoff64_t ba, size_t cnt, void *buf);
+static int gpt_bd_write(part_t *p, aoff64_t ba, size_t cnt, const void *buf);
+static int gpt_bsa_translate(part_t *p, aoff64_t ba, size_t cnt, aoff64_t *gba);
 
 int main(int argc, char **argv)
@@ -199 +199 @@
                     / (1024 * 1024);
                 printf(NAME ": Registered device %s: %" PRIu64 " blocks "
-                    "%" PRIuBN " MB.\n", name, part->length, size_mb);
+                    "%" PRIuOFF64 " MB.\n", name, part->length, size_mb);
 
                 part->dev = dev;
@@ -319 +319 @@
         int flags;
         int retval;
-        bn_t ba;
+        aoff64_t ba;
         size_t cnt;
         part_t *part;
@@ -402 +402 @@
 
 /** Read blocks from partition. */
-static int gpt_bd_read(part_t *p, bn_t ba, size_t cnt, void *buf)
-{
-        bn_t gba;
+static int gpt_bd_read(part_t *p, aoff64_t ba, size_t cnt, void *buf)
+{
+        aoff64_t gba;
 
         if (gpt_bsa_translate(p, ba, cnt, &gba) != EOK)
@@ -413 +413 @@
 
 /** Write blocks to partition. */
-static int gpt_bd_write(part_t *p, bn_t ba, size_t cnt, const void *buf)
-{
-        bn_t gba;
+static int gpt_bd_write(part_t *p, aoff64_t ba, size_t cnt, const void *buf)
+{
+        aoff64_t gba;
 
         if (gpt_bsa_translate(p, ba, cnt, &gba) != EOK)
@@ -424 +424 @@
 
 /** Translate block segment address with range checking. */
-static int gpt_bsa_translate(part_t *p, bn_t ba, size_t cnt, bn_t *gba)
+static int gpt_bsa_translate(part_t *p, aoff64_t ba, size_t cnt, aoff64_t *gba)
 {
         if (ba + cnt > p->length)