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

Minor cleanup

Browse Source
This commit is contained in:
Jeremiah McCarthy
2021-03-26 17:32:03 -04:00
parent 1138f8cc70
commit fb7b47cf07
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/class/dfu/dfu_rt_device.c
View File

@@ -66,6 +66,7 @@ CFG_TUSB_MEM_SECTION static dfu_state_ctx_t _dfu_state_ctx;
static void dfu_req_dnload_setup(uint8_t rhport, tusb_control_request_t const * request); static void dfu_req_dnload_setup(uint8_t rhport, tusb_control_request_t const * request);
static void dfu_req_getstatus_reply(uint8_t rhport, tusb_control_request_t const * request); static void dfu_req_getstatus_reply(uint8_t rhport, tusb_control_request_t const * request);
static uint16_t dfu_req_upload(uint8_t rhport, tusb_control_request_t const * request, uint16_t block_num, uint16_t wLength); static uint16_t dfu_req_upload(uint8_t rhport, tusb_control_request_t const * request, uint16_t block_num, uint16_t wLength);
static void dfu_mode_req_dnload_reply(uint8_t rhport, tusb_control_request_t const * request);
static bool dfu_state_machine(uint8_t rhport, tusb_control_request_t const * request); static bool dfu_state_machine(uint8_t rhport, tusb_control_request_t const * request);
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
@@ -280,6 +281,7 @@ bool dfu_rtd_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_request
return true; return true;
} }
void tud_dfu_runtime_set_status(dfu_mode_device_status_t status) void tud_dfu_runtime_set_status(dfu_mode_device_status_t status)
{ {
_dfu_state_ctx.status = status; _dfu_state_ctx.status = status;
@@ -325,7 +327,7 @@ static void dfu_req_dnload_setup(uint8_t rhport, tusb_control_request_t const *
tud_control_xfer(rhport, request, &_dfu_state_ctx.epout_buf, request->wLength); tud_control_xfer(rhport, request, &_dfu_state_ctx.epout_buf, request->wLength);
} }
static void dfu_runtime_start_status_poll_timeout() static void dfu_mode_req_dnload_reply(uint8_t rhport, tusb_control_request_t const * request)
{ {
uint8_t bwPollTimeout[3] = {0,0,0}; uint8_t bwPollTimeout[3] = {0,0,0};
@@ -335,11 +337,7 @@ static void dfu_runtime_start_status_poll_timeout()
} }
tud_dfu_runtime_start_poll_timeout_cb((uint8_t *)&bwPollTimeout); tud_dfu_runtime_start_poll_timeout_cb((uint8_t *)&bwPollTimeout);
}
void dfu_mode_req_dnload_reply(uint8_t rhport, tusb_control_request_t const * request)
{
dfu_runtime_start_status_poll_timeout();
tud_dfu_runtime_req_dnload_data_cb(request->wValue, (uint8_t *)&_dfu_state_ctx.epout_buf, request->wLength); tud_dfu_runtime_req_dnload_data_cb(request->wValue, (uint8_t *)&_dfu_state_ctx.epout_buf, request->wLength);
_dfu_state_ctx.blk_transfer_in_proc = false; _dfu_state_ctx.blk_transfer_in_proc = false;
} }

4
src/class/dfu/dfu_rt_device.h
View File

@@ -138,10 +138,6 @@ void dfu_rtd_reset(uint8_t rhport);
uint16_t dfu_rtd_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint16_t max_len); uint16_t dfu_rtd_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint16_t max_len);
bool dfu_rtd_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_request_t const * request); bool dfu_rtd_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_request_t const * request);
//--------------------------------------------------------------------+
void dfu_mode_init(void);
void dfu_mode_reset(uint8_t rhport);
void dfu_mode_req_dnload_reply(uint8_t rhport, tusb_control_request_t const * request);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif