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

Timestamp:

2011-10-30T19:50:54Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3ce78580, 48902fa

Parents:

4c3ad56 (diff), 45bf63c (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

@@ -41 +41 @@
 
 /** Mass storage device. */
-typedef struct {
+typedef struct usbmast_dev {
         /** DDF device */
         ddf_dev_t *ddf_dev;
@@ -47 +47 @@
         usb_device_t *usb_dev;
         /** Number of LUNs */
-        unsigned luns;
+        unsigned lun_count;
+        /** LUN functions */
+        ddf_fun_t **luns;
 } usbmast_dev_t;
+
 
 /** Mass storage function.