andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix bug during initialization of DFU Mode

Browse Source
This commit is contained in:
Jeremiah McCarthy
2021-04-05 16:48:09 -04:00
parent c5b8ef1529
commit fdc91f8d2c
1 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/class/dfu/dfu_mode_device.c
View File

@@ -67,7 +67,7 @@ static bool dfu_mode_state_machine(uint8_t rhport, tusb_control_request_t const
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
void dfu_mode_init(void) void dfu_mode_init(void)
{ {
_dfu_state_ctx.state = DFU_IDLE; _dfu_state_ctx.state = APP_DETACH; // After init, reset will occur. We want to be in APP_DETACH to move to DFU_IDLE
_dfu_state_ctx.status = DFU_STATUS_OK; _dfu_state_ctx.status = DFU_STATUS_OK;
_dfu_state_ctx.attrs = tud_dfu_mode_init_attrs_cb(); _dfu_state_ctx.attrs = tud_dfu_mode_init_attrs_cb();
_dfu_state_ctx.blk_transfer_in_proc = false; _dfu_state_ctx.blk_transfer_in_proc = false;
@@ -79,6 +79,10 @@ void dfu_mode_init(void)
void dfu_mode_reset(uint8_t rhport) void dfu_mode_reset(uint8_t rhport)
{ {
if (_dfu_state_ctx.state == APP_DETACH)
{
_dfu_state_ctx.state = DFU_IDLE;
} else {
if ( tud_dfu_mode_usb_reset_cb ) if ( tud_dfu_mode_usb_reset_cb )
{ {
tud_dfu_mode_usb_reset_cb(rhport, &_dfu_state_ctx.state); tud_dfu_mode_usb_reset_cb(rhport, &_dfu_state_ctx.state);
@@ -106,6 +110,7 @@ void dfu_mode_reset(uint8_t rhport)
break; break;
} }
} }
}
if(_dfu_state_ctx.state == APP_IDLE) if(_dfu_state_ctx.state == APP_IDLE)
{ {