diff options
| author | Ha Thach <[email protected]> | 2020-03-08 19:58:09 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-03-08 19:58:09 +0700 |
| commit | e764421164926f1d50db5daecf30893954b18289 (patch) | |
| tree | 089d0980402c8877b3346314c1fb8347fb699405 /src/device | |
| parent | 4620ac5b7736a40831473df79bad4460a757b079 (diff) | |
| parent | e0cdab5bf7ab6c2f085a748f936afafbd94ca0d9 (diff) | |
Merge pull request #294 from hathach/fix-rndis-zlp
Fix zlp for nrf52840
Diffstat (limited to 'src/device')
| -rw-r--r-- | src/device/usbd.c | 3 | ||||
| -rw-r--r-- | src/device/usbd_control.c | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/device/usbd.c b/src/device/usbd.c index 32a89889e..335c68e8e 100644 --- a/src/device/usbd.c +++ b/src/device/usbd.c @@ -264,6 +264,9 @@ static char const* const _usbd_driver_str[USBD_CLASS_DRIVER_COUNT] = #if CFG_TUD_USBTMC "USBTMC" #endif + #if CFG_TUD_NET + "NET" + #endif }; static char const* const _tusb_std_request_str[] = diff --git a/src/device/usbd_control.c b/src/device/usbd_control.c index 5a0ba412f..f0a4cf84a 100644 --- a/src/device/usbd_control.c +++ b/src/device/usbd_control.c @@ -96,6 +96,8 @@ static bool _data_stage_xact(uint8_t rhport) if ( xact_len ) memcpy(_usbd_ctrl_buf, _ctrl_xfer.buffer, xact_len); } + TU_LOG2(" XACT Control: 0x%02X, Bytes: %d\n", ep_addr, xact_len); + return dcd_edpt_xfer(rhport, ep_addr, xact_len ? _usbd_ctrl_buf : NULL, xact_len); } @@ -110,10 +112,10 @@ bool tud_control_xfer(uint8_t rhport, tusb_control_request_t const * request, vo { TU_ASSERT(buffer); + TU_LOG2(" XFER Endpoint: 0x%02X, Bytes: %d\n", request->bmRequestType_bit.direction ? EDPT_CTRL_IN : EDPT_CTRL_OUT, _ctrl_xfer.data_len); + // Data stage TU_ASSERT( _data_stage_xact(rhport) ); - - TU_LOG2(" XFER Endpoint: 0x%02X, Bytes: %d\n", request->bmRequestType_bit.direction ? EDPT_CTRL_IN : EDPT_CTRL_OUT, _ctrl_xfer.data_len); }else { // Status stage |