Changeset f2962621 in mainline for uspace/lib/block/libblock.c

Timestamp:

2010-12-17T10:14:01Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

6e5dc07

Parents:

9223dc5c (diff), 11658b64 (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 with usb/development

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;