clean up
This commit is contained in:
@@ -1032,15 +1032,14 @@ static bool process_set_config(uint8_t rhport, uint8_t cfg_num)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if CFG_TUD_MIDI
|
#if CFG_TUD_MIDI
|
||||||
if ( driver->open == midid_open )
|
if (driver->open == midid_open) {
|
||||||
{
|
// If there is a class-compliant Audio Control Class, then 2 interfaces. Otherwise, only one
|
||||||
// If there is a class-compliant Audio Control Class, then 2 interfaces
|
|
||||||
// Otherwise, only one
|
|
||||||
if (TUSB_CLASS_AUDIO == desc_itf->bInterfaceClass &&
|
if (TUSB_CLASS_AUDIO == desc_itf->bInterfaceClass &&
|
||||||
AUDIO_SUBCLASS_CONTROL == desc_itf->bInterfaceSubClass &&
|
AUDIO_SUBCLASS_CONTROL == desc_itf->bInterfaceSubClass &&
|
||||||
AUDIO_FUNC_PROTOCOL_CODE_UNDEF == desc_itf->bInterfaceProtocol)
|
AUDIO_FUNC_PROTOCOL_CODE_UNDEF == desc_itf->bInterfaceProtocol) {
|
||||||
assoc_itf_count = 2;
|
assoc_itf_count = 2;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if CFG_TUD_BTH && CFG_TUD_BTH_ISO_ALT_COUNT
|
#if CFG_TUD_BTH && CFG_TUD_BTH_ISO_ALT_COUNT
|
||||||
|
@@ -1488,7 +1488,9 @@ static void process_enumeration(tuh_xfer_t* xfer) {
|
|||||||
dev->i_product = desc_device->iProduct;
|
dev->i_product = desc_device->iProduct;
|
||||||
dev->i_serial = desc_device->iSerialNumber;
|
dev->i_serial = desc_device->iSerialNumber;
|
||||||
|
|
||||||
if (tuh_desc_device_cb) tuh_desc_device_cb(daddr, (tusb_desc_device_t const*) _usbh_ctrl_buf);
|
if (tuh_desc_device_cb) {
|
||||||
|
tuh_desc_device_cb(daddr, (tusb_desc_device_t const*) _usbh_ctrl_buf);
|
||||||
|
}
|
||||||
|
|
||||||
// Get 9-byte for total length
|
// Get 9-byte for total length
|
||||||
uint8_t const config_idx = CONFIG_NUM - 1;
|
uint8_t const config_idx = CONFIG_NUM - 1;
|
||||||
@@ -1517,7 +1519,9 @@ static void process_enumeration(tuh_xfer_t* xfer) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
case ENUM_SET_CONFIG:
|
case ENUM_SET_CONFIG:
|
||||||
if (tuh_desc_config_cb) tuh_desc_config_cb(daddr, (const tusb_desc_configuration_t*) _usbh_ctrl_buf);
|
if (tuh_desc_config_cb) {
|
||||||
|
tuh_desc_config_cb(daddr, (const tusb_desc_configuration_t*) _usbh_ctrl_buf);
|
||||||
|
}
|
||||||
|
|
||||||
TU_ASSERT(tuh_configuration_set(daddr, CONFIG_NUM, process_enumeration, ENUM_CONFIG_DRIVER),);
|
TU_ASSERT(tuh_configuration_set(daddr, CONFIG_NUM, process_enumeration, ENUM_CONFIG_DRIVER),);
|
||||||
break;
|
break;
|
||||||
|
@@ -657,9 +657,9 @@
|
|||||||
//------------------------------------------------------------------
|
//------------------------------------------------------------------
|
||||||
// Configuration Validation
|
// Configuration Validation
|
||||||
//------------------------------------------------------------------
|
//------------------------------------------------------------------
|
||||||
//#if CFG_TUD_ENDPOINT0_SIZE > 64
|
#if CFG_TUD_ENDPOINT0_SIZE > 64
|
||||||
// #error Control Endpoint Max Packet Size cannot be larger than 64
|
#error Control Endpoint Max Packet Size cannot be larger than 64
|
||||||
//#endif
|
#endif
|
||||||
|
|
||||||
// To avoid GCC compiler warnings when -pedantic option is used (strict ISO C)
|
// To avoid GCC compiler warnings when -pedantic option is used (strict ISO C)
|
||||||
typedef int make_iso_compilers_happy;
|
typedef int make_iso_compilers_happy;
|
||||||
|
Reference in New Issue
Block a user