andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

clean up control req a bit

Browse Source
This commit is contained in:
hathach
2019-03-29 16:55:58 +07:00
parent 3a38cde53d
commit 7d9b68a7b9
1 changed files with 114 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/device/usbd.c
View File

@@ -324,10 +324,17 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const
{
usbd_control_set_complete_callback(NULL);
if ( TUSB_REQ_RCPT_DEVICE == p_request->bmRequestType_bit.recipient &&
TUSB_REQ_TYPE_STANDARD == p_request->bmRequestType_bit.type )
switch ( p_request->bmRequestType_bit.recipient )
{
//------------- Standard Device Requests e.g in enumeration -------------//
//------------- Device Requests e.g in enumeration -------------//
case TUSB_REQ_RCPT_DEVICE:
if ( TUSB_REQ_TYPE_STANDARD != p_request->bmRequestType_bit.type )
{
// Non standard request is not supported
TU_BREAKPOINT();
return false;
}
void* data_buf = NULL;
uint16_t data_len = 0;
@@ -352,7 +359,7 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const
dcd_set_config(rhport, config);
_usbd_dev.config_num = config;
TU_ASSERT( TUSB_ERROR_NONE == process_set_config(rhport) );
TU_ASSERT( process_set_config(rhport) );
}
break;
@@ -377,16 +384,16 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const
}
break;
default:
TU_BREAKPOINT();
return false;
// Unknown/Unsupported request
default: TU_BREAKPOINT(); return false;
}
usbd_control_xfer(rhport, p_request, data_buf, data_len);
}
else if ( TUSB_REQ_RCPT_INTERFACE == p_request->bmRequestType_bit.recipient )
{
break;
//------------- Class/Interface Specific Request -------------//
case TUSB_REQ_RCPT_INTERFACE:
{
uint8_t const itf = tu_u16_low(p_request->wIndex);
uint8_t const drvid = _usbd_dev.itf2drv[itf];
@@ -394,13 +401,20 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const
usbd_control_set_complete_callback(usbd_class_drivers[drvid].control_request_complete );
// control endpoint will be stalled if driver return false
// stall control endpoint if driver return false
return usbd_class_drivers[drvid].control_request(rhport, p_request);
}
else if ( p_request->bmRequestType_bit.recipient == TUSB_REQ_RCPT_ENDPOINT &&
p_request->bmRequestType_bit.type == TUSB_REQ_TYPE_STANDARD )
{
break;
//------------- Endpoint Request -------------//
case TUSB_REQ_RCPT_ENDPOINT:
if ( TUSB_REQ_TYPE_STANDARD != p_request->bmRequestType_bit.type )
{
// Non standard request is not supported
TU_BREAKPOINT();
return false;
}
switch ( p_request->bRequest )
{
case TUSB_REQ_GET_STATUS:
@@ -426,16 +440,13 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const
}
break;
default:
TU_BREAKPOINT();
return false;
// Unknown/Unsupported request
default: TU_BREAKPOINT(); return false;
}
}
else
{
//------------- Unsupported Request -------------//
TU_BREAKPOINT();
return false;
break;
// Unknown recipient
default: TU_BREAKPOINT(); return false;
}
return true;
@@ -488,7 +499,7 @@ static bool process_set_config(uint8_t rhport)
// invoke callback
if (tud_mount_cb) tud_mount_cb();
return TUSB_ERROR_NONE;
return true;
}
// Helper marking endpoint of interface belongs to class driver