Skip to content

Commit bfb3f78

Browse files
committed
merge workaround to latest usb class: mstorage.c
1 parent 600eb25 commit bfb3f78

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

components/drivers/usb/usbdevice/class/mstorage.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -610,10 +610,11 @@ static rt_err_t _ep_in_handler(ufunction_t func, rt_size_t size)
610610
rt_usbd_ep_set_stall(func->device, data->ep_out);
611611
}
612612
else
613-
{
613+
{
614614
//rt_kprintf("warning:in stall path but not stall\n");
615+
615616
/* FIXME: Disable the operation or the disk cannot work. */
616-
//rt_usbd_ep_set_stall(func->device, data->ep_in);
617+
//rt_usbd_ep_set_stall(func->device, data->ep_in);
617618
}
618619
data->csw_response.data_reside = 0;
619620
}
@@ -736,7 +737,7 @@ static void _cb_len_calc(ufunction_t func, struct scsi_cmd* cmd,
736737
}
737738
else
738739
{
739-
// rt_kprintf("cmd_len error %d\n", cmd->cmd_len);
740+
rt_kprintf("cmd_len error %d\n", cmd->cmd_len);
740741
}
741742
}
742743

@@ -752,7 +753,7 @@ static rt_bool_t _cbw_verify(ufunction_t func, struct scsi_cmd* cmd,
752753
data = (struct mstorage*)func->user_data;
753754
if(cmd->cmd_len != cbw->cb_len)
754755
{
755-
// rt_kprintf("cb_len error\n");
756+
rt_kprintf("cb_len error\n");
756757
cmd->cmd_len = cbw->cb_len;
757758
}
758759

@@ -783,7 +784,7 @@ static rt_bool_t _cbw_verify(ufunction_t func, struct scsi_cmd* cmd,
783784

784785
if(cbw->xfer_len < data->cb_data_size)
785786
{
786-
// rt_kprintf("xfer_len < data_size\n");
787+
rt_kprintf("xfer_len < data_size\n");
787788
data->cb_data_size = cbw->xfer_len;
788789
data->csw_response.status = 1;
789790
}

0 commit comments

Comments
 (0)