diff options
| author | hathach <[email protected]> | 2018-03-31 14:09:48 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-03-31 14:09:48 +0700 |
| commit | 7a77aed8fa67cf6740943cf25a00485d4f288cfb (patch) | |
| tree | b2579f69d1bd263ceed4701193412df5da7ff6c3 /tinyusb/class/cdc | |
| parent | f1f7153b3b469d2565d5f5b5b8feb932ad219b98 (diff) | |
change usbd_control_xfer_st from function to macro to prevent compiler issue with substask
Diffstat (limited to 'tinyusb/class/cdc')
| -rw-r--r-- | tinyusb/class/cdc/cdc_device.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/tinyusb/class/cdc/cdc_device.c b/tinyusb/class/cdc/cdc_device.c index 072e79404..4144dc018 100644 --- a/tinyusb/class/cdc/cdc_device.c +++ b/tinyusb/class/cdc/cdc_device.c @@ -218,21 +218,15 @@ tusb_error_t cdcd_control_request_st(uint8_t rhport, tusb_control_request_t cons {
OSAL_SUBTASK_BEGIN
- tusb_error_t err;
-
//------------- Class Specific Request -------------//
if (p_request->bmRequestType_bit.type != TUSB_REQ_TYPE_CLASS) return TUSB_ERROR_DCD_CONTROL_REQUEST_NOT_SUPPORT;
- if (CDC_REQUEST_GET_LINE_CODING == p_request->bRequest)
- {
- STASK_INVOKE( usbd_control_xfer_st(rhport, (tusb_dir_t) p_request->bmRequestType_bit.direction,
- (uint8_t*) &cdcd_line_coding[rhport], min16_of(sizeof(cdc_line_coding_t), p_request->wLength)), err );
- }
- else if (CDC_REQUEST_SET_LINE_CODING == p_request->bRequest)
+ if ( (CDC_REQUEST_GET_LINE_CODING == p_request->bRequest) || (CDC_REQUEST_SET_LINE_CODING == p_request->bRequest) )
{
- STASK_INVOKE( usbd_control_xfer_st(rhport, (tusb_dir_t) p_request->bmRequestType_bit.direction,
- (uint8_t*) &cdcd_line_coding[rhport], min16_of(sizeof(cdc_line_coding_t), p_request->wLength)), err );
- // TODO notify application on xfer complete
+ uint16_t len = min16_of(sizeof(cdc_line_coding_t), p_request->wLength);
+ usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, (uint8_t*) &cdcd_line_coding[rhport], len);
+
+ // TODO notify application on set line encoding
}
else if (CDC_REQUEST_SET_CONTROL_LINE_STATE == p_request->bRequest )
{
|