ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tests: USB: Use astyle to format the test class

pull/9768/head
Filip Jagodzinski 2019-01-18 17:30:36 +01:00 committed by Russ Butler
parent 38032453a5
commit 4a4dcdb5b8
2 changed files with 96 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
TESTS/usb_device/basic/USBEndpointTester.cpp
View File

@ -139,9 +139,9 @@ USBEndpointTester::ep_config_t USBEndpointTester::_intf_config4[NUM_ENDPOINTS] =
}; };
USBEndpointTester::USBEndpointTester(USBPhy *phy, uint16_t vendor_id, uint16_t product_id, uint16_t product_release, USBEndpointTester::USBEndpointTester(USBPhy *phy, uint16_t vendor_id, uint16_t product_id, uint16_t product_release,
bool abort_transfer_test) : bool abort_transfer_test) :
USBDevice(phy, vendor_id, product_id, product_release), _abort_transfer_test(abort_transfer_test), _endpoint_configs( USBDevice(phy, vendor_id, product_id, product_release), _abort_transfer_test(abort_transfer_test), _endpoint_configs(
&_intf_config_max) &_intf_config_max)
{ {
_cnt_cb_set_conf = 0; _cnt_cb_set_conf = 0;
_cnt_cb_set_intf = 0; _cnt_cb_set_intf = 0;
@ -447,48 +447,48 @@ const uint8_t *USBEndpointTester::configuration_desc(uint8_t index)
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_BULK_OUT], // bEndpointAddress _endpoints[EP_BULK_OUT], // bEndpointAddress
E_BULK, // bmAttributes E_BULK, // bmAttributes
(uint8_t) (LSB(_intf_config0[EP_BULK_OUT].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config0[EP_BULK_OUT].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config0[EP_BULK_OUT].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config0[EP_BULK_OUT].max_packet)), // wMaxPacketSize (MSB)
0, // bInterval 0, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_BULK_IN], // bEndpointAddress _endpoints[EP_BULK_IN], // bEndpointAddress
E_BULK, // bmAttributes E_BULK, // bmAttributes
(uint8_t) (LSB(_intf_config0[EP_BULK_IN].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config0[EP_BULK_IN].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config0[EP_BULK_IN].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config0[EP_BULK_IN].max_packet)), // wMaxPacketSize (MSB)
0, // bInterval 0, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_INT_OUT], // bEndpointAddress _endpoints[EP_INT_OUT], // bEndpointAddress
E_INTERRUPT, // bmAttributes E_INTERRUPT, // bmAttributes
(uint8_t) (LSB(_intf_config0[EP_INT_OUT].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config0[EP_INT_OUT].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config0[EP_INT_OUT].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config0[EP_INT_OUT].max_packet)), // wMaxPacketSize (MSB)
1, // bInterval 1, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_INT_IN], // bEndpointAddress _endpoints[EP_INT_IN], // bEndpointAddress
E_INTERRUPT, // bmAttributes E_INTERRUPT, // bmAttributes
(uint8_t) (LSB(_intf_config0[EP_INT_IN].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config0[EP_INT_IN].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config0[EP_INT_IN].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config0[EP_INT_IN].max_packet)), // wMaxPacketSize (MSB)
1, // bInterval 1, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_ISO_OUT], // bEndpointAddress _endpoints[EP_ISO_OUT], // bEndpointAddress
E_ISOCHRONOUS, // bmAttributes E_ISOCHRONOUS, // bmAttributes
(uint8_t) (LSB(_intf_config0[EP_ISO_OUT].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config0[EP_ISO_OUT].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config0[EP_ISO_OUT].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config0[EP_ISO_OUT].max_packet)), // wMaxPacketSize (MSB)
1, // bInterval 1, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_ISO_IN], // bEndpointAddress _endpoints[EP_ISO_IN], // bEndpointAddress
E_ISOCHRONOUS, // bmAttributes E_ISOCHRONOUS, // bmAttributes
(uint8_t) (LSB(_intf_config0[EP_ISO_IN].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config0[EP_ISO_IN].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config0[EP_ISO_IN].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config0[EP_ISO_IN].max_packet)), // wMaxPacketSize (MSB)
1, // bInterval 1, // bInterval
// interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12 // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12
@ -506,48 +506,48 @@ const uint8_t *USBEndpointTester::configuration_desc(uint8_t index)
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_BULK_OUT], // bEndpointAddress _endpoints[EP_BULK_OUT], // bEndpointAddress
E_BULK, // bmAttributes E_BULK, // bmAttributes
(uint8_t) (LSB(_intf_config1[EP_BULK_OUT].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config1[EP_BULK_OUT].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config1[EP_BULK_OUT].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config1[EP_BULK_OUT].max_packet)), // wMaxPacketSize (MSB)
0, // bInterval 0, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_BULK_IN], // bEndpointAddress _endpoints[EP_BULK_IN], // bEndpointAddress
E_BULK, // bmAttributes E_BULK, // bmAttributes
(uint8_t) (LSB(_intf_config1[EP_BULK_IN].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config1[EP_BULK_IN].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config1[EP_BULK_IN].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config1[EP_BULK_IN].max_packet)), // wMaxPacketSize (MSB)
0, // bInterval 0, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_INT_OUT], // bEndpointAddress _endpoints[EP_INT_OUT], // bEndpointAddress
E_INTERRUPT, // bmAttributes E_INTERRUPT, // bmAttributes
(uint8_t) (LSB(_intf_config1[EP_INT_OUT].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config1[EP_INT_OUT].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config1[EP_INT_OUT].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config1[EP_INT_OUT].max_packet)), // wMaxPacketSize (MSB)
1, // bInterval 1, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_INT_IN], // bEndpointAddress _endpoints[EP_INT_IN], // bEndpointAddress
E_INTERRUPT, // bmAttributes E_INTERRUPT, // bmAttributes
(uint8_t) (LSB(_intf_config1[EP_INT_IN].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config1[EP_INT_IN].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config1[EP_INT_IN].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config1[EP_INT_IN].max_packet)), // wMaxPacketSize (MSB)
1, // bInterval 1, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_ISO_OUT], // bEndpointAddress _endpoints[EP_ISO_OUT], // bEndpointAddress
E_ISOCHRONOUS, // bmAttributes E_ISOCHRONOUS, // bmAttributes
(uint8_t) (LSB(_intf_config1[EP_ISO_OUT].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config1[EP_ISO_OUT].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config1[EP_ISO_OUT].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config1[EP_ISO_OUT].max_packet)), // wMaxPacketSize (MSB)
1, // bInterval 1, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_ISO_IN], // bEndpointAddress _endpoints[EP_ISO_IN], // bEndpointAddress
E_ISOCHRONOUS, // bmAttributes E_ISOCHRONOUS, // bmAttributes
(uint8_t) (LSB(_intf_config1[EP_ISO_IN].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config1[EP_ISO_IN].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config1[EP_ISO_IN].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config1[EP_ISO_IN].max_packet)), // wMaxPacketSize (MSB)
1, // bInterval 1, // bInterval
// interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12 // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12
@ -565,48 +565,48 @@ const uint8_t *USBEndpointTester::configuration_desc(uint8_t index)
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_BULK_OUT], // bEndpointAddress _endpoints[EP_BULK_OUT], // bEndpointAddress
E_BULK, // bmAttributes E_BULK, // bmAttributes
(uint8_t) (LSB(_intf_config2[EP_BULK_OUT].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config2[EP_BULK_OUT].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config2[EP_BULK_OUT].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config2[EP_BULK_OUT].max_packet)), // wMaxPacketSize (MSB)
0, // bInterval 0, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_BULK_IN], // bEndpointAddress _endpoints[EP_BULK_IN], // bEndpointAddress
E_BULK, // bmAttributes E_BULK, // bmAttributes
(uint8_t) (LSB(_intf_config2[EP_BULK_IN].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config2[EP_BULK_IN].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config2[EP_BULK_IN].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config2[EP_BULK_IN].max_packet)), // wMaxPacketSize (MSB)
0, // bInterval 0, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_INT_OUT], // bEndpointAddress _endpoints[EP_INT_OUT], // bEndpointAddress
E_INTERRUPT, // bmAttributes E_INTERRUPT, // bmAttributes
(uint8_t) (LSB(_intf_config2[EP_INT_OUT].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config2[EP_INT_OUT].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config2[EP_INT_OUT].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config2[EP_INT_OUT].max_packet)), // wMaxPacketSize (MSB)
1, // bInterval 1, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_INT_IN], // bEndpointAddress _endpoints[EP_INT_IN], // bEndpointAddress
E_INTERRUPT, // bmAttributes E_INTERRUPT, // bmAttributes
(uint8_t) (LSB(_intf_config2[EP_INT_IN].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config2[EP_INT_IN].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config2[EP_INT_IN].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config2[EP_INT_IN].max_packet)), // wMaxPacketSize (MSB)
1, // bInterval 1, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_ISO_OUT], // bEndpointAddress _endpoints[EP_ISO_OUT], // bEndpointAddress
E_ISOCHRONOUS, // bmAttributes E_ISOCHRONOUS, // bmAttributes
(uint8_t) (LSB(_intf_config2[EP_ISO_OUT].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config2[EP_ISO_OUT].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config2[EP_ISO_OUT].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config2[EP_ISO_OUT].max_packet)), // wMaxPacketSize (MSB)
1, // bInterval 1, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_ISO_IN], // bEndpointAddress _endpoints[EP_ISO_IN], // bEndpointAddress
E_ISOCHRONOUS, // bmAttributes E_ISOCHRONOUS, // bmAttributes
(uint8_t) (LSB(_intf_config2[EP_ISO_IN].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config2[EP_ISO_IN].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config2[EP_ISO_IN].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config2[EP_ISO_IN].max_packet)), // wMaxPacketSize (MSB)
1, // bInterval 1, // bInterval
// interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12 // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12
@ -624,48 +624,48 @@ const uint8_t *USBEndpointTester::configuration_desc(uint8_t index)
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_BULK_OUT], // bEndpointAddress _endpoints[EP_BULK_OUT], // bEndpointAddress
E_BULK, // bmAttributes E_BULK, // bmAttributes
(uint8_t) (LSB(_intf_config3[EP_BULK_OUT].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config3[EP_BULK_OUT].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config3[EP_BULK_OUT].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config3[EP_BULK_OUT].max_packet)), // wMaxPacketSize (MSB)
0, // bInterval 0, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_BULK_IN], // bEndpointAddress _endpoints[EP_BULK_IN], // bEndpointAddress
E_BULK, // bmAttributes E_BULK, // bmAttributes
(uint8_t) (LSB(_intf_config3[EP_BULK_IN].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config3[EP_BULK_IN].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config3[EP_BULK_IN].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config3[EP_BULK_IN].max_packet)), // wMaxPacketSize (MSB)
0, // bInterval 0, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_INT_OUT], // bEndpointAddress _endpoints[EP_INT_OUT], // bEndpointAddress
E_INTERRUPT, // bmAttributes E_INTERRUPT, // bmAttributes
(uint8_t) (LSB(_intf_config3[EP_INT_OUT].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config3[EP_INT_OUT].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config3[EP_INT_OUT].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config3[EP_INT_OUT].max_packet)), // wMaxPacketSize (MSB)
1, // bInterval 1, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_INT_IN], // bEndpointAddress _endpoints[EP_INT_IN], // bEndpointAddress
E_INTERRUPT, // bmAttributes E_INTERRUPT, // bmAttributes
(uint8_t) (LSB(_intf_config3[EP_INT_IN].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config3[EP_INT_IN].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config3[EP_INT_IN].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config3[EP_INT_IN].max_packet)), // wMaxPacketSize (MSB)
1, // bInterval 1, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_ISO_OUT], // bEndpointAddress _endpoints[EP_ISO_OUT], // bEndpointAddress
E_ISOCHRONOUS, // bmAttributes E_ISOCHRONOUS, // bmAttributes
(uint8_t) (LSB(_intf_config3[EP_ISO_OUT].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config3[EP_ISO_OUT].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config3[EP_ISO_OUT].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config3[EP_ISO_OUT].max_packet)), // wMaxPacketSize (MSB)
1, // bInterval 1, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_ISO_IN], // bEndpointAddress _endpoints[EP_ISO_IN], // bEndpointAddress
E_ISOCHRONOUS, // bmAttributes E_ISOCHRONOUS, // bmAttributes
(uint8_t) (LSB(_intf_config3[EP_ISO_IN].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config3[EP_ISO_IN].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config3[EP_ISO_IN].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config3[EP_ISO_IN].max_packet)), // wMaxPacketSize (MSB)
1, // bInterval 1, // bInterval
// interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12 // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12
@ -683,48 +683,48 @@ const uint8_t *USBEndpointTester::configuration_desc(uint8_t index)
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_BULK_OUT], // bEndpointAddress _endpoints[EP_BULK_OUT], // bEndpointAddress
E_BULK, // bmAttributes E_BULK, // bmAttributes
(uint8_t) (LSB(_intf_config4[EP_BULK_OUT].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config4[EP_BULK_OUT].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config4[EP_BULK_OUT].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config4[EP_BULK_OUT].max_packet)), // wMaxPacketSize (MSB)
0, // bInterval 0, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_BULK_IN], // bEndpointAddress _endpoints[EP_BULK_IN], // bEndpointAddress
E_BULK, // bmAttributes E_BULK, // bmAttributes
(uint8_t) (LSB(_intf_config4[EP_BULK_IN].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config4[EP_BULK_IN].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config4[EP_BULK_IN].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config4[EP_BULK_IN].max_packet)), // wMaxPacketSize (MSB)
0, // bInterval 0, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_INT_OUT], // bEndpointAddress _endpoints[EP_INT_OUT], // bEndpointAddress
E_INTERRUPT, // bmAttributes E_INTERRUPT, // bmAttributes
(uint8_t) (LSB(_intf_config4[EP_INT_OUT].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config4[EP_INT_OUT].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config4[EP_INT_OUT].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config4[EP_INT_OUT].max_packet)), // wMaxPacketSize (MSB)
1, // bInterval 1, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_INT_IN], // bEndpointAddress _endpoints[EP_INT_IN], // bEndpointAddress
E_INTERRUPT, // bmAttributes E_INTERRUPT, // bmAttributes
(uint8_t) (LSB(_intf_config4[EP_INT_IN].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config4[EP_INT_IN].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config4[EP_INT_IN].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config4[EP_INT_IN].max_packet)), // wMaxPacketSize (MSB)
1, // bInterval 1, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_ISO_OUT], // bEndpointAddress _endpoints[EP_ISO_OUT], // bEndpointAddress
E_ISOCHRONOUS, // bmAttributes E_ISOCHRONOUS, // bmAttributes
(uint8_t) (LSB(_intf_config4[EP_ISO_OUT].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config4[EP_ISO_OUT].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config4[EP_ISO_OUT].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config4[EP_ISO_OUT].max_packet)), // wMaxPacketSize (MSB)
1, // bInterval 1, // bInterval
// endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13 // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
ENDPOINT_DESCRIPTOR_LENGTH, // bLength ENDPOINT_DESCRIPTOR_LENGTH, // bLength
ENDPOINT_DESCRIPTOR, // bDescriptorType ENDPOINT_DESCRIPTOR, // bDescriptorType
_endpoints[EP_ISO_IN], // bEndpointAddress _endpoints[EP_ISO_IN], // bEndpointAddress
E_ISOCHRONOUS, // bmAttributes E_ISOCHRONOUS, // bmAttributes
(uint8_t) (LSB(_intf_config4[EP_ISO_IN].max_packet)), // wMaxPacketSize (LSB) (uint8_t)(LSB(_intf_config4[EP_ISO_IN].max_packet)), // wMaxPacketSize (LSB)
(uint8_t) (MSB(_intf_config4[EP_ISO_IN].max_packet)), // wMaxPacketSize (MSB) (uint8_t)(MSB(_intf_config4[EP_ISO_IN].max_packet)), // wMaxPacketSize (MSB)
1, // bInterval 1, // bInterval
}; };
if (index == 0) { if (index == 0) {

42
TESTS/usb_device/basic/USBEndpointTester.h
View File

@ -32,19 +32,43 @@ class USBEndpointTester: public USBDevice {
public: public:
USBEndpointTester(USBPhy *phy, uint16_t vendor_id, uint16_t product_id, uint16_t product_release, USBEndpointTester(USBPhy *phy, uint16_t vendor_id, uint16_t product_id, uint16_t product_release,
bool abort_transfer_test); bool abort_transfer_test);
virtual ~USBEndpointTester(); virtual ~USBEndpointTester();
const char *get_serial_desc_string(); const char *get_serial_desc_string();
void start_ep_in_abort_test(); void start_ep_in_abort_test();
uint32_t get_cnt_cb_set_conf() const { return _cnt_cb_set_conf; } uint32_t get_cnt_cb_set_conf() const
uint32_t get_cnt_cb_set_intf() const { return _cnt_cb_set_intf; } {
uint32_t get_cnt_cb_bulk_out() const { return _cnt_cb_bulk_out; } return _cnt_cb_set_conf;
uint32_t get_cnt_cb_bulk_in() const { return _cnt_cb_bulk_in; } }
uint32_t get_cnt_cb_int_out() const { return _cnt_cb_int_out; } uint32_t get_cnt_cb_set_intf() const
uint32_t get_cnt_cb_int_in() const { return _cnt_cb_int_in; } {
uint32_t get_cnt_cb_iso_out() const { return _cnt_cb_iso_out; } return _cnt_cb_set_intf;
uint32_t get_cnt_cb_iso_in() const { return _cnt_cb_iso_in; } }
uint32_t get_cnt_cb_bulk_out() const
{
return _cnt_cb_bulk_out;
}
uint32_t get_cnt_cb_bulk_in() const
{
return _cnt_cb_bulk_in;
}
uint32_t get_cnt_cb_int_out() const
{
return _cnt_cb_int_out;
}
uint32_t get_cnt_cb_int_in() const
{
return _cnt_cb_int_in;
}
uint32_t get_cnt_cb_iso_out() const
{
return _cnt_cb_iso_out;
}
uint32_t get_cnt_cb_iso_in() const
{
return _cnt_cb_iso_in;
}
struct ep_config_t { struct ep_config_t {
bool dir_in; bool dir_in;