sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removed unused transfer flags for usb_storage

Browse source
This commit is contained in:
Wojciech Zajac 2014-06-23 11:06:20 +02:00 committed by Lionel Sambuc
parent cbaad3ed4b
commit d2cf1e60b4
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/usb_storage/urb_helper.c
View file

@ -20,7 +20,7 @@
void void
init_urb(struct ddekit_usb_urb * urb, struct ddekit_usb_dev * dev, 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_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; MASS_DEBUG_DUMP;
@ -43,7 +43,6 @@ init_urb(struct ddekit_usb_urb * urb, struct ddekit_usb_dev * dev,
urb->type = urb_type; urb->type = urb_type;
urb->endpoint = urb_endpoint; urb->endpoint = urb_endpoint;
urb->direction = urb_direction; urb->direction = urb_direction;
urb->transfer_flags = urb_transfer_flags;
} }

2
drivers/usb_storage/urb_helper.h
View file

@ -23,7 +23,7 @@
* declared functions * * declared functions *
*---------------------------*/ *---------------------------*/
void init_urb(struct ddekit_usb_urb *, struct ddekit_usb_dev *, ddekit_int32_t, 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); 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); int blocking_urb_submit(struct ddekit_usb_urb *, ddekit_sem_t *, int);

12
drivers/usb_storage/usb_storage.c
View file

@ -221,7 +221,7 @@ mass_storage_send_scsi_cbw_out(int scsi_cmd, scsi_transfer * info)
/* Reset URB and assign given values */ /* Reset URB and assign given values */
init_urb(&urb, driver_state.cur_periph->dev, DDEKIT_USB_TRANSFER_BLK, 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 */ /* Reset CBW and assign default values */
init_cbw(&cbw, last_cbw_tag = current_cbw_tag++); 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 */ /* Reset URB and assign given values */
init_urb(&urb, driver_state.cur_periph->dev, DDEKIT_USB_TRANSFER_BLK, 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 buffer to URB */
attach_urb_data(&urb, URB_BUF_TYPE_DATA, buf, in_len); 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 */ /* Reset URB and assign given values */
init_urb(&urb, driver_state.cur_periph->dev, DDEKIT_USB_TRANSFER_BLK, 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 buffer to URB */
attach_urb_data(&urb, URB_BUF_TYPE_DATA, buf, out_len); 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 */ /* Reset URB and assign given values */
init_urb(&urb, driver_state.cur_periph->dev, DDEKIT_USB_TRANSFER_BLK, 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 */ /* Clear CSW for receiving */
init_csw(&csw); init_csw(&csw);
@ -344,7 +344,7 @@ mass_storage_send_bulk_reset(void)
/* Reset URB and assign given values */ /* Reset URB and assign given values */
init_urb(&urb, driver_state.cur_periph->dev, DDEKIT_USB_TRANSFER_CTL, 0, init_urb(&urb, driver_state.cur_periph->dev, DDEKIT_USB_TRANSFER_CTL, 0,
DDEKIT_USB_OUT, 0); DDEKIT_USB_OUT);
/* Clear setup data */ /* Clear setup data */
memset(&bulk_setup, 0, sizeof(bulk_setup)); 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 */ /* Reset URB and assign given values */
init_urb(&urb, driver_state.cur_periph->dev, DDEKIT_USB_TRANSFER_CTL, 0, init_urb(&urb, driver_state.cur_periph->dev, DDEKIT_USB_TRANSFER_CTL, 0,
DDEKIT_USB_IN, 0); DDEKIT_USB_IN);
/* Clear setup data */ /* Clear setup data */
memset(&setup_buf, 0, sizeof(setup_buf)); memset(&setup_buf, 0, sizeof(setup_buf));