Changeset 8ff0bd2 in mainline for uspace/drv/bus/usb/usbmast

Timestamp:

2011-09-04T11:30:58Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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

Location:

uspace/drv/bus/usb/usbmast

Files:

• Makefile (moved) (moved from uspace/drv/usbmast/Makefile ) (1 diff)
• bo_trans.c (added)
• bo_trans.h (added)
• cmdw.c (moved) (moved from uspace/drv/usbmast/cmds.h ) (2 diffs)
• cmdw.h (added)
• main.c (added)
• scsi.h (moved) (moved from uspace/drv/usbmast/scsi.h )
• scsi_ms.c (added)
• scsi_ms.h (moved) (moved from uspace/drv/usbmast/mast.h ) (1 diff)
• usbmast.h (added)
• usbmast.ma (moved) (moved from uspace/drv/usbmast/usbmast.ma )

uspace/drv/bus/usb/usbmast/Makefile

@@ -27 +27 @@
 #
 
-USPACE_PREFIX = ../..
+USPACE_PREFIX = ../../../..
 
 LIBS = \
         $(LIBUSBDEV_PREFIX)/libusbdev.a \
         $(LIBUSB_PREFIX)/libusb.a \
-        $(LIBDRV_PREFIX)/libdrv.a
+        $(LIBDRV_PREFIX)/libdrv.a \
+        $(LIBSCSI_PREFIX)/libscsi.a
+
 EXTRA_CFLAGS += \
         -I$(LIBUSB_PREFIX)/include \
         -I$(LIBUSBDEV_PREFIX)/include \
-        -I$(LIBDRV_PREFIX)/include
+        -I$(LIBDRV_PREFIX)/include \
+        -I$(LIBSCSI_PREFIX)/include
 
 BINARY = usbmast
 
 SOURCES = \
-        inquiry.c \
+        bo_trans.c \
+        cmdw.c \
         main.c \
-        mast.c
+        scsi_ms.c
 
 include $(USPACE_PREFIX)/Makefile.common

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
-
 /**
  * @}

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

@@ -31 +31 @@
  */
 /** @file
- * Generic functions for USB mass storage.
+ * SCSI functions for USB mass storage.
  */
 
-#ifndef USB_USBMAST_MAST_H_
-#define USB_USBMAST_MAST_H_
+#ifndef USB_USBMAST_SCSI_MS_H_
+#define USB_USBMAST_SCSI_MS_H_
 
+#include <scsi/spc.h>
 #include <sys/types.h>
 #include <usb/usb.h>
-#include <usb/dev/pipes.h>
 #include <usb/dev/driver.h>
 
-/** Result of SCSI INQUIRY command.
+/** Result of SCSI Inquiry command.
  * This is already parsed structure, not the original buffer returned by
  * the device.
  */
 typedef struct {
-        /** SCSI peripheral device type. */
-        int peripheral_device_type;
-        /** Whether the device is removable. */
+        /** SCSI peripheral device type */
+        unsigned device_type;
+        /** Whether the device is removable */
         bool removable;
-        /** Vendor ID string. */
-        char vendor_id[9];
-        /** Product ID and product revision string. */
-        char product_and_revision[12];
-} usb_massstor_inquiry_result_t;
+        /** Vendor ID string */
+        char vendor[SCSI_INQ_VENDOR_STR_BUFSIZE];
+        /** Product ID string */
+        char product[SCSI_INQ_PRODUCT_STR_BUFSIZE];
+        /** Revision string */
+        char revision[SCSI_INQ_REVISION_STR_BUFSIZE];
+} usbmast_inquiry_data_t;
 
-int usb_massstor_data_in(usb_device_t *dev, size_t, size_t,
-    uint32_t, uint8_t, void *, size_t, void *, size_t, size_t *);
-int usb_massstor_reset(usb_device_t *);
-void usb_massstor_reset_recovery(usb_device_t *, size_t, size_t);
-int usb_massstor_get_max_lun(usb_device_t *);
-size_t usb_masstor_get_lun_count(usb_device_t *);
-int usb_massstor_inquiry(usb_device_t *, size_t, size_t,
-    usb_massstor_inquiry_result_t *);
-const char *usb_str_masstor_scsi_peripheral_device_type(int);
+extern int usbmast_inquiry(usbmast_fun_t *, usbmast_inquiry_data_t *);
+extern int usbmast_request_sense(usbmast_fun_t *, void *, size_t);
+extern int usbmast_read_capacity(usbmast_fun_t *, uint32_t *, uint32_t *);
+extern int usbmast_read(usbmast_fun_t *, uint64_t, size_t, void *);
+extern int usbmast_write(usbmast_fun_t *, uint64_t, size_t, const void *);
+extern const char *usbmast_scsi_dev_type_str(unsigned);
 
 #endif