Changeset bd5f3b7 in mainline for uspace/drv/bus/usb/usbmast/cmdw.h

Timestamp:

2011-08-21T13:07:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00aece0, f1a9e87

Parents:

86a34d3e (diff), a6480d5 (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.h (moved) (moved from uspace/drv/bus/usb/usbmast/cmds.h ) (2 diffs)

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

@@ -34 +34 @@
  */
 
-#ifndef USB_USBMAST_CMDS_H_
-#define USB_USBMAST_CMDS_H_
+#ifndef CMDW_H_
+#define CMDW_H_
 
 #include <sys/types.h>
@@ -57 +57 @@
 } __attribute__((packed)) usb_massstor_csw_t;
 
+enum cmd_block_status {
+        cbs_passed      = 0x00,
+        cbs_failed      = 0x01,
+        cbs_phase_error = 0x02
+};
+
 extern void usb_massstor_cbw_prepare(usb_massstor_cbw_t *, uint32_t, uint32_t,
-    usb_direction_t, uint8_t, uint8_t, uint8_t *);
+    usb_direction_t, uint8_t, uint8_t, const uint8_t *);
 
 #endif