Changes in uspace/drv/bus/usb/usbmast/bo_trans.c [3e23316:3e6a98c5] in mainline

File:

• uspace/drv/bus/usb/usbmast/bo_trans.c (modified) (5 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->bulk_in_pipe;
-        usb_pipe_t *bulk_out_pipe = mfun->mdev->bulk_out_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;
@@ -117 +117 @@
                 /* Clear stall condition and continue below to read CSW. */
                 if (ddir == USB_DIRECTION_IN) {
-                        usb_pipe_clear_halt(
-                            usb_device_get_default_pipe(mfun->mdev->usb_dev),
-                            bulk_in_pipe);
+                        usb_pipe_clear_halt(&mfun->mdev->usb_dev->ctrl_pipe,
+                            &mfun->mdev->usb_dev->pipes[BULK_IN_EP].pipe);
                 } else {
-                        usb_pipe_clear_halt(
-                            usb_device_get_default_pipe(mfun->mdev->usb_dev),
-                            bulk_out_pipe);
+                        usb_pipe_clear_halt(&mfun->mdev->usb_dev->ctrl_pipe,
+                            &mfun->mdev->usb_dev->pipes[BULK_OUT_EP].pipe);
                 }
         } else if (rc != EOK) {
@@ -199 +197 @@
 int usb_massstor_reset(usbmast_dev_t *mdev)
 {
-        return usb_control_request_set(
-            usb_device_get_default_pipe(mdev->usb_dev),
+        return usb_control_request_set(&mdev->usb_dev->ctrl_pipe,
             USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE,
-            0xFF, 0, usb_device_get_iface_number(mdev->usb_dev), NULL, 0);
+            0xFF, 0, mdev->usb_dev->interface_no, NULL, 0);
 }
 
@@ -218 +215 @@
          */
         usb_massstor_reset(mdev);
-        usb_pipe_clear_halt(usb_device_get_default_pipe(mdev->usb_dev),
-            mdev->bulk_in_pipe);
-        usb_pipe_clear_halt(usb_device_get_default_pipe(mdev->usb_dev),
-            mdev->bulk_out_pipe);
+        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);
 }
 
@@ -239 +236 @@
         uint8_t max_lun;
         size_t data_recv_len;
-        int rc = usb_control_request_get(
-            usb_device_get_default_pipe(mdev->usb_dev),
+        int rc = usb_control_request_get(&mdev->usb_dev->ctrl_pipe,
             USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE,
-            0xFE, 0, usb_device_get_iface_number(mdev->usb_dev), &max_lun, 1,
-            &data_recv_len);
+            0xFE, 0, mdev->usb_dev->interface_no, &max_lun, 1, &data_recv_len);
         if (rc != EOK) {
                 return rc;