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

update dfu abort

This commit is contained in:
hathach 2021-07-14 16:51:28 +07:00
parent 95ded08e3b
commit 6a68fc6997
1 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/class/dfu/dfu_device.c
View File

@ -259,6 +259,19 @@ bool dfu_moded_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_reque
} }
break; break;
case DFU_REQUEST_ABORT:
if ( stage == CONTROL_STAGE_SETUP )
{
if (tud_dfu_abort_cb) tud_dfu_abort_cb(_dfu_ctx.alt_num);
_dfu_ctx.state = DFU_IDLE;
_dfu_ctx.status = DFU_STATUS_OK;
_dfu_ctx.blk_transfer_in_proc = false;
tud_control_status(rhport, request);
}
break;
case DFU_REQUEST_UPLOAD: case DFU_REQUEST_UPLOAD:
if ( stage == CONTROL_STAGE_SETUP ) if ( stage == CONTROL_STAGE_SETUP )
{ {
@ -287,7 +300,6 @@ bool dfu_moded_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_reque
case DFU_REQUEST_GETSTATUS: case DFU_REQUEST_GETSTATUS:
case DFU_REQUEST_CLRSTATUS: case DFU_REQUEST_CLRSTATUS:
case DFU_REQUEST_GETSTATE: case DFU_REQUEST_GETSTATE:
case DFU_REQUEST_ABORT:
{ {
if(stage == CONTROL_STAGE_SETUP) if(stage == CONTROL_STAGE_SETUP)
{ {
@ -297,10 +309,7 @@ bool dfu_moded_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_reque
break; break;
default: default:
{
TU_LOG2(" DFU Nonstandard Request: %u\r\n", request->bRequest);
return false; // stall unsupported request return false; // stall unsupported request
}
break; break;
} }
}else }else
@ -399,10 +408,6 @@ static bool dfu_state_machine(uint8_t rhport, tusb_control_request_t const * req
dfu_req_getstate_reply(rhport, request); dfu_req_getstate_reply(rhport, request);
break; break;
case DFU_REQUEST_ABORT:
; // do nothing, but don't stall so continue on
break;
default: default:
_dfu_ctx.state = DFU_ERROR; _dfu_ctx.state = DFU_ERROR;
return false; // stall on all other requests return false; // stall on all other requests
@ -486,14 +491,6 @@ static bool dfu_state_machine(uint8_t rhport, tusb_control_request_t const * req
dfu_req_getstate_reply(rhport, request); dfu_req_getstate_reply(rhport, request);
break; break;
case DFU_REQUEST_ABORT:
if ( tud_dfu_abort_cb )
{
tud_dfu_abort_cb(_dfu_ctx.alt_num);
}
_dfu_ctx.state = DFU_IDLE;
break;
default: default:
_dfu_ctx.state = DFU_ERROR; _dfu_ctx.state = DFU_ERROR;
return false; // stall on all other requests return false; // stall on all other requests
@ -572,16 +569,6 @@ static bool dfu_state_machine(uint8_t rhport, tusb_control_request_t const * req
dfu_req_getstate_reply(rhport, request); dfu_req_getstate_reply(rhport, request);
break; break;
case DFU_REQUEST_ABORT:
{
if (tud_dfu_abort_cb)
{
tud_dfu_abort_cb(_dfu_ctx.alt_num);
}
_dfu_ctx.state = DFU_IDLE;
}
break;
default: default:
return false; // stall on all other requests return false; // stall on all other requests
break; break;