Changes in uspace/drv/bus/usb/usbmast/bo_trans.c [3e6a98c5:3e23316] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/usb/usbmast/bo_trans.c
r3e6a98c5 r3e23316 67 67 int retval = EOK; 68 68 size_t act_size; 69 usb_pipe_t *bulk_in_pipe = &mfun->mdev->usb_dev->pipes[BULK_IN_EP].pipe;70 usb_pipe_t *bulk_out_pipe = &mfun->mdev->usb_dev->pipes[BULK_OUT_EP].pipe;69 usb_pipe_t *bulk_in_pipe = mfun->mdev->bulk_in_pipe; 70 usb_pipe_t *bulk_out_pipe = mfun->mdev->bulk_out_pipe; 71 71 usb_direction_t ddir; 72 72 void *dbuf; … … 117 117 /* Clear stall condition and continue below to read CSW. */ 118 118 if (ddir == USB_DIRECTION_IN) { 119 usb_pipe_clear_halt(&mfun->mdev->usb_dev->ctrl_pipe, 120 &mfun->mdev->usb_dev->pipes[BULK_IN_EP].pipe); 119 usb_pipe_clear_halt( 120 usb_device_get_default_pipe(mfun->mdev->usb_dev), 121 bulk_in_pipe); 121 122 } else { 122 usb_pipe_clear_halt(&mfun->mdev->usb_dev->ctrl_pipe, 123 &mfun->mdev->usb_dev->pipes[BULK_OUT_EP].pipe); 123 usb_pipe_clear_halt( 124 usb_device_get_default_pipe(mfun->mdev->usb_dev), 125 bulk_out_pipe); 124 126 } 125 127 } else if (rc != EOK) { … … 197 199 int usb_massstor_reset(usbmast_dev_t *mdev) 198 200 { 199 return usb_control_request_set(&mdev->usb_dev->ctrl_pipe, 201 return usb_control_request_set( 202 usb_device_get_default_pipe(mdev->usb_dev), 200 203 USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE, 201 0xFF, 0, mdev->usb_dev->interface_no, NULL, 0);204 0xFF, 0, usb_device_get_iface_number(mdev->usb_dev), NULL, 0); 202 205 } 203 206 … … 215 218 */ 216 219 usb_massstor_reset(mdev); 217 usb_pipe_clear_halt( &mdev->usb_dev->ctrl_pipe,218 &mdev->usb_dev->pipes[BULK_IN_EP].pipe);219 usb_pipe_clear_halt( &mdev->usb_dev->ctrl_pipe,220 &mdev->usb_dev->pipes[BULK_OUT_EP].pipe);220 usb_pipe_clear_halt(usb_device_get_default_pipe(mdev->usb_dev), 221 mdev->bulk_in_pipe); 222 usb_pipe_clear_halt(usb_device_get_default_pipe(mdev->usb_dev), 223 mdev->bulk_out_pipe); 221 224 } 222 225 … … 236 239 uint8_t max_lun; 237 240 size_t data_recv_len; 238 int rc = usb_control_request_get(&mdev->usb_dev->ctrl_pipe, 241 int rc = usb_control_request_get( 242 usb_device_get_default_pipe(mdev->usb_dev), 239 243 USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE, 240 0xFE, 0, mdev->usb_dev->interface_no, &max_lun, 1, &data_recv_len); 244 0xFE, 0, usb_device_get_iface_number(mdev->usb_dev), &max_lun, 1, 245 &data_recv_len); 241 246 if (rc != EOK) { 242 247 return rc;
Note:
See TracChangeset
for help on using the changeset viewer.