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

Timestamp:

2011-07-12T03:00:14Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

6817eba

Parents:

eca52a8 (diff), 026793d (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/cmds.h (modified) (1 diff)

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

@@ -57 +57 @@
 } __attribute__((packed)) usb_massstor_csw_t;
 
-static inline void usb_massstor_cbw_prepare(usb_massstor_cbw_t *cbw,
-    uint32_t tag, uint32_t transfer_length, usb_direction_t dir,
-    uint8_t lun, uint8_t cmd_len, uint8_t *cmd)
-{
-        cbw->dCBWSignature = uint32_host2usb(0x43425355);
-        cbw->dCBWTag = tag;
-        cbw->dCBWDataTransferLength = transfer_length;
-
-        cbw->bmCBWFlags = 0;
-        if (dir == USB_DIRECTION_IN) {
-                cbw->bmCBWFlags |= (1 << 7);
-        }
-
-        /* Only lowest 4 bits. */
-        cbw->bCBWLUN = lun & 0x0F;
-
-        /* Only lowest 5 bits. */
-        cbw->bCBWBLength = cmd_len & 0x1F;
-
-        memcpy(cbw->CBWCB, cmd, cbw->bCBWBLength);
-}
+extern void usb_massstor_cbw_prepare(usb_massstor_cbw_t *, uint32_t, uint32_t,
+    usb_direction_t, uint8_t, uint8_t, const uint8_t *);
 
 #endif