Changeset 64639256 in mainline for uspace/drv/bus/usb/usbmast/bo_trans.c

Timestamp:

2011-07-17T09:56:53Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

df0956ee

Parents:

04b3c8c (diff), 4069f5c (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 libposix changes.

File:

• uspace/drv/bus/usb/usbmast/bo_trans.c (moved) (moved from uspace/drv/bus/usb/usbmast/mast.c ) (12 diffs)

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

@@ -32 +32 @@
 /**
  * @file
- * Generic functions for USB mass storage (implementation).
- */
-#include "mast.h"
-#include "cmds.h"
+ * USB mass storage bulk-only transport.
+ */
 #include <bool.h>
 #include <errno.h>
@@ -41 +39 @@
 #include <usb/debug.h>
 #include <usb/dev/request.h>
+
+#include "bo_trans.h"
+#include "cmdw.h"
+#include "usbmast.h"
 
 bool usb_mast_verbose = false;
@@ -53 +55 @@
 /** Send command via bulk-only transport.
  *
+ * @param mfun          Mass storage function
  * @param tag           Command block wrapper tag (automatically compared
  *                      with answer)
- * @param lun           LUN
  * @param cmd           Command block
  * @param cmd_size      Command block size in bytes
@@ -65 +67 @@
  * @return              Error code
  */
-static int usb_massstor_cmd(usb_device_t *dev, uint32_t tag, uint8_t lun,
-    const void *cmd, size_t cmd_size, usb_direction_t ddir, void *dbuf,
-    size_t dbuf_size, size_t *xferred_size)
+static int usb_massstor_cmd(usbmast_fun_t *mfun, uint32_t tag, const void *cmd,
+    size_t cmd_size, usb_direction_t ddir, void *dbuf, size_t dbuf_size,
+    size_t *xferred_size)
 {
         int rc;
         size_t act_size;
-        usb_pipe_t *bulk_in_pipe = dev->pipes[BULK_IN_EP].pipe;
-        usb_pipe_t *bulk_out_pipe = dev->pipes[BULK_OUT_EP].pipe;
+        usb_pipe_t *bulk_in_pipe = mfun->mdev->usb_dev->pipes[BULK_IN_EP].pipe;
+        usb_pipe_t *bulk_out_pipe = mfun->mdev->usb_dev->pipes[BULK_OUT_EP].pipe;
 
         /* Prepare CBW - command block wrapper */
         usb_massstor_cbw_t cbw;
-        usb_massstor_cbw_prepare(&cbw, tag, dbuf_size, ddir, lun, cmd_size,
-            cmd);
+        usb_massstor_cbw_prepare(&cbw, tag, dbuf_size, ddir, mfun->lun,
+            cmd_size, cmd);
 
         /* Send the CBW. */
@@ -164 +166 @@
 /** Perform data-in command.
  *
+ * @param mfun          Mass storage function
  * @param tag           Command block wrapper tag (automatically compared with
  *                      answer)
- * @param lun           LUN
  * @param cmd           CDB (Command Descriptor)
  * @param cmd_size      CDB length in bytes
@@ -175 +177 @@
  * @return Error code
  */
-int usb_massstor_data_in(usb_device_t *dev, uint32_t tag, uint8_t lun,
-    const void *cmd, size_t cmd_size, void *dbuf, size_t dbuf_size, size_t *proc_size)
-{
-        return usb_massstor_cmd(dev, tag, lun, cmd, cmd_size, USB_DIRECTION_IN,
+int usb_massstor_data_in(usbmast_fun_t *mfun, uint32_t tag, const void *cmd,
+    size_t cmd_size, void *dbuf, size_t dbuf_size, size_t *proc_size)
+{
+        return usb_massstor_cmd(mfun, tag, cmd, cmd_size, USB_DIRECTION_IN,
             dbuf, dbuf_size, proc_size);
 }
@@ -184 +186 @@
 /** Perform data-out command.
  *
+ * @param mfun          Mass storage function
  * @param tag           Command block wrapper tag (automatically compared with
  *                      answer)
- * @param lun           LUN
  * @param cmd           CDB (Command Descriptor)
  * @param cmd_size      CDB length in bytes
@@ -195 +197 @@
  * @return Error code
  */
-int usb_massstor_data_out(usb_device_t *dev, uint32_t tag, uint8_t lun,
-    const void *cmd, size_t cmd_size, const void *data, size_t data_size,
-    size_t *proc_size)
-{
-        return usb_massstor_cmd(dev, tag, lun, cmd, cmd_size, USB_DIRECTION_OUT,
+int usb_massstor_data_out(usbmast_fun_t *mfun, uint32_t tag, const void *cmd,
+    size_t cmd_size, const void *data, size_t data_size, size_t *proc_size)
+{
+        return usb_massstor_cmd(mfun, tag, cmd, cmd_size, USB_DIRECTION_OUT,
             (void *) data, data_size, proc_size);
 }
@@ -205 +206 @@
 /** 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,
+ * @param mfun          Mass storage function
+ * @return              Error code
+ */
+int usb_massstor_reset(usbmast_dev_t *mdev)
+{
+        return usb_control_request_set(&mdev->usb_dev->ctrl_pipe,
             USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE,
-            0xFF, 0, dev->interface_no, NULL, 0);
+            0xFF, 0, mdev->usb_dev->interface_no, NULL, 0);
 }
 
@@ -220 +221 @@
  * would reappear on next transaction somehow.
  *
- * @param dev Device to be reseted.
- */
-void usb_massstor_reset_recovery(usb_device_t *dev)
+ * @param mfun          Mass storage function
+ */
+void usb_massstor_reset_recovery(usbmast_dev_t *mdev)
 {
         /* 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_EP].pipe);
-        usb_pipe_clear_halt(&dev->ctrl_pipe, dev->pipes[BULK_OUT_EP].pipe);
+        usb_massstor_reset(mdev);
+        usb_pipe_clear_halt(&mdev->usb_dev->ctrl_pipe,
+            mdev->usb_dev->pipes[BULK_IN_EP].pipe);
+        usb_pipe_clear_halt(&mdev->usb_dev->ctrl_pipe,
+            mdev->usb_dev->pipes[BULK_OUT_EP].pipe);
 }
 
@@ -240 +243 @@
  * 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)
+ * @param mfun          Mass storage function
+ * @return              Error code of maximum LUN (index, not count)
+ */
+int usb_massstor_get_max_lun(usbmast_dev_t *mdev)
 {
         uint8_t max_lun;
         size_t data_recv_len;
-        int rc = usb_control_request_get(&dev->ctrl_pipe,
+        int rc = usb_control_request_get(&mdev->usb_dev->ctrl_pipe,
             USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE,
-            0xFE, 0, dev->interface_no, &max_lun, 1, &data_recv_len);
+            0xFE, 0, mdev->usb_dev->interface_no, &max_lun, 1, &data_recv_len);
         if (rc != EOK) {
                 return rc;
@@ -264 +267 @@
  * (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);
+ * @param mfun          Mass storage function
+ * @return              Number of LUNs
+ */
+size_t usb_masstor_get_lun_count(usbmast_dev_t *mdev)
+{
+        int max_lun = usb_massstor_get_max_lun(mdev);
         if (max_lun < 0) {
                 max_lun = 1;