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

USBDevice - add support for deconfiguration

pull/9768/head
Maciej Bocianski 2018-04-16 09:23:21 +02:00 committed by Russ Butler
parent e4ffc6dea0
commit c2c3e01c36
2 changed files with 76 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
TESTS/usb_device/basic/USBTester.cpp
View File

@ -37,8 +37,9 @@
#define MIN_EP_SIZE 8
USBTester::USBTester(uint16_t vendor_id, uint16_t product_id, uint16_t product_release, bool connect_blocking): USBDevice(vendor_id, product_id, product_release),
reset_count(0), suspend_count(0), resume_count(0)
USBTester::USBTester(uint16_t vendor_id, uint16_t product_id, uint16_t product_release, bool connect_blocking):
USBDevice(vendor_id, product_id, product_release), reset_count(0), suspend_count(0),
resume_count(0), interface_set(NONE), configuration_set(NONE)
{
EndpointResolver resolver(endpoint_table());
@ -86,6 +87,16 @@ void USBTester::suspend(bool suspended)
}
}
void USBTester::remove_endpoints()
{
if(configuration_set == 1) {
endpoint_remove(int_in);
endpoint_remove(int_out);
endpoint_remove(bulk_in);
endpoint_remove(bulk_out);
}
}
const char *USBTester::get_serial_desc_string()
{
return get_desc_string(string_iserial_desc());
@ -105,8 +116,16 @@ const char *USBTester::get_iproduct_desc_string()
void USBTester::callback_state_change(DeviceState new_state)
{
// Nothing to do
};
if (new_state != Configured) {
configuration_set = NONE;
interface_set = NONE;
}
}
void USBTester::callback_reset()
{
++reset_count;
}
void USBTester::callback_request(const setup_packet_t *setup)
{
@ -196,29 +215,35 @@ void USBTester::callback_request_xfer_done(const setup_packet_t *setup, bool abo
// configuration is not supported.
void USBTester::callback_set_configuration(uint8_t configuration)
{
if (configuration != DEFAULT_CONFIGURATION) {
if (configuration == DEFAULT_CONFIGURATION) {
complete_set_configuration(set_configuration(configuration));
} else {
complete_set_configuration(false);
return;
}
}
// Configure endpoints > 0
endpoint_add(int_in, MAX_EP_SIZE, USB_EP_TYPE_INT);
endpoint_add(int_out, MAX_EP_SIZE, USB_EP_TYPE_INT, &USBTester::epint_out_callback);
read_start(int_out, int_buf, sizeof(int_buf));
endpoint_add(bulk_in, MAX_EP_SIZE, USB_EP_TYPE_BULK);
endpoint_add(bulk_out, MAX_EP_SIZE, USB_EP_TYPE_BULK, &USBTester::epbulk_out_callback);
read_start(bulk_out, bulk_buf, sizeof(bulk_buf));
complete_set_configuration(true);
bool USBTester::set_configuration(uint16_t configuration)
{
if(set_interface(configuration, 0, 0)) {
configuration_set = configuration;
return true;
}
return false;
}
void USBTester::callback_set_interface(uint16_t interface, uint8_t alternate)
{
bool success = set_interface(configuration_set, interface, alternate);
complete_set_interface(success);
}
bool USBTester::set_interface(uint16_t configuration, uint16_t interface, uint16_t alternate)
{
bool success = false;
if (configuration == 1) {
if (interface == 0 && alternate == 0) {
endpoint_remove(int_in);
endpoint_remove(int_out);
endpoint_remove(bulk_in);
endpoint_remove(bulk_out);
remove_endpoints();
endpoint_add(int_in, MAX_EP_SIZE, USB_EP_TYPE_INT);
endpoint_add(int_out, MAX_EP_SIZE, USB_EP_TYPE_INT, &USBTester::epint_out_callback);
@ -227,14 +252,11 @@ void USBTester::callback_set_interface(uint16_t interface, uint8_t alternate)
endpoint_add(bulk_out, MAX_EP_SIZE, USB_EP_TYPE_BULK, &USBTester::epbulk_out_callback);
read_start(bulk_out, bulk_buf, sizeof(bulk_buf));
complete_set_interface(true);
return;
interface_set = interface;
success = true;
}
if (interface == 0 && alternate == 1) {
endpoint_remove(int_in);
endpoint_remove(int_out);
endpoint_remove(bulk_in);
endpoint_remove(bulk_out);
remove_endpoints();
endpoint_add(int_in, MIN_EP_SIZE, USB_EP_TYPE_INT);
endpoint_add(int_out, MIN_EP_SIZE, USB_EP_TYPE_INT, &USBTester::epint_out_callback);
@ -243,10 +265,11 @@ void USBTester::callback_set_interface(uint16_t interface, uint8_t alternate)
endpoint_add(bulk_out, MIN_EP_SIZE, USB_EP_TYPE_BULK, &USBTester::epbulk_out_callback);
read_start(bulk_out, bulk_buf, sizeof(bulk_buf));
complete_set_interface(true);
return;
interface_set = interface;
success = true;
}
complete_set_interface(false);
}
return success;
}
const uint8_t *USBTester::device_desc()

9
TESTS/usb_device/basic/USBTester.h
View File

@ -55,8 +55,15 @@ public:
void clear_resume_count() { resume_count = 0; }
private:
enum { NONE = -1 };
const char *get_desc_string(const uint8_t *desc);
virtual void suspend(bool suspended);
void remove_endpoints();
bool set_configuration(uint16_t configuration);
bool set_interface(uint16_t configuration, uint16_t interface, uint16_t alternate);
int16_t interface_set;
int16_t configuration_set;
protected:
@ -107,7 +114,7 @@ protected:
virtual void callback_set_interface(uint16_t interface, uint8_t alternate);
virtual void epbulk_out_callback(usb_ep_t endpoint);
virtual void epint_out_callback(usb_ep_t endpoint);
virtual void callback_reset() { ++reset_count; }
virtual void callback_reset();
uint8_t ctrl_buf[2048];
};