Changes in uspace/drv/usbmast/mast.c [5f0fe4e9:380e0364] in mainline

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;
@@ -64 +63 @@
  * @return Error code.
  */
-int usb_massstor_data_in(usb_device_t *dev,
-    size_t bulk_in_pipe_index, size_t bulk_out_pipe_index,
+int usb_massstor_data_in(usb_pipe_t *bulk_in_pipe, usb_pipe_t *bulk_out_pipe,
     uint32_t tag, uint8_t lun, void *cmd, size_t cmd_size,
     void *in_buffer, size_t in_buffer_size, size_t *received_size)
@@ -71 +69 @@
         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 */
@@ -139 +135 @@
 }
 
-/** Perform bulk-only mass storage reset.
- *
- * @param dev Device to be reseted.
- * @return Error code.
- */
-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);
-}
-
-/** Perform complete reset recovery of bulk-only mass storage.
- *
- * Notice that no error is reported because if this fails, the error
- * would reappear on next transaction somehow.
- *
- * @param dev Device to be reseted.
- * @param bulk_in_idx Index of bulk in pipe.
- * @param bulk_out_idx Index of bulk out pipe.
- */
-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);
-}
-
-/** Get max LUN of a mass storage device.
- *
- * @see usb_masstor_get_lun_count
- *
- * @warning Error from this command does not necessarily indicate malfunction
- * of the device. Device does not need to support this request.
- * You shall rather use usb_masstor_get_lun_count.
- *
- * @param dev Mass storage device.
- * @return Error code of maximum LUN (index, not count).
- */
-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;
-}
-
-/** Get number of LUNs supported by mass storage device.
- *
- * @warning This function hides any error during the request
- * (typically that shall not be a problem).
- *
- * @param dev Mass storage device.
- * @return Number of LUNs.
- */
-size_t usb_masstor_get_lun_count(usb_device_t *dev)
-{
-        int max_lun = usb_massstor_get_max_lun(dev);
-        if (max_lun < 0) {
-                max_lun = 1;
-        } else {
-                max_lun++;
-        }
-
-        return (size_t) max_lun;
-}
-
 /**
  * @}