Changeset 70c12d6 in mainline for uspace/drv/usbmast/mast.c

Timestamp:

2011-05-11T19:20:06Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

cf002dbf

Parents:

19387b61

Message:

Fix inquiry of USB mass storage

The problem was bad endianness in SCSI command descriptor block
(damn, why we need different endianness at all?).

File:

• uspace/drv/usbmast/mast.c (modified) (4 diffs)

uspace/drv/usbmast/mast.c

@@ -40 +40 @@
 #include <str_error.h>
 #include <usb/debug.h>
+#include <usb/request.h>
 
 bool usb_mast_verbose = true;
@@ -63 +64 @@
  * @return Error code.
  */
-int usb_massstor_data_in(usb_pipe_t *bulk_in_pipe, usb_pipe_t *bulk_out_pipe,
+int usb_massstor_data_in(usb_device_t *dev,
+    size_t bulk_in_pipe_index, size_t bulk_out_pipe_index,
     uint32_t tag, uint8_t lun, void *cmd, size_t cmd_size,
     void *in_buffer, size_t in_buffer_size, size_t *received_size)
@@ -69 +71 @@
         int rc;
         size_t act_size;
+        usb_pipe_t *bulk_in_pipe = dev->pipes[bulk_in_pipe_index].pipe;
+        usb_pipe_t *bulk_out_pipe = dev->pipes[bulk_out_pipe_index].pipe;
 
         /* Prepare CBW - command block wrapper */
@@ -135 +139 @@
 }
 
+int usb_massstor_reset(usb_device_t *dev)
+{
+        return usb_control_request_set(&dev->ctrl_pipe,
+            USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE,
+            0xFF, 0, dev->interface_no, NULL, 0);
+}
+
+void usb_massstor_reset_recovery(usb_device_t *dev,
+    size_t bulk_in_idx, size_t bulk_out_idx)
+{
+        /* We would ignore errors here because if this fails
+         * we are doomed anyway and any following transaction would fail.
+         */
+        usb_massstor_reset(dev);
+        usb_pipe_clear_halt(&dev->ctrl_pipe, dev->pipes[bulk_in_idx].pipe);
+        usb_pipe_clear_halt(&dev->ctrl_pipe, dev->pipes[bulk_out_idx].pipe);
+}
+
+int usb_massstor_get_max_lun(usb_device_t *dev)
+{
+        uint8_t max_lun;
+        size_t data_recv_len;
+        int rc = usb_control_request_get(&dev->ctrl_pipe,
+            USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE,
+            0xFE, 0, dev->interface_no, &max_lun, 1, &data_recv_len);
+        if (rc != EOK) {
+                return rc;
+        }
+        if (data_recv_len != 1) {
+                return EEMPTY;
+        }
+        return (int) max_lun;
+}
+
 /**
  * @}