mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-03-20 04:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2239 from XelaRellum/bugfix_stm32_fsdev_keil

Browse Source 
Fixes #1018 the weak dcd_edpt0_status_complete for Keil Compiler
This commit is contained in:
Ha Thach 2024-01-12 15:26:02 +07:00 committed by GitHub
commit 858077483d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/device/dcd.h
View File

@ -152,7 +152,7 @@ void dcd_sof_enable(uint8_t rhport, bool en);
// Invoked when a control transfer's status stage is complete. // Invoked when a control transfer's status stage is complete.
// May help DCD to prepare for next control transfer, this API is optional. // May help DCD to prepare for next control transfer, this API is optional.
void dcd_edpt0_status_complete(uint8_t rhport, tusb_control_request_t const * request) TU_ATTR_WEAK; void dcd_edpt0_status_complete(uint8_t rhport, tusb_control_request_t const * request);
// Configure endpoint's registers according to descriptor // Configure endpoint's registers according to descriptor
bool dcd_edpt_open (uint8_t rhport, tusb_desc_endpoint_t const * desc_ep); bool dcd_edpt_open (uint8_t rhport, tusb_desc_endpoint_t const * desc_ep);

11
src/device/usbd_control.c
View File

@ -135,6 +135,15 @@ bool tud_control_xfer(uint8_t rhport, tusb_control_request_t const * request, vo
// USBD API // USBD API
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
TU_ATTR_WEAK void dcd_edpt0_status_complete(uint8_t rhport, tusb_control_request_t const * request)
{
(void)rhport;
(void)request;
// this is the default implementation that is called when no "real" implementation
// of the function exists
}
void usbd_control_reset(void); void usbd_control_reset(void);
void usbd_control_set_request(tusb_control_request_t const *request); void usbd_control_set_request(tusb_control_request_t const *request);
void usbd_control_set_complete_callback( usbd_control_xfer_cb_t fp ); void usbd_control_set_complete_callback( usbd_control_xfer_cb_t fp );
@ -173,7 +182,7 @@ bool usbd_control_xfer_cb (uint8_t rhport, uint8_t ep_addr, xfer_result_t result
TU_ASSERT(0 == xferred_bytes); TU_ASSERT(0 == xferred_bytes);
// invoke optional dcd hook if available // invoke optional dcd hook if available
if (dcd_edpt0_status_complete) dcd_edpt0_status_complete(rhport, &_ctrl_xfer.request); dcd_edpt0_status_complete(rhport, &_ctrl_xfer.request);
if (_ctrl_xfer.complete_cb) if (_ctrl_xfer.complete_cb)
{ {