Changeset 26e7d6d in mainline for uspace/drv/bus/usb/usbmast/cmdw.c

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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/cmdw.c (moved) (moved from uspace/drv/usbmast/cmds.h ) (2 diffs)

uspace/drv/bus/usb/usbmast/cmdw.c

@@ -34 +34 @@
  */
 
-#ifndef USB_USBMAST_CMDS_H_
-#define USB_USBMAST_CMDS_H_
-
+#include <byteorder.h>
+#include <mem.h>
 #include <sys/types.h>
 #include <usb/usb.h>
+#include "cmdw.h"
 
-typedef struct {
-        uint32_t dCBWSignature;
-        uint32_t dCBWTag;
-        uint32_t dCBWDataTransferLength;
-        uint8_t bmCBWFlags;
-        uint8_t bCBWLUN;
-        uint8_t bCBWBLength;
-        uint8_t CBWCB[16];
-} __attribute__((packed)) usb_massstor_cbw_t;
-
-typedef struct {
-        uint32_t dCSWSignature;
-        uint32_t dCSWTag;
-        uint32_t dCSWDataResidue;
-        uint8_t dCSWStatus;
-} __attribute__((packed)) usb_massstor_csw_t;
-
-static inline void usb_massstor_cbw_prepare(usb_massstor_cbw_t *cbw,
+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)
+    uint8_t lun, uint8_t cmd_len, const uint8_t *cmd)
 {
         cbw->dCBWSignature = uint32_host2usb(0x43425355);
@@ -79 +62 @@
 }
 
-#endif
-
 /**
  * @}