Changeset b4b534ac in mainline for uspace/drv/bus/usb/usbmast/usbmast.h

Timestamp:

2016-07-22T08:24:47Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

File:

• uspace/drv/bus/usb/usbmast/usbmast.h (modified) (2 diffs)

uspace/drv/bus/usb/usbmast/usbmast.h

@@ -43 +43 @@
 /** Mass storage device. */
 typedef struct usbmast_dev {
-        /** DDF device */
-        ddf_dev_t *ddf_dev;
         /** USB device */
         usb_device_t *usb_dev;
@@ -51 +49 @@
         /** LUN functions */
         ddf_fun_t **luns;
+        /** Data read pipe */
+        usb_pipe_t *bulk_in_pipe;
+        /** Data write pipe */
+        usb_pipe_t *bulk_out_pipe;
 } usbmast_dev_t;