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

Timestamp:

2011-07-05T10:43:21Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5e2aa83, bee37cf

Parents:

b5085a7

Message:

Implement Read and Request Sense commands for USB mass storage. In bulk-only
transport fix case when less data is returned by padding + residue. Add note
for case when less data is returned by stalling the pipe.

File:

• uspace/drv/bus/usb/usbmast/scsi_ms.c (modified) (3 diffs)

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

@@ -38 +38 @@
 #include <byteorder.h>
 #include <inttypes.h>
+#include <macros.h>
 #include <usb/dev/driver.h>
 #include <usb/debug.h>
@@ -115 +116 @@
 }
 
+/** Perform SCSI Request Sense command on USB mass storage device.
+ *
+ * @param dev           USB device
+ * @param buf           Destination buffer
+ * @param size          Size of @a buf
+ *
+ * @return              Error code.
+ */
+int usbmast_request_sense(usb_device_t *dev, void *buf, size_t size)
+{
+        scsi_cdb_request_sense_t cdb;
+        size_t data_len;
+        int rc;
+
+        memset(&cdb, 0, sizeof(cdb));
+        cdb.op_code = SCSI_CMD_REQUEST_SENSE;
+        cdb.alloc_len = min(size, SCSI_SENSE_DATA_MAX_SIZE);
+
+        rc = usb_massstor_data_in(dev, 0xDEADBEEF, 0, (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));
+                return rc;
+        }
+
+        if (data_len < SCSI_SENSE_DATA_MIN_SIZE) {
+                /* The missing bytes should be considered to be zeroes. */
+                memset((uint8_t *)buf + data_len, 0,
+                    SCSI_SENSE_DATA_MIN_SIZE - data_len);
+        }
+
+        return EOK;
+}
+
 /** Perform SCSI Read Capacity command on USB mass storage device.
  *
@@ -155 +192 @@
 }
 
+/** 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)
+{
+        scsi_cdb_read_12_t cdb;
+        size_t data_len;
+        int rc;
+
+        /* XXX Need softstate to store block size. */
+
+        if (ba > UINT32_MAX)
+                return ELIMIT;
+
+        if ((uint64_t)nblocks * bsize > UINT32_MAX)
+                return ELIMIT;
+
+        memset(&cdb, 0, sizeof(cdb));
+        cdb.op_code = SCSI_CMD_READ_12;
+        cdb.lba = host2uint32_t_be(ba);
+        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);
+
+        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) {
+                usb_log_error("SCSI Read response too short (%zu).\n",
+                    data_len);
+                return EIO;
+        }
+
+        return EOK;
+}
+
 /**
  * @}