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

Tests: USB: Update ep callbacks 

Endpoint callbacks no longer have endpoint as a param. This update was
introduced in #7267.
pull/9768/head
Filip Jagodzinski 2018-06-21 23:48:55 +02:00 committed by Russ Butler
parent c12e2d15f5
commit 27bd1656b1
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -684,10 +684,10 @@ const uint8_t *USBEndpointTester::configuration_desc(uint8_t index)
}
}
void USBEndpointTester::_cb_bulk_out(usb_ep_t endpoint)
void USBEndpointTester::_cb_bulk_out()
{
_cnt_cb_bulk_out++;
uint32_t rx_size = read_finish(endpoint);
uint32_t rx_size = read_finish(_endpoints[EP_BULK_OUT]);
if (_abort_transfer_test == false) {
// Send data back to host using the IN endpoint.
@ -699,15 +699,15 @@ void USBEndpointTester::_cb_bulk_out(usb_ep_t endpoint)
_num_packets_bulk_out_abort++;
read_start(_endpoints[EP_BULK_OUT], _endpoint_buffs[EP_BULK_OUT], (*_endpoint_configs)[EP_BULK_OUT].max_packet);
if (_num_packets_bulk_out_abort == NUM_PACKETS_UNTIL_ABORT) {
endpoint_abort(endpoint);
endpoint_abort(_endpoints[EP_BULK_OUT]);
}
}
}
void USBEndpointTester::_cb_bulk_in(usb_ep_t endpoint)
void USBEndpointTester::_cb_bulk_in()
{
_cnt_cb_bulk_in++;
write_finish(endpoint);
write_finish(_endpoints[EP_BULK_IN]);
if (_abort_transfer_test == false) {
// Receive more data from the host using the OUT endpoint.
@ -721,15 +721,15 @@ void USBEndpointTester::_cb_bulk_in(usb_ep_t endpoint)
memset(_endpoint_buffs[EP_BULK_IN], _num_packets_bulk_in_abort, (*_endpoint_configs)[EP_BULK_IN].max_packet);
write_start(_endpoints[EP_BULK_IN], _endpoint_buffs[EP_BULK_IN], (*_endpoint_configs)[EP_BULK_IN].max_packet);
if (_num_packets_bulk_in_abort == NUM_PACKETS_UNTIL_ABORT) {
endpoint_abort(endpoint);
endpoint_abort(_endpoints[EP_BULK_IN]);
}
}
}
void USBEndpointTester::_cb_int_out(usb_ep_t endpoint)
void USBEndpointTester::_cb_int_out()
{
_cnt_cb_int_out++;
uint32_t rx_size = read_finish(endpoint);
uint32_t rx_size = read_finish(_endpoints[EP_INT_OUT]);
if (_abort_transfer_test == false) {
// Send data back to host using the IN endpoint.
memset(_endpoint_buffs[EP_INT_IN], 0, (*_endpoint_configs)[EP_INT_IN].max_packet);
@ -740,15 +740,15 @@ void USBEndpointTester::_cb_int_out(usb_ep_t endpoint)
_num_packets_int_out_abort++;
read_start(_endpoints[EP_INT_OUT], _endpoint_buffs[EP_INT_OUT], (*_endpoint_configs)[EP_INT_OUT].max_packet);
if (_num_packets_int_out_abort == NUM_PACKETS_UNTIL_ABORT) {
endpoint_abort(endpoint);
endpoint_abort(_endpoints[EP_INT_OUT]);
}
}
}
void USBEndpointTester::_cb_int_in(usb_ep_t endpoint)
void USBEndpointTester::_cb_int_in()
{
_cnt_cb_int_in++;
write_finish(endpoint);
write_finish(_endpoints[EP_INT_IN]);
if (_abort_transfer_test == false) {
// Receive more data from the host using the OUT endpoint.
read_start(_endpoints[EP_INT_OUT], _endpoint_buffs[EP_INT_OUT], (*_endpoint_configs)[EP_INT_OUT].max_packet);
@ -761,25 +761,25 @@ void USBEndpointTester::_cb_int_in(usb_ep_t endpoint)
memset(_endpoint_buffs[EP_INT_IN], _num_packets_int_in_abort, (*_endpoint_configs)[EP_INT_IN].max_packet);
write_start(_endpoints[EP_INT_IN], _endpoint_buffs[EP_INT_IN], (*_endpoint_configs)[EP_INT_IN].max_packet);
if (_num_packets_int_in_abort == NUM_PACKETS_UNTIL_ABORT) {
endpoint_abort(endpoint);
endpoint_abort(_endpoints[EP_INT_IN]);
}
}
}
void USBEndpointTester::_cb_iso_out(usb_ep_t endpoint)
void USBEndpointTester::_cb_iso_out()
{
_cnt_cb_iso_out++;
uint32_t rx_size = read_finish(endpoint);
uint32_t rx_size = read_finish(_endpoints[EP_ISO_OUT]);
// Send data back to host using the IN endpoint.
memset(_endpoint_buffs[EP_ISO_IN], 0, (*_endpoint_configs)[EP_ISO_IN].max_packet);
memcpy(_endpoint_buffs[EP_ISO_IN], _endpoint_buffs[EP_ISO_OUT], rx_size);
write_start(_endpoints[EP_ISO_IN], _endpoint_buffs[EP_ISO_IN], rx_size);
}
void USBEndpointTester::_cb_iso_in(usb_ep_t endpoint)
void USBEndpointTester::_cb_iso_in()
{
_cnt_cb_iso_in++;
write_finish(endpoint);
write_finish(_endpoints[EP_ISO_IN]);
// Receive more data from the host using the OUT endpoint.
read_start(_endpoints[EP_ISO_OUT], _endpoint_buffs[EP_ISO_OUT], (*_endpoint_configs)[EP_ISO_OUT].max_packet);
}

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

@ -33,7 +33,7 @@ class USBEndpointTester: public USBDevice {
public:
USBEndpointTester(USBPhy *phy, uint16_t vendor_id, uint16_t product_id, uint16_t product_release,
bool abort_transfer_test);
~USBEndpointTester();
virtual ~USBEndpointTester();
const char *get_serial_desc_string();
void start_ep_in_abort_test();
@ -94,12 +94,12 @@ protected:
void _setup_non_zero_endpoints();
bool _setup_interface(uint16_t interface, uint8_t alternate);
virtual void _cb_bulk_out(usb_ep_t endpoint);
virtual void _cb_bulk_in(usb_ep_t endpoint);
virtual void _cb_int_out(usb_ep_t endpoint);
virtual void _cb_int_in(usb_ep_t endpoint);
virtual void _cb_iso_out(usb_ep_t endpoint);
virtual void _cb_iso_in(usb_ep_t endpoint);
virtual void _cb_bulk_out();
virtual void _cb_bulk_in();
virtual void _cb_int_out();
virtual void _cb_int_in();
virtual void _cb_iso_out();
virtual void _cb_iso_in();
private:
const char *get_desc_string(const uint8_t *desc);