Bare metal profile: Enable USB basic and hid greentea test

Author: rajkan01

TESTS/configs/baremetal.json

@@ -31,7 +31,8 @@
         "kv-global-api",
         "sd",
         "qspif",
-        "cryptocell310"
+        "cryptocell310",
+        "drivers-usb"
     ],
     "target_overrides": {
         "*": {

TESTS/usb_device/basic/USBEndpointTester.cpp

@@ -17,8 +17,6 @@
 
 #if USB_DEVICE_TESTS
 
-#if defined(MBED_CONF_RTOS_PRESENT)
-
 #include "stdint.h"
 #include "stdlib.h"
 #include "USBEndpointTester.h"
@@ -173,7 +171,11 @@ USBEndpointTester::USBEndpointTester(USBPhy *phy, uint16_t vendor_id, uint16_t p
         MBED_ASSERT(_endpoint_buffs[i] != NULL);
     }
     MBED_ASSERT(resolver.valid());
+#if defined(MBED_CONF_RTOS_PRESENT)
     queue = mbed::mbed_highprio_event_queue();
+#else
+    queue = mbed::mbed_event_queue();
+#endif
     configuration_desc(0);
     ctrl_buf = new uint8_t[CTRL_BUF_SIZE];
     init();
@@ -864,5 +866,5 @@ void USBEndpointTester::start_ep_in_abort_test()
     write_start(_endpoints[EP_BULK_IN], _endpoint_buffs[EP_BULK_IN], (*_endpoint_configs)[EP_BULK_IN].max_packet);
     write_start(_endpoints[EP_INT_IN], _endpoint_buffs[EP_INT_IN], (*_endpoint_configs)[EP_INT_IN].max_packet);
 }
-#endif
+
 #endif //USB_DEVICE_TESTS

TESTS/usb_device/basic/USBTester.cpp

@@ -17,8 +17,6 @@
 
 #if USB_DEVICE_TESTS
 
-#if defined(MBED_CONF_RTOS_PRESENT)
-
 #include "stdint.h"
 #include "USBTester.h"
 #include "mbed_shared_queues.h"
@@ -45,6 +43,7 @@
 
 #define EVENT_READY (1 << 0)
 
+using namespace std::chrono_literals;
 
 USBTester::USBTester(USBPhy *phy, uint16_t vendor_id, uint16_t product_id, uint16_t product_release):
     USBDevice(phy, vendor_id, product_id, product_release), interface_0_alt_set(NONE),
@@ -60,7 +59,11 @@ USBTester::USBTester(USBPhy *phy, uint16_t vendor_id, uint16_t product_id, uint1
     int_in = resolver.endpoint_in(USB_EP_TYPE_INT, 64);
     int_out = resolver.endpoint_out(USB_EP_TYPE_INT, 64);
     MBED_ASSERT(resolver.valid());
+#if defined(MBED_CONF_RTOS_PRESENT)
     queue = mbed::mbed_highprio_event_queue();
+#else
+    queue = mbed::mbed_event_queue();
+#endif
     configuration_desc(0);
     ctrl_buf = new uint8_t[CTRL_BUF_SIZE];
     init();
@@ -136,7 +139,7 @@ void USBTester::callback_request(const setup_packet_t *setup)
     RequestResult result = PassThrough;
     uint8_t *data = NULL;
     uint32_t size = 0;
-    uint32_t delay = 0;
+    std::chrono::duration<int, std::milli> delay = 0s;
 
     /* Process vendor-specific requests */
     if (setup->bmRequestType.Type == VENDOR_TYPE) {
@@ -156,7 +159,7 @@ void USBTester::callback_request(const setup_packet_t *setup)
                 break;
             case VENDOR_TEST_CTRL_NONE_DELAY:
                 result = Success;
-                delay = 2000;
+                delay = 2s;
                 break;
             case VENDOR_TEST_CTRL_IN_SIZES:
                 result = Send;
@@ -174,7 +177,7 @@ void USBTester::callback_request(const setup_packet_t *setup)
         }
     }
 
-    if (delay) {
+    if (delay != std::chrono::duration<int, std::milli>::zero()) {
         queue->call_in(delay, static_cast<USBDevice *>(this), &USBTester::complete_request, Success, data, size);
     } else {
         complete_request(result, data, size);
@@ -706,5 +709,5 @@ void USBTester::epbulk_out_callback()
     read_finish(bulk_out);
     read_start(bulk_out, bulk_buf, sizeof(bulk_buf));
 }
-#endif
+
 #endif //USB_DEVICE_TESTS

TESTS/usb_device/basic/main.cpp

@@ -19,10 +19,6 @@
 #error [NOT_SUPPORTED] usb device tests not enabled
 #else
 
-#if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] USB stack and test cases require RTOS to run.
-#else
-
 #include <stdio.h>
 #include <string.h>
 #include "mbed.h"
@@ -669,5 +665,4 @@ int main()
 }
 
 #endif // !defined(DEVICE_USBDEVICE) || !DEVICE_USBDEVICE
-#endif // !defined(MBED_CONF_RTOS_PRESENT)
 #endif // !defined(USB_DEVICE_TESTS)

TESTS/usb_device/hid/main.cpp

@@ -19,10 +19,6 @@
 #error [NOT_SUPPORTED] usb device tests not enabled
 #else
 
-#if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] USB stack and test cases require RTOS to run.
-#else
-
 #if !defined(DEVICE_USBDEVICE) || !DEVICE_USBDEVICE
 #error [NOT_SUPPORTED] USB Device not supported for this target
 #else
@@ -393,5 +389,4 @@ int main()
 }
 
 #endif // !defined(DEVICE_USBDEVICE) || !DEVICE_USBDEVICE
-#endif // !defined(MBED_CONF_RTOS_PRESENT)
 #endif // !defined(USB_DEVICE_TESTS)