merge workaround to latest usb class: mstorage.c

This commit is contained in:
hphuang 2020-07-03 11:42:57 +08:00
parent 600eb257a8
commit bfb3f782d4

View File

@ -612,6 +612,7 @@ static rt_err_t _ep_in_handler(ufunction_t func, rt_size_t size)
else else
{ {
//rt_kprintf("warning:in stall path but not stall\n"); //rt_kprintf("warning:in stall path but not stall\n");
/* FIXME: Disable the operation or the disk cannot work. */ /* FIXME: Disable the operation or the disk cannot work. */
//rt_usbd_ep_set_stall(func->device, data->ep_in); //rt_usbd_ep_set_stall(func->device, data->ep_in);
} }
@ -736,7 +737,7 @@ static void _cb_len_calc(ufunction_t func, struct scsi_cmd* cmd,
} }
else else
{ {
// rt_kprintf("cmd_len error %d\n", cmd->cmd_len); rt_kprintf("cmd_len error %d\n", cmd->cmd_len);
} }
} }
@ -752,7 +753,7 @@ static rt_bool_t _cbw_verify(ufunction_t func, struct scsi_cmd* cmd,
data = (struct mstorage*)func->user_data; data = (struct mstorage*)func->user_data;
if(cmd->cmd_len != cbw->cb_len) if(cmd->cmd_len != cbw->cb_len)
{ {
// rt_kprintf("cb_len error\n"); rt_kprintf("cb_len error\n");
cmd->cmd_len = cbw->cb_len; cmd->cmd_len = cbw->cb_len;
} }
@ -783,7 +784,7 @@ static rt_bool_t _cbw_verify(ufunction_t func, struct scsi_cmd* cmd,
if(cbw->xfer_len < data->cb_data_size) if(cbw->xfer_len < data->cb_data_size)
{ {
// rt_kprintf("xfer_len < data_size\n"); rt_kprintf("xfer_len < data_size\n");
data->cb_data_size = cbw->xfer_len; data->cb_data_size = cbw->xfer_len;
data->csw_response.status = 1; data->csw_response.status = 1;
} }