diff options
| author | Jeremy Herbert <[email protected]> | 2019-12-30 13:58:06 +1000 |
|---|---|---|
| committer | Ha Thach <[email protected]> | 2019-12-30 10:58:06 +0700 |
| commit | db24b2f3728cc29af5b2688f9cd7ab0b4b3f22b5 (patch) | |
| tree | 5b4eee4e8e61e92320413bf5a0f9f62f4f27ebfb | |
| parent | 8e04eafb8a71ac214cfcb8b5a19c2b9aa00c492b (diff) | |
Let device respond to endpoint requests on EP0 (#251)
Since endpoint 0 is used for control requests, it doesn't have a class driver attached to it. As such, the corresponding `_usbd_dev.ep2drv` entry points to driver `0xFF`, which is invalid and this makes the `TU_ASSERT(drvid < USBD_CLASS_DRIVER_COUNT);` line fail, and eventually causes an endpoint stall. So as-is the stack cannot respond to any endpoint requests on endpoint 0.
However, standard requests on endpoint 0 do not need a class driver to produce a valid response. This commit changes the order of execution so that the assert is only checked if the endpoint is not 0.
| -rw-r--r-- | src/device/usbd.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/device/usbd.c b/src/device/usbd.c index 949e14096..b63d42021 100644 --- a/src/device/usbd.c +++ b/src/device/usbd.c @@ -618,7 +618,6 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const TU_ASSERT(ep_num < TU_ARRAY_SIZE(_usbd_dev.ep2drv) );
uint8_t const drvid = _usbd_dev.ep2drv[ep_num][ep_dir];
- TU_ASSERT(drvid < USBD_CLASS_DRIVER_COUNT);
bool ret = false;
@@ -658,13 +657,17 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const }
}
- // Some classes such as USBTMC needs to clear/re-init its buffer when receiving CLEAR_FEATURE request
- // We will forward all request targeted endpoint to class drivers after
- // - For class-type requests: driver is fully responsible to reply to host
- // - For std-type requests : driver init/re-init internal variable/buffer only, and
- // must not call tud_control_status(), driver's return value will have no effect.
- // EP state has already affected (stalled/cleared)
- if ( invoke_class_control(rhport, drvid, p_request) ) ret = true;
+ if (drvid < 0xFF) {
+ TU_ASSERT(drvid < USBD_CLASS_DRIVER_COUNT);
+
+ // Some classes such as USBTMC needs to clear/re-init its buffer when receiving CLEAR_FEATURE request
+ // We will forward all request targeted endpoint to class drivers after
+ // - For class-type requests: driver is fully responsible to reply to host
+ // - For std-type requests : driver init/re-init internal variable/buffer only, and
+ // must not call tud_control_status(), driver's return value will have no effect.
+ // EP state has already affected (stalled/cleared)
+ if ( invoke_class_control(rhport, drvid, p_request) ) ret = true;
+ }
if ( TUSB_REQ_TYPE_STANDARD == p_request->bmRequestType_bit.type )
{
|