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

Timestamp:

2012-08-14T19:27:42Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

f7ea5400

Parents:

14c5005 (diff), 4802dd7 (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 server structure */
+        bd_srv_t bd;
 } usbmast_fun_t;