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

Timestamp:

2011-12-18T14:02:30Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (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 mainline changes.

File:

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

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

@@ -67 +67 @@
         int retval = EOK;
         size_t act_size;
-        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;
+        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;
         usb_direction_t ddir;
         void *dbuf;
@@ -118 +118 @@
                 if (ddir == USB_DIRECTION_IN) {
                         usb_pipe_clear_halt(&mfun->mdev->usb_dev->ctrl_pipe,
-                            mfun->mdev->usb_dev->pipes[BULK_IN_EP].pipe);
+                            &mfun->mdev->usb_dev->pipes[BULK_IN_EP].pipe);
                 } else {
                         usb_pipe_clear_halt(&mfun->mdev->usb_dev->ctrl_pipe,
-                            mfun->mdev->usb_dev->pipes[BULK_OUT_EP].pipe);
+                            &mfun->mdev->usb_dev->pipes[BULK_OUT_EP].pipe);
                 }
         } else if (rc != EOK) {
@@ -216 +216 @@
         usb_massstor_reset(mdev);
         usb_pipe_clear_halt(&mdev->usb_dev->ctrl_pipe,
-            mdev->usb_dev->pipes[BULK_IN_EP].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);
+            &mdev->usb_dev->pipes[BULK_OUT_EP].pipe);
 }