From ce2fc0470cbdbd64faa7b4460d3745d78722d49f Mon Sep 17 00:00:00 2001 From: hathach Date: Thu, 22 Mar 2018 14:15:16 +0700 Subject: improve usbd control transfer --- tinyusb/class/cdc/cdc_device.c | 15 +++++++++------ tinyusb/class/msc/msc_device.c | 9 +++++---- 2 files changed, 14 insertions(+), 10 deletions(-) (limited to 'tinyusb/class') diff --git a/tinyusb/class/cdc/cdc_device.c b/tinyusb/class/cdc/cdc_device.c index ebb3e8ead..914e8d036 100644 --- a/tinyusb/class/cdc/cdc_device.c +++ b/tinyusb/class/cdc/cdc_device.c @@ -44,8 +44,9 @@ //--------------------------------------------------------------------+ // INCLUDE //--------------------------------------------------------------------+ -#include +#include "common/tusb_common.h" #include "cdc_device.h" +#include "device/usbd_pvt.h" //--------------------------------------------------------------------+ // MACRO CONSTANT TYPEDEF @@ -221,13 +222,13 @@ tusb_error_t cdcd_control_request_subtask(uint8_t port, tusb_control_request_t c if (CDC_REQUEST_GET_LINE_CODING == p_request->bRequest) { - SUBTASK_INVOKE( usbd_control_xfer_substak(port, (tusb_dir_t) p_request->bmRequestType_bit.direction, - (uint8_t*) &cdcd_line_coding[port], min16_of(sizeof(cdc_line_coding_t), p_request->wLength)), err ); + SUBTASK_INVOKE( usbd_control_xfer_stask(port, (tusb_dir_t) p_request->bmRequestType_bit.direction, + (uint8_t*) &cdcd_line_coding[port], min16_of(sizeof(cdc_line_coding_t), p_request->wLength)), err ); } else if (CDC_REQUEST_SET_LINE_CODING == p_request->bRequest) { - SUBTASK_INVOKE( usbd_control_xfer_substak(port, (tusb_dir_t) p_request->bmRequestType_bit.direction, - (uint8_t*) &cdcd_line_coding[port], min16_of(sizeof(cdc_line_coding_t), p_request->wLength)), err ); + SUBTASK_INVOKE( usbd_control_xfer_stask(port, (tusb_dir_t) p_request->bmRequestType_bit.direction, + (uint8_t*) &cdcd_line_coding[port], min16_of(sizeof(cdc_line_coding_t), p_request->wLength)), err ); // TODO notify application on xfer complete } else if (CDC_REQUEST_SET_CONTROL_LINE_STATE == p_request->bRequest ) @@ -253,10 +254,12 @@ tusb_error_t cdcd_control_request_subtask(uint8_t port, tusb_control_request_t c // De-active --> disconnected p_cdc->connected = false; } + + usbd_control_status(port, p_request->bmRequestType_bit.direction); } else { - SUBTASK_RETURN(TUSB_ERROR_DCD_CONTROL_REQUEST_NOT_SUPPORT); + usbd_control_stall(port); // stall unsupported request } OSAL_SUBTASK_END diff --git a/tinyusb/class/msc/msc_device.c b/tinyusb/class/msc/msc_device.c index 3244e3c86..4968faa1c 100644 --- a/tinyusb/class/msc/msc_device.c +++ b/tinyusb/class/msc/msc_device.c @@ -44,8 +44,9 @@ //--------------------------------------------------------------------+ // INCLUDE //--------------------------------------------------------------------+ -#include +#include "common/tusb_common.h" #include "msc_device.h" +#include "device/usbd_pvt.h" //--------------------------------------------------------------------+ // MACRO CONSTANT TYPEDEF @@ -133,16 +134,16 @@ tusb_error_t mscd_control_request_subtask(uint8_t port, tusb_control_request_t c if(MSC_REQUEST_RESET == p_request->bRequest) { - usbd_control_status(port, TUSB_DIR_IN); + usbd_control_status(port, p_request->bmRequestType_bit.direction); } else if (MSC_REQUEST_GET_MAX_LUN == p_request->bRequest) { // Note: lpc11/13u need xfer data's address to be aligned 64 -> make use of scsi_data instead of using max_lun directly p_msc->scsi_data[0] = p_msc->max_lun; - SUBTASK_INVOKE( usbd_control_xfer_substak(port, TUSB_DIR_IN, p_msc->scsi_data, 1), err); + SUBTASK_INVOKE( usbd_control_xfer_stask(port, p_request->bmRequestType_bit.direction, p_msc->scsi_data, 1), err); }else { - SUBTASK_RETURN(TUSB_ERROR_DCD_CONTROL_REQUEST_NOT_SUPPORT); + usbd_control_stall(port); // stall unsupported request } OSAL_SUBTASK_END -- cgit v1.3.1