Changeset 4069f5c in mainline for uspace/drv/bus/usb/usbmast/scsi_ms.c

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/scsi_ms.c (modified) (14 diffs)

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

@@ -46 +46 @@
 #include <scsi/sbc.h>
 #include <scsi/spc.h>
-#include "cmds.h"
-#include "mast.h"
+#include "cmdw.h"
+#include "bo_trans.h"
 #include "scsi_ms.h"
+#include "usbmast.h"
 
 /** Get string representation for SCSI peripheral device type.
@@ -62 +63 @@
 /** Perform SCSI Inquiry command on USB mass storage device.
  *
- * @param dev           USB device.
- * @param inquiry_result Where to store parsed inquiry result.
- * @return              Error code.
- */
-int usbmast_inquiry(usb_device_t *dev, usbmast_inquiry_data_t *inq_res)
+ * @param mfun          Mass storage function
+ * @param inquiry_result Where to store parsed inquiry result
+ * @return              Error code
+ */
+int usbmast_inquiry(usbmast_fun_t *mfun, usbmast_inquiry_data_t *inq_res)
 {
         scsi_std_inquiry_data_t inq_data;
@@ -77 +78 @@
         cdb.alloc_len = host2uint16_t_be(sizeof(inq_data));
 
-        rc = usb_massstor_data_in(dev, 0xDEADBEEF, 0, (uint8_t *) &cdb,
+        rc = usb_massstor_data_in(mfun, 0xDEADBEEF, (uint8_t *) &cdb,
             sizeof(cdb), &inq_data, sizeof(inq_data), &response_len);
 
         if (rc != EOK) {
                 usb_log_error("Inquiry failed, device %s: %s.\n",
-                   dev->ddf_dev->name, str_error(rc));
+                   mfun->mdev->ddf_dev->name, str_error(rc));
                 return rc;
         }
@@ -118 +119 @@
 /** Perform SCSI Request Sense command on USB mass storage device.
  *
- * @param dev           USB device
+ * @param mfun          Mass storage function
  * @param buf           Destination buffer
  * @param size          Size of @a buf
@@ -124 +125 @@
  * @return              Error code.
  */
-int usbmast_request_sense(usb_device_t *dev, void *buf, size_t size)
+int usbmast_request_sense(usbmast_fun_t *mfun, void *buf, size_t size)
 {
         scsi_cdb_request_sense_t cdb;
@@ -134 +135 @@
         cdb.alloc_len = min(size, SCSI_SENSE_DATA_MAX_SIZE);
 
-        rc = usb_massstor_data_in(dev, 0xDEADBEEF, 0, (uint8_t *) &cdb,
+        rc = usb_massstor_data_in(mfun, 0xDEADBEEF, (uint8_t *) &cdb,
             sizeof(cdb), buf, size, &data_len);
 
         if (rc != EOK) {
                 usb_log_error("Request Sense failed, device %s: %s.\n",
-                   dev->ddf_dev->name, str_error(rc));
+                   mfun->mdev->ddf_dev->name, str_error(rc));
                 return rc;
         }
@@ -154 +155 @@
 /** Perform SCSI Read Capacity command on USB mass storage device.
  *
- * @param dev           USB device.
- * @param nblocks       Output, number of blocks.
- * @param block_size    Output, block size in bytes.
+ * @param mfun          Mass storage function
+ * @param nblocks       Output, number of blocks
+ * @param block_size    Output, block size in bytes
  *
  * @return              Error code.
  */
-int usbmast_read_capacity(usb_device_t *dev, uint32_t *nblocks,
+int usbmast_read_capacity(usbmast_fun_t *mfun, uint32_t *nblocks,
     uint32_t *block_size)
 {
@@ -171 +172 @@
         cdb.op_code = SCSI_CMD_READ_CAPACITY_10;
 
-        rc = usb_massstor_data_in(dev, 0xDEADBEEF, 0, (uint8_t *) &cdb,
+        rc = usb_massstor_data_in(mfun, 0xDEADBEEF, (uint8_t *) &cdb,
             sizeof(cdb), &data, sizeof(data), &data_len);
 
         if (rc != EOK) {
                 usb_log_error("Read Capacity (10) failed, device %s: %s.\n",
-                   dev->ddf_dev->name, str_error(rc));
+                   mfun->mdev->ddf_dev->name, str_error(rc));
                 return rc;
         }
@@ -194 +195 @@
 /** Perform SCSI Read command on USB mass storage device.
  *
- * @param dev           USB device.
- * @param ba            Address of first block.
- * @param nblocks       Number of blocks to read.
- * @param bsize         Block size.
- *
- * @return              Error code.
- */
-int usbmast_read(usb_device_t *dev, uint64_t ba, size_t nblocks, size_t bsize,
-    void *buf)
+ * @param mfun          Mass storage function
+ * @param ba            Address of first block
+ * @param nblocks       Number of blocks to read
+ *
+ * @return              Error code
+ */
+int usbmast_read(usbmast_fun_t *mfun, uint64_t ba, size_t nblocks, void *buf)
 {
         scsi_cdb_read_12_t cdb;
@@ -213 +212 @@
                 return ELIMIT;
 
-        if ((uint64_t)nblocks * bsize > UINT32_MAX)
+        if ((uint64_t)nblocks * mfun->block_size > UINT32_MAX)
                 return ELIMIT;
 
@@ -221 +220 @@
         cdb.xfer_len = host2uint32_t_be(nblocks);
 
-        rc = usb_massstor_data_in(dev, 0xDEADBEEF, 0, (uint8_t *) &cdb,
-            sizeof(cdb), buf, nblocks * bsize, &data_len);
+        rc = usb_massstor_data_in(mfun, 0xDEADBEEF, (uint8_t *) &cdb,
+            sizeof(cdb), buf, nblocks * mfun->block_size, &data_len);
 
         if (rc != EOK) {
                 usb_log_error("Read (12) failed, device %s: %s.\n",
-                   dev->ddf_dev->name, str_error(rc));
-                return rc;
-        }
-
-        if (data_len < nblocks * bsize) {
+                   mfun->mdev->ddf_dev->name, str_error(rc));
+                return rc;
+        }
+
+        if (data_len < nblocks * mfun->block_size) {
                 usb_log_error("SCSI Read response too short (%zu).\n",
                     data_len);
@@ -241 +240 @@
 /** Perform SCSI Write command on USB mass storage device.
  *
- * @param dev           USB device
+ * @param mfun          Mass storage function
  * @param ba            Address of first block
  * @param nblocks       Number of blocks to read
- * @param bsize         Block size
  * @param data          Data to write
  *
  * @return              Error code
  */
-int usbmast_write(usb_device_t *dev, uint64_t ba, size_t nblocks, size_t bsize,
+int usbmast_write(usbmast_fun_t *mfun, uint64_t ba, size_t nblocks,
     const void *data)
 {
@@ -256 +254 @@
         int rc;
 
-        /* XXX Need softstate to store block size. */
-
         if (ba > UINT32_MAX)
                 return ELIMIT;
 
-        if ((uint64_t)nblocks * bsize > UINT32_MAX)
+        if ((uint64_t)nblocks * mfun->block_size > UINT32_MAX)
                 return ELIMIT;
 
@@ -269 +265 @@
         cdb.xfer_len = host2uint32_t_be(nblocks);
 
-        rc = usb_massstor_data_out(dev, 0xDEADBEEF, 0, (uint8_t *) &cdb,
-            sizeof(cdb), data, nblocks * bsize, &sent_len);
+        rc = usb_massstor_data_out(mfun, 0xDEADBEEF, (uint8_t *) &cdb,
+            sizeof(cdb), data, nblocks * mfun->block_size, &sent_len);
 
         if (rc != EOK) {
                 usb_log_error("Write (12) failed, device %s: %s.\n",
-                   dev->ddf_dev->name, str_error(rc));
-                return rc;
-        }
-
-        if (sent_len < nblocks * bsize) {
+                   mfun->mdev->ddf_dev->name, str_error(rc));
+                return rc;
+        }
+
+        if (sent_len < nblocks * mfun->block_size) {
                 usb_log_error("SCSI Write not all bytes transferred (%zu).\n",
                     sent_len);