Changeset cb569e6 in mainline for uspace/srv/bd/part/mbr_part/mbr_part.c

Timestamp:

2010-11-18T21:58:27Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4e5c7ba

Parents:

69e0d6d (diff), 45f04f8 (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.

File:

• uspace/srv/bd/part/mbr_part/mbr_part.c (modified) (4 diffs)

uspace/srv/bd/part/mbr_part/mbr_part.c

@@ -101 +101 @@
         aoff64_t length;
         /** Device representing the partition (outbound device) */
-        dev_handle_t dev;
+        devmap_handle_t dev;
         /** Points to next partition structure. */
         struct part *next;
@@ -142 +142 @@
 
 /** Partitioned device (inbound device) */
-static dev_handle_t indev_handle;
+static devmap_handle_t indev_handle;
 
 /** List of partitions. This structure is an empty head. */
@@ -181 +181 @@
         int i;
         char *name;
-        dev_handle_t dev;
+        devmap_handle_t dev;
         uint64_t size_mb;
         part_t *part;
@@ -394 +394 @@
         ipc_call_t call;
         ipcarg_t method;
-        dev_handle_t dh;
+        devmap_handle_t dh;
         int flags;
         int retval;