Changes in uspace/drv/bus/usb/usbmast/cmds.h [38c9505:5203e256] in mainline

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;
 
-extern void usb_massstor_cbw_prepare(usb_massstor_cbw_t *, uint32_t, uint32_t,
-    usb_direction_t, uint8_t, uint8_t, const uint8_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);
+}
 
 #endif