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

Timestamp:

2012-08-31T17:30:29Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2be2506a

Parents:

e0d5bc5 (diff), 0d57c3e (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/drv/bus/usb/usbmast/usbmast.h (modified) (2 diffs)

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

@@ -37 +37 @@
 #define USBMAST_H_
 
+#include <bd_srv.h>
 #include <sys/types.h>
 #include <usb/usb.h>
@@ -68 +69 @@
         /** Block size in bytes */
         size_t block_size;
+        /** Block device service structure */
+        bd_srvs_t bds;
 } usbmast_fun_t;