- Remove the partially implemented VENDOR_TEST_CTRL_NONE USB control request type.

- Remove the USB control request type VENDOR_TEST_CTRL_IN_DELAY, VENDOR_TEST_CTRL_OUT_DELAY, VENDOR_TEST_CTRL_IN_STATUS_DELAY, VENDOR_TEST_CTRL_OUT_STATUS_DELAY macros as did not have any test.

Author: rajkan01

TESTS/host_tests/pyusb_basic.py

@@ -58,15 +58,10 @@ def get_interface(dev, interface, alternate=0):
 
 VENDOR_TEST_CTRL_IN = 1
 VENDOR_TEST_CTRL_OUT = 2
-VENDOR_TEST_CTRL_NONE = 3
-VENDOR_TEST_CTRL_IN_DELAY = 4
-VENDOR_TEST_CTRL_OUT_DELAY = 5
-VENDOR_TEST_CTRL_IN_STATUS_DELAY = 7
-VENDOR_TEST_CTRL_OUT_STATUS_DELAY = 8
-VENDOR_TEST_CTRL_IN_SIZES = 9
-VENDOR_TEST_CTRL_OUT_SIZES = 10
-VENDOR_TEST_RW_RESTART = 11
-VENDOR_TEST_ABORT_BUFF_CHECK = 12
+VENDOR_TEST_CTRL_IN_SIZES = 3
+VENDOR_TEST_CTRL_OUT_SIZES = 4
+VENDOR_TEST_RW_RESTART = 5
+VENDOR_TEST_ABORT_BUFF_CHECK = 6
 VENDOR_TEST_UNSUPPORTED_REQUEST = 32
 
 REQUEST_GET_STATUS = 0

TESTS/usb_device/basic/USBEndpointTester.cpp

@@ -37,10 +37,10 @@
 
 #define VENDOR_TEST_CTRL_IN             1
 #define VENDOR_TEST_CTRL_OUT            2
-#define VENDOR_TEST_CTRL_IN_SIZES       9
-#define VENDOR_TEST_CTRL_OUT_SIZES      10
-#define VENDOR_TEST_RW_RESTART          11
-#define VENDOR_TEST_ABORT_BUFF_CHECK    12
+#define VENDOR_TEST_CTRL_IN_SIZES       3
+#define VENDOR_TEST_CTRL_OUT_SIZES      4
+#define VENDOR_TEST_RW_RESTART          5
+#define VENDOR_TEST_ABORT_BUFF_CHECK    6
 
 #define CTRL_BUF_SIZE (2048)
 

TESTS/usb_device/basic/USBTester.cpp

@@ -27,13 +27,8 @@
 
 #define VENDOR_TEST_CTRL_IN                 1
 #define VENDOR_TEST_CTRL_OUT                2
-#define VENDOR_TEST_CTRL_NONE               3
-#define VENDOR_TEST_CTRL_IN_DELAY           4
-#define VENDOR_TEST_CTRL_OUT_DELAY          5
-#define VENDOR_TEST_CTRL_IN_STATUS_DELAY    7
-#define VENDOR_TEST_CTRL_OUT_STATUS_DELAY   8
-#define VENDOR_TEST_CTRL_IN_SIZES           9
-#define VENDOR_TEST_CTRL_OUT_SIZES          10
+#define VENDOR_TEST_CTRL_IN_SIZES           3
+#define VENDOR_TEST_CTRL_OUT_SIZES          4
 
 #define MAX_EP_SIZE 64
 #define MIN_EP_SIZE 8
@@ -145,9 +140,6 @@ void USBTester::callback_request(const setup_packet_t *setup)
                 data = ctrl_buf;
                 size = setup->wValue < 8 ? setup->wValue : 8;
                 break;
-            case VENDOR_TEST_CTRL_NONE:
-                result = Success;
-                break;
             case VENDOR_TEST_CTRL_IN_SIZES:
                 result = Send;
                 data = ctrl_buf;