Changeset ff381a7 in mainline for uspace/lib/block

Timestamp:

2015-11-02T20:54:19Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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.

Location:

uspace/lib/block

Files:

• block.c (modified) (1 diff)
• block.h (modified) (1 diff)

uspace/lib/block/block.c

@@ -144 +144 @@
 }
 
-int block_init(exch_mgmt_t mgmt, service_id_t service_id,
-    size_t comm_size)
+int block_init(service_id_t service_id, size_t comm_size)
 {
         bd_t *bd;
 
-        async_sess_t *sess = loc_service_connect(mgmt, service_id,
+        async_sess_t *sess = loc_service_connect(service_id, INTERFACE_BLOCK,
             IPC_FLAG_BLOCKING);
         if (!sess) {

uspace/lib/block/block.h

@@ -99 +99 @@
 };
 
-extern int block_init(exch_mgmt_t, service_id_t, size_t);
+extern int block_init(service_id_t, size_t);
 extern void block_fini(service_id_t);