kingkevin
/
passkey_fw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

passed all USBCV bot complaince test

This commit is contained in:
hathach 2021-08-29 13:34:47 +07:00
parent ee18cc42f2
commit 4e3ed8159e
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,20 +108,21 @@ static void fail_scsi_op(uint8_t rhport, mscd_interface_t* p_msc, uint8_t status
msc_cbw_t const * p_cbw = &p_msc->cbw; msc_cbw_t const * p_cbw = &p_msc->cbw;
msc_csw_t * p_csw = &p_msc->csw; msc_csw_t * p_csw = &p_msc->csw;
// data_residue will be calculated before sending out csw p_csw->status = status;
p_csw->status = status; p_csw->data_residue = p_msc->cbw.total_bytes - p_msc->xferred_len;
p_msc->stage = MSC_STAGE_STATUS; p_msc->stage = MSC_STAGE_STATUS;
// failed but sense key is not set: default to Illegal Request // failed but sense key is not set: default to Illegal Request
if ( p_msc->sense_key == 0 ) tud_msc_set_sense(p_cbw->lun, SCSI_SENSE_ILLEGAL_REQUEST, 0x20, 0x00); if ( p_msc->sense_key == 0 ) tud_msc_set_sense(p_cbw->lun, SCSI_SENSE_ILLEGAL_REQUEST, 0x20, 0x00);
// If there is data stage, stall it // If there is data stage and not yet complete, stall it
if ( p_cbw->total_bytes ) if ( p_cbw->total_bytes && p_csw->data_residue )
{ {
if ( is_data_in(p_cbw->dir) ) if ( is_data_in(p_cbw->dir) )
{ {
usbd_edpt_stall(rhport, p_msc->ep_in); usbd_edpt_stall(rhport, p_msc->ep_in);
}else }
else
{ {
usbd_edpt_stall(rhport, p_msc->ep_out); usbd_edpt_stall(rhport, p_msc->ep_out);
} }
@ -481,6 +482,8 @@ bool mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t
} }
else else
{ {
p_msc->xferred_len += xferred_bytes;
// OUT transfer, invoke callback if needed // OUT transfer, invoke callback if needed
if ( !is_data_in(p_cbw->dir) ) if ( !is_data_in(p_cbw->dir) )
{ {
@ -497,8 +500,6 @@ bool mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t
} }
} }
p_msc->xferred_len += xferred_bytes;
if ( p_msc->xferred_len >= p_msc->total_len ) if ( p_msc->xferred_len >= p_msc->total_len )
{ {
// Data Stage is complete // Data Stage is complete
@ -767,7 +768,8 @@ static void proc_read10_cmd(uint8_t rhport, mscd_interface_t* p_msc)
int32_t nbytes = (int32_t) tu_min32(sizeof(_mscd_buf), p_cbw->total_bytes-p_msc->xferred_len); int32_t nbytes = (int32_t) tu_min32(sizeof(_mscd_buf), p_cbw->total_bytes-p_msc->xferred_len);
// Application can consume smaller bytes // Application can consume smaller bytes
nbytes = tud_msc_read10_cb(p_cbw->lun, lba, p_msc->xferred_len % block_sz, _mscd_buf, (uint32_t) nbytes); uint32_t const offset = p_msc->xferred_len % block_sz;
nbytes = tud_msc_read10_cb(p_cbw->lun, lba, offset, _mscd_buf, (uint32_t) nbytes);
if ( nbytes < 0 ) if ( nbytes < 0 )
{ {
@ -827,14 +829,18 @@ static void proc_write10_new_data(uint8_t rhport, mscd_interface_t* p_msc, uint3
// Adjust lba with transferred bytes // Adjust lba with transferred bytes
uint32_t const lba = rdwr10_get_lba(p_cbw->command) + (p_msc->xferred_len / block_sz); uint32_t const lba = rdwr10_get_lba(p_cbw->command) + (p_msc->xferred_len / block_sz);
// Application can consume smaller bytes // Invoke callback to consume new data
int32_t nbytes = tud_msc_write10_cb(p_cbw->lun, lba, p_msc->xferred_len % block_sz, _mscd_buf, xferred_bytes); uint32_t const offset = p_msc->xferred_len % block_sz;
int32_t nbytes = tud_msc_write10_cb(p_cbw->lun, lba, offset, _mscd_buf, xferred_bytes);
if ( nbytes < 0 ) if ( nbytes < 0 )
{ {
// negative means error -> failed this scsi op // negative means error -> failed this scsi op
TU_LOG(MSC_DEBUG, " tud_msc_write10_cb() return -1\r\n"); TU_LOG(MSC_DEBUG, " tud_msc_write10_cb() return -1\r\n");
// update actual byte before failed
p_msc->xferred_len += xferred_bytes;
// Sense = Flash not ready for access // Sense = Flash not ready for access
tud_msc_set_sense(p_cbw->lun, SCSI_SENSE_MEDIUM_ERROR, 0x33, 0x00); tud_msc_set_sense(p_cbw->lun, SCSI_SENSE_MEDIUM_ERROR, 0x33, 0x00);
@ -842,7 +848,7 @@ static void proc_write10_new_data(uint8_t rhport, mscd_interface_t* p_msc, uint3
}else }else
{ {
// Application consume less than what we got (including zero) // Application consume less than what we got (including zero)
if ( nbytes < (int32_t) xferred_bytes ) if ( (uint32_t) nbytes < xferred_bytes )
{ {
if ( nbytes > 0 ) if ( nbytes > 0 )
{ {
@ -850,12 +856,12 @@ static void proc_write10_new_data(uint8_t rhport, mscd_interface_t* p_msc, uint3
memmove(_mscd_buf, _mscd_buf+nbytes, xferred_bytes-nbytes); memmove(_mscd_buf, _mscd_buf+nbytes, xferred_bytes-nbytes);
} }
// simulate an transfer complete with adjusted parameters --> this driver callback will fired again // simulate an transfer complete with adjusted parameters --> callback will be invoked with adjusted parameter
dcd_event_xfer_complete(rhport, p_msc->ep_out, xferred_bytes-nbytes, XFER_RESULT_SUCCESS, false); dcd_event_xfer_complete(rhport, p_msc->ep_out, xferred_bytes-nbytes, XFER_RESULT_SUCCESS, false);
} }
else else
{ {
// Application consume all bytes in our buffer, prepare to receive more data from host // Application consume all bytes in our buffer
p_msc->xferred_len += xferred_bytes; p_msc->xferred_len += xferred_bytes;
if ( p_msc->xferred_len >= p_msc->total_len ) if ( p_msc->xferred_len >= p_msc->total_len )
@ -864,6 +870,7 @@ static void proc_write10_new_data(uint8_t rhport, mscd_interface_t* p_msc, uint3
p_msc->stage = MSC_STAGE_STATUS; p_msc->stage = MSC_STAGE_STATUS;
}else }else
{ {
// prepare to receive more data from host
proc_write10_cmd(rhport, p_msc); proc_write10_cmd(rhport, p_msc);
} }
} }