Changeset 357b5f5 in mainline for uspace/lib/block/libblock.c

Timestamp:

2011-01-23T20:09:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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/lib/block/libblock.c (modified) (2 diffs)

uspace/lib/block/libblock.c

@@ -862 +862 @@
 static int get_block_size(int dev_phone, size_t *bsize)
 {
-        ipcarg_t bs;
+        sysarg_t bs;
         int rc;
 
@@ -875 +875 @@
 static int get_num_blocks(int dev_phone, aoff64_t *nblocks)
 {
-        ipcarg_t nb_l, nb_h;
+        sysarg_t nb_l, nb_h;
         int rc;