Changeset ce25903 in mainline

Timestamp:

2015-07-03T20:02:58Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

34c9cfc

Parents:

8fc61c8

Message:

ubsmast: Add Test Unit Ready command

Fixes my two flash drive

Location:

uspace

Files:

• drv/bus/usb/usbmast/scsi_ms.c (modified) (3 diffs)
• lib/scsi/include/scsi/spc.h (modified) (2 diffs)

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

@@ -63 +63 @@
 static void usbmast_dump_sense(scsi_sense_data_t *sense_buf)
 {
-        unsigned sense_key;
-
-        sense_key = sense_buf->flags_key & 0x0f;
+        const unsigned sense_key = sense_buf->flags_key & 0x0f;
         printf("Got sense data. Sense key: 0x%x (%s), ASC 0x%02x, "
             "ASCQ 0x%02x.\n", sense_key,
@@ -73 +71 @@
 }
 
+static int usb_massstor_unit_ready(usbmast_fun_t *mfun)
+{
+        scsi_cmd_t cmd;
+        scsi_cdb_test_unit_ready_t cdb;
+        int rc;
+
+        memset(&cdb, 0, sizeof(cdb));
+        cdb.op_code = SCSI_CMD_TEST_UNIT_READY;
+
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.cdb = &cdb;
+        cmd.cdb_size = sizeof(cdb);
+
+        rc = usb_massstor_cmd(mfun, 0xDEADBEEF, &cmd);
+
+        if (rc != EOK || cmd.status != CMDS_GOOD) {
+                usb_log_error("Test Unit Ready failed, device %s: %s.\n",
+                   usb_device_get_name(mfun->mdev->usb_dev), str_error(rc));
+                return rc;
+        }
+
+        return EOK;
+}
+
 /** Run SCSI command.
  *
@@ -85 +107 @@
 
         do {
+                rc = usb_massstor_unit_ready(mfun);
+                if (rc != EOK) {
+                        usb_log_error("Inquiry transport failed, device %s: %s.\n",
+                           usb_device_get_name(mfun->mdev->usb_dev), str_error(rc));
+                        return rc;
+                }
+
                 rc = usb_massstor_cmd(mfun, 0xDEADBEEF, cmd);
                 if (rc != EOK) {

uspace/lib/scsi/include/scsi/spc.h

@@ -42 +42 @@
 /** SCSI command codes defined in SCSI-SPC */
 enum scsi_cmd_spc {
-        SCSI_CMD_INQUIRY        = 0x12,
-        SCSI_CMD_REQUEST_SENSE  = 0x03
+        SCSI_CMD_TEST_UNIT_READY = 0x00,
+        SCSI_CMD_REQUEST_SENSE   = 0x03,
+        SCSI_CMD_INQUIRY         = 0x12,
 };
 
@@ -220 +221 @@
 extern const char *scsi_get_sense_key_str(unsigned);
 
+/** SCSI Test Unit Ready command */
+typedef struct {
+        /** Operation code (SCSI_CMD_TEST_UNIT_READY) */
+        uint8_t op_code;
+        /** Reserved */
+        uint32_t reserved;
+        /* Control */
+        uint8_t control;
+} __attribute__((packed)) scsi_cdb_test_unit_ready_t;
+
 #endif