]> Zhao Yanbai Git Server - minix.git/commitdiff
Removed unused transfer flags for usb_storage
authorWojciech Zajac <wzajac@jpembedded.eu>
Mon, 23 Jun 2014 09:06:20 +0000 (11:06 +0200)
committerLionel Sambuc <lionel@minix3.org>
Mon, 28 Jul 2014 15:05:54 +0000 (17:05 +0200)
drivers/usb_storage/urb_helper.c
drivers/usb_storage/urb_helper.h
drivers/usb_storage/usb_storage.c

index 7302848fa0b5cc4da72e8e315207f33a947cab06..0756087e3df0bf6cccc9bc88960c3120ad9cf60f 100755 (executable)
@@ -20,7 +20,7 @@
 void
 init_urb(struct ddekit_usb_urb * urb, struct ddekit_usb_dev * dev,
        ddekit_int32_t urb_type, ddekit_int32_t urb_endpoint,
-       ddekit_int32_t urb_direction, ddekit_uint32_t urb_transfer_flags)
+       ddekit_int32_t urb_direction)
 {
        MASS_DEBUG_DUMP;
 
@@ -43,7 +43,6 @@ init_urb(struct ddekit_usb_urb * urb, struct ddekit_usb_dev * dev,
        urb->type = urb_type;
        urb->endpoint = urb_endpoint;
        urb->direction = urb_direction;
-       urb->transfer_flags = urb_transfer_flags;
 }
 
 
index 5046edb65de507307ad708e4a14b7e6f66de53ca..59680526fb5bb1605c3e072167591a6237e639bc 100755 (executable)
@@ -23,7 +23,7 @@
  *    declared functions     *
  *---------------------------*/
 void init_urb(struct ddekit_usb_urb *, struct ddekit_usb_dev *, ddekit_int32_t,
-               ddekit_int32_t, ddekit_int32_t, ddekit_uint32_t);
+               ddekit_int32_t, ddekit_int32_t);
 void attach_urb_data(struct ddekit_usb_urb *, int, void *, ddekit_uint32_t);
 int blocking_urb_submit(struct ddekit_usb_urb *, ddekit_sem_t *, int);
 
index d4d4589f86f34ec66a5d055826fa5025c8ad1c83..0297082def360b316808ac2bc7a93527a78f389f 100755 (executable)
@@ -221,7 +221,7 @@ mass_storage_send_scsi_cbw_out(int scsi_cmd, scsi_transfer * info)
 
        /* Reset URB and assign given values */
        init_urb(&urb, driver_state.cur_periph->dev, DDEKIT_USB_TRANSFER_BLK,
-               driver_state.cur_periph->ep_out, DDEKIT_USB_OUT, 0);
+               driver_state.cur_periph->ep_out, DDEKIT_USB_OUT);
 
        /* Reset CBW and assign default values */
        init_cbw(&cbw, last_cbw_tag = current_cbw_tag++);
@@ -254,7 +254,7 @@ mass_storage_send_scsi_data_in(void * buf, unsigned int in_len)
 
        /* Reset URB and assign given values */
        init_urb(&urb, driver_state.cur_periph->dev, DDEKIT_USB_TRANSFER_BLK,
-               driver_state.cur_periph->ep_in, DDEKIT_USB_IN, 0);
+               driver_state.cur_periph->ep_in, DDEKIT_USB_IN);
 
        /* Attach buffer to URB */
        attach_urb_data(&urb, URB_BUF_TYPE_DATA, buf, in_len);
@@ -280,7 +280,7 @@ mass_storage_send_scsi_data_out(void * buf, unsigned int out_len)
 
        /* Reset URB and assign given values */
        init_urb(&urb, driver_state.cur_periph->dev, DDEKIT_USB_TRANSFER_BLK,
-               driver_state.cur_periph->ep_out, DDEKIT_USB_OUT, 0);
+               driver_state.cur_periph->ep_out, DDEKIT_USB_OUT);
 
        /* Attach buffer to URB */
        attach_urb_data(&urb, URB_BUF_TYPE_DATA, buf, out_len);
@@ -309,7 +309,7 @@ mass_storage_send_scsi_csw_in(void)
 
        /* Reset URB and assign given values */
        init_urb(&urb, driver_state.cur_periph->dev, DDEKIT_USB_TRANSFER_BLK,
-               driver_state.cur_periph->ep_in, DDEKIT_USB_IN, 0);
+               driver_state.cur_periph->ep_in, DDEKIT_USB_IN);
 
        /* Clear CSW for receiving */
        init_csw(&csw);
@@ -344,7 +344,7 @@ mass_storage_send_bulk_reset(void)
 
        /* Reset URB and assign given values */
        init_urb(&urb, driver_state.cur_periph->dev, DDEKIT_USB_TRANSFER_CTL, 0,
-               DDEKIT_USB_OUT, 0);
+               DDEKIT_USB_OUT);
 
        /* Clear setup data */
        memset(&bulk_setup, 0, sizeof(bulk_setup));
@@ -1325,7 +1325,7 @@ mass_storage_get_endpoints(int * ep_in, int * ep_out)
 
        /* Reset URB and assign given values */
        init_urb(&urb, driver_state.cur_periph->dev, DDEKIT_USB_TRANSFER_CTL, 0,
-               DDEKIT_USB_IN, 0);
+               DDEKIT_USB_IN);
 
        /* Clear setup data */
        memset(&setup_buf, 0, sizeof(setup_buf));