← Back to branch summary

~jakub/helenos/ia64-revival

« back to all changes in this revision

Viewing changes to uspace/drv/bus/usb/usbmast/bo_trans.c

  • Committer: Jakub Jermar
  • Date: 2012-02-18 16:47:38 UTC
  • mfrom: (527.1.874 HelenOS.mainline)
  • Revision ID: jakub@jermar.eu-20120218164738-abnijv1f5ckddwd9
Merge mainline changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
uspace/drv/bus/usb/usbmast/bo_trans.c
66
66
        int rc;
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->usb_dev->pipes[BULK_IN_EP].pipe;
 
70
        usb_pipe_t *bulk_out_pipe = &mfun->mdev->usb_dev->pipes[BULK_OUT_EP].pipe;
71
71
        usb_direction_t ddir;
72
72
        void *dbuf;
73
73
        size_t dbuf_size;
117
117
                /* Clear stall condition and continue below to read CSW. */
118
118
                if (ddir == USB_DIRECTION_IN) {
119
119
                        usb_pipe_clear_halt(&mfun->mdev->usb_dev->ctrl_pipe,
120
 
                            mfun->mdev->usb_dev->pipes[BULK_IN_EP].pipe);
 
120
                            &mfun->mdev->usb_dev->pipes[BULK_IN_EP].pipe);
121
121
                } else {
122
122
                        usb_pipe_clear_halt(&mfun->mdev->usb_dev->ctrl_pipe,
123
 
                            mfun->mdev->usb_dev->pipes[BULK_OUT_EP].pipe);
 
123
                            &mfun->mdev->usb_dev->pipes[BULK_OUT_EP].pipe);
124
124
                }
125
125
        } else if (rc != EOK) {
126
126
                return EIO;
215
215
         */
216
216
        usb_massstor_reset(mdev);
217
217
        usb_pipe_clear_halt(&mdev->usb_dev->ctrl_pipe,
218
 
            mdev->usb_dev->pipes[BULK_IN_EP].pipe);
 
218
            &mdev->usb_dev->pipes[BULK_IN_EP].pipe);
219
219
        usb_pipe_clear_halt(&mdev->usb_dev->ctrl_pipe,
220
 
            mdev->usb_dev->pipes[BULK_OUT_EP].pipe);
 
220
            &mdev->usb_dev->pipes[BULK_OUT_EP].pipe);
221
221
}
222
222
 
223
223
/** Get max LUN of a mass storage device.