Changeset 135486d in mainline for uspace/drv/bus/usb/usbmast/main.c

Timestamp:

2012-08-15T14:44:59Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

affaf2e, b546231

Parents:

4802dd7

Message:

Allow more than one client connection to block device.

File:

• uspace/drv/bus/usb/usbmast/main.c (modified) (4 diffs)

uspace/drv/bus/usb/usbmast/main.c

@@ -82 +82 @@
     void *arg);
 
-static int usbmast_bd_open(bd_srv_t *);
+static int usbmast_bd_open(bd_srvs_t *, bd_srv_t *);
 static int usbmast_bd_close(bd_srv_t *);
 static int usbmast_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
@@ -100 +100 @@
 static usbmast_fun_t *bd_srv_usbmast(bd_srv_t *bd)
 {
-        return (usbmast_fun_t *)bd->arg;
+        return (usbmast_fun_t *)bd->srvs->sarg;
 }
 
@@ -240 +240 @@
         mfun->lun = lun;
 
-        bd_srv_init(&mfun->bd);
-        mfun->bd.ops = &usbmast_bd_ops;
-        mfun->bd.arg = mfun;
+        bd_srvs_init(&mfun->bds);
+        mfun->bds.ops = &usbmast_bd_ops;
+        mfun->bds.sarg = mfun;
 
         /* Set up a connection handler. */
@@ -311 +311 @@
 
         mfun = (usbmast_fun_t *) ((ddf_fun_t *)arg)->driver_data;
-        bd_conn(iid, icall, &mfun->bd);
+        bd_conn(iid, icall, &mfun->bds);
 }
 
 /** Open device. */
-static int usbmast_bd_open(bd_srv_t *bd)
+static int usbmast_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
 {
         return EOK;