summaryrefslogtreecommitdiff
path: root/tinyusb/device
diff options
context:
space:
mode:
authorhathach <[email protected]>2018-05-15 22:06:49 +0700
committerhathach <[email protected]>2018-05-15 22:06:49 +0700
commitd96abdb0ad3297239951b35cb24ad035dec19a59 (patch)
tree19a5a834bda8d5e2d8251e3671483f537b9e9730 /tinyusb/device
parent1d428b7fefa1a41d47918b1c6ddd7c96e84f98e3 (diff)
add xferred bytes for device control
Diffstat (limited to 'tinyusb/device')
-rw-r--r--tinyusb/device/dcd.h4
-rw-r--r--tinyusb/device/usbd.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/tinyusb/device/dcd.h b/tinyusb/device/dcd.h
index fb9d992fb..bee787d03 100644
--- a/tinyusb/device/dcd.h
+++ b/tinyusb/device/dcd.h
@@ -76,10 +76,10 @@ void dcd_bus_event (uint8_t rhport, usbd_bus_event_type_t bus_event);
void dcd_setup_received (uint8_t rhport, uint8_t const* p_request);
void dcd_xfer_complete (uint8_t rhport, uint8_t ep_addr, uint32_t xferred_bytes, bool succeeded);
-static inline void dcd_control_complete(uint8_t rhport)
+static inline void dcd_control_complete(uint8_t rhport, uint32_t xferred_bytes)
{
// all control complete is successful !!
- dcd_xfer_complete(rhport, 0, 0, true);
+ dcd_xfer_complete(rhport, 0, xferred_bytes, true);
}
/*------------------------------------------------------------------*/
diff --git a/tinyusb/device/usbd.c b/tinyusb/device/usbd.c
index d449c6389..2df7d49c6 100644
--- a/tinyusb/device/usbd.c
+++ b/tinyusb/device/usbd.c
@@ -556,12 +556,12 @@ void dcd_xfer_complete(uint8_t rhport, uint8_t ep_addr, uint32_t xferred_bytes,
{
if (ep_addr == 0 )
{
+ // Control Transfer
(void) rhport;
- (void) xferred_bytes;
(void) succeeded;
- // Control Transfer
- osal_semaphore_post( _usbd_ctrl_sem );
+ // only signal data stage, skip status (zero byte)
+ if (xferred_bytes) osal_semaphore_post( _usbd_ctrl_sem );
}else
{
usbd_task_event_t task_event =