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

Timestamp:

2011-07-15T21:24:35Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4118f5f, 8ad496d

Parents:

e6b32a8

Message:

Support multiple LUNs in mass storage driver.

File:

• uspace/drv/bus/usb/usbmast/bo_trans.c (modified) (5 diffs)

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

@@ -73 +73 @@
         int rc;
         size_t act_size;
-        usb_pipe_t *bulk_in_pipe = mfun->usb_dev->pipes[BULK_IN_EP].pipe;
-        usb_pipe_t *bulk_out_pipe = mfun->usb_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 */
@@ -209 +209 @@
  * @return              Error code
  */
-int usb_massstor_reset(usbmast_fun_t *mfun)
-{
-        return usb_control_request_set(&mfun->usb_dev->ctrl_pipe,
+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, mfun->usb_dev->interface_no, NULL, 0);
+            0xFF, 0, mdev->usb_dev->interface_no, NULL, 0);
 }
 
@@ -223 +223 @@
  * @param mfun          Mass storage function
  */
-void usb_massstor_reset_recovery(usbmast_fun_t *mfun)
+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(mfun);
-        usb_pipe_clear_halt(&mfun->usb_dev->ctrl_pipe,
-            mfun->usb_dev->pipes[BULK_IN_EP].pipe);
-        usb_pipe_clear_halt(&mfun->usb_dev->ctrl_pipe,
-            mfun->usb_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);
 }
 
@@ -246 +246 @@
  * @return              Error code of maximum LUN (index, not count)
  */
-int usb_massstor_get_max_lun(usbmast_fun_t *mfun)
+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(&mfun->usb_dev->ctrl_pipe,
+        int rc = usb_control_request_get(&mdev->usb_dev->ctrl_pipe,
             USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE,
-            0xFE, 0, mfun->usb_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;
@@ -270 +270 @@
  * @return              Number of LUNs
  */
-size_t usb_masstor_get_lun_count(usbmast_fun_t *mfun)
-{
-        int max_lun = usb_massstor_get_max_lun(mfun);
+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;