mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-04-16 14:42:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix msc test case 8 and 10

Browse Source
This commit is contained in:
hathach 2021-08-27 23:52:59 +07:00
parent c6b9f8a530
commit 53ea1e1324
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/class/msc/msc_device.c
View File

@ -357,17 +357,25 @@ bool mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t
p_msc->total_len = p_cbw->total_bytes; p_msc->total_len = p_cbw->total_bytes;
p_msc->xferred_len = 0; p_msc->xferred_len = 0;
if (SCSI_CMD_READ_10 == p_cbw->command[0] || SCSI_CMD_WRITE_10 == p_cbw->command[0]) if ( SCSI_CMD_READ_10 == p_cbw->command[0] )
{ {
if ( rdwr10_get_blocksize(p_cbw) == 0 ) // Invalid CBW length == 0 or Direction bit is incorrect
// 6.7 The 13 Cases: case 2, case 3, case 10 -> phase error
if ( rdwr10_get_blocksize(p_cbw) == 0 || !tu_bit_test(p_cbw->dir, 7) )
{ {
// Invalid CBW length == 0 (not match SCSI command block count)
// 6.7.1 BOT The 13 Cases: case 2 and case 3 -> phase error
fail_scsi_op(rhport, p_msc, MSC_CSW_STATUS_PHASE_ERROR); fail_scsi_op(rhport, p_msc, MSC_CSW_STATUS_PHASE_ERROR);
} }else
else if (SCSI_CMD_READ_10 == p_cbw->command[0])
{ {
proc_read10_cmd(rhport, p_msc); proc_read10_cmd(rhport, p_msc);
}
}
else if (SCSI_CMD_WRITE_10 == p_cbw->command[0])
{
// Invalid CBW length == 0 or Direction bit is incorrect
// 6.7 The 13 Cases: case 2, case 3, case 8 -> phase error
if ( rdwr10_get_blocksize(p_cbw) == 0 || tu_bit_test(p_cbw->dir, 7) )
{
fail_scsi_op(rhport, p_msc, MSC_CSW_STATUS_PHASE_ERROR);
}else }else
{ {
proc_write10_cmd(rhport, p_msc); proc_write10_cmd(rhport, p_msc);