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

Timestamp:

2013-01-25T22:21:13Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

945d66c

Parents:

f6b2a76b

Message:

usb, drivers: Use usb_device_* wrappers.

File:

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

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

@@ -117 +117 @@
                 /* Clear stall condition and continue below to read CSW. */
                 if (ddir == USB_DIRECTION_IN) {
-                        usb_pipe_clear_halt(&mfun->mdev->usb_dev->ctrl_pipe,
+                        usb_pipe_clear_halt(
+                            usb_device_get_default_pipe(mfun->mdev->usb_dev),
                             &mfun->mdev->usb_dev->pipes[BULK_IN_EP].pipe);
                 } else {
-                        usb_pipe_clear_halt(&mfun->mdev->usb_dev->ctrl_pipe,
+                        usb_pipe_clear_halt(
+                            usb_device_get_default_pipe(mfun->mdev->usb_dev),
                             &mfun->mdev->usb_dev->pipes[BULK_OUT_EP].pipe);
                 }
@@ -197 +199 @@
 int usb_massstor_reset(usbmast_dev_t *mdev)
 {
-        return usb_control_request_set(&mdev->usb_dev->ctrl_pipe,
+        return usb_control_request_set(
+            usb_device_get_default_pipe(mdev->usb_dev),
             USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE,
             0xFF, 0, mdev->usb_dev->interface_no, NULL, 0);
@@ -215 +218 @@
          */
         usb_massstor_reset(mdev);
-        usb_pipe_clear_halt(&mdev->usb_dev->ctrl_pipe,
+        usb_pipe_clear_halt(usb_device_get_default_pipe(mdev->usb_dev),
             &mdev->usb_dev->pipes[BULK_IN_EP].pipe);
-        usb_pipe_clear_halt(&mdev->usb_dev->ctrl_pipe,
+        usb_pipe_clear_halt(usb_device_get_default_pipe(mdev->usb_dev),
             &mdev->usb_dev->pipes[BULK_OUT_EP].pipe);
 }
@@ -236 +239 @@
         uint8_t max_lun;
         size_t data_recv_len;
-        int rc = usb_control_request_get(&mdev->usb_dev->ctrl_pipe,
+        int rc = usb_control_request_get(
+            usb_device_get_default_pipe(mdev->usb_dev),
             USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE,
             0xFE, 0, mdev->usb_dev->interface_no, &max_lun, 1, &data_recv_len);