Changeset 4069f5c in mainline for uspace/drv/bus/usb/usbmast/bo_trans.h

Timestamp:

2011-07-17T09:52:42Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

64639256, ca1f1ec

Parents:

27eddb52 (diff), 4118f5f (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/bo_trans.h (moved) (moved from uspace/drv/bus/usb/usbmast/mast.h ) (2 diffs)

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

@@ -31 +31 @@
  */
 /** @file
- * Generic functions for USB mass storage.
+ * USB mass storage bulk-only transport.
  */
 
-#ifndef USB_USBMAST_MAST_H_
-#define USB_USBMAST_MAST_H_
+#ifndef BO_TRANS_H_
+#define BO_TRANS_H_
 
 #include <scsi/spc.h>
@@ -42 +42 @@
 #include <usb/dev/pipes.h>
 #include <usb/dev/driver.h>
+#include "usbmast.h"
 
 #define BULK_IN_EP 0
 #define BULK_OUT_EP 1
 
-extern int usb_massstor_data_in(usb_device_t *, uint32_t, uint8_t, const void *,
+extern int usb_massstor_data_in(usbmast_fun_t *, uint32_t, const void *,
     size_t, void *, size_t, size_t *);
-extern int usb_massstor_data_out(usb_device_t *, uint32_t, uint8_t, const void *,
+extern int usb_massstor_data_out(usbmast_fun_t *, uint32_t, const void *,
     size_t, const void *, size_t, size_t *);
-extern int usb_massstor_reset(usb_device_t *);
-extern void usb_massstor_reset_recovery(usb_device_t *);
-extern int usb_massstor_get_max_lun(usb_device_t *);
-extern size_t usb_masstor_get_lun_count(usb_device_t *);
+extern int usb_massstor_reset(usbmast_dev_t *);
+extern void usb_massstor_reset_recovery(usbmast_dev_t *);
+extern int usb_massstor_get_max_lun(usbmast_dev_t *);
+extern size_t usb_masstor_get_lun_count(usbmast_dev_t *);
 
 #endif