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

Timestamp:

2013-01-26T22:17:49Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

bb70637

Parents:

a6a5b25

Message:

usbmast: Don't access mapped endpoints directly.

Use provided functions.

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->bulk_in_pipe;
+        usb_pipe_t *bulk_out_pipe = mfun->mdev->bulk_out_pipe;
         usb_direction_t ddir;
         void *dbuf;
@@ -119 +119 @@
                         usb_pipe_clear_halt(
                             usb_device_get_default_pipe(mfun->mdev->usb_dev),
-                            &mfun->mdev->usb_dev->pipes[BULK_IN_EP].pipe);
+                            bulk_in_pipe);
                 } else {
                         usb_pipe_clear_halt(
                             usb_device_get_default_pipe(mfun->mdev->usb_dev),
-                            &mfun->mdev->usb_dev->pipes[BULK_OUT_EP].pipe);
+                            bulk_out_pipe);
                 }
         } else if (rc != EOK) {
@@ -219 +219 @@
         usb_massstor_reset(mdev);
         usb_pipe_clear_halt(usb_device_get_default_pipe(mdev->usb_dev),
-            &mdev->usb_dev->pipes[BULK_IN_EP].pipe);
+            mdev->bulk_in_pipe);
         usb_pipe_clear_halt(usb_device_get_default_pipe(mdev->usb_dev),
-            &mdev->usb_dev->pipes[BULK_OUT_EP].pipe);
+            mdev->bulk_out_pipe);
 }