Changeset b224a3e in mainline for uspace/srv/bd/file_bd/file_bd.c

Timestamp:

2012-08-15T23:55:32Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

681a985

Parents:

71b0d4d4 (diff), b8b742e (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/file_bd/file_bd.c (modified) (4 diffs)

uspace/srv/bd/file_bd/file_bd.c

@@ -62 +62 @@
 
 static service_id_t service_id;
-static bd_srv_t bd_srv;
+static bd_srvs_t bd_srvs;
 static fibril_mutex_t dev_lock;
 
@@ -69 +69 @@
 static void file_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *);
 
-static int file_bd_open(bd_srv_t *);
+static int file_bd_open(bd_srvs_t *, bd_srv_t *);
 static int file_bd_close(bd_srv_t *);
 static int file_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
@@ -154 +154 @@
 static int file_bd_init(const char *fname)
 {
-        bd_srv_init(&bd_srv);
-        bd_srv.ops = &file_bd_ops;
+        bd_srvs_init(&bd_srvs);
+        bd_srvs.ops = &file_bd_ops;
         
         async_set_client_connection(file_bd_connection);
@@ -188 +188 @@
 static void file_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
-        bd_conn(iid, icall, &bd_srv);
+        bd_conn(iid, icall, &bd_srvs);
 }
 
 /** Open device. */
-static int file_bd_open(bd_srv_t *bd)
+static int file_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
 {
         return EOK;