Bare metal profile: Enable USB serial greentea test

Author: rajkan01

TESTS/usb_device/serial/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
@@ -152,8 +148,11 @@ line_coding_t test_codings[] = {
     { 9600, 8, 0, 0 },
     { 57600, 8, 0, 0 },
 };
-
+#if defined(MBED_CONF_RTOS_PRESENT)
 Mail<line_coding_t, 8> lc_mail;
+#else
+static CircularBuffer<line_coding_t, 8> lc_data;
+#endif
 
 #define EF_SEND (1ul << 0)
 EventFlags event_flags;
@@ -388,6 +387,17 @@ void tx_thread_fun(USBCDC *usb_cdc)
     }
 }
 
+void tx_ticker_fun(USBCDC *usb_cdc, uint8_t start_val)
+{
+    static uint8_t buff_val = start_val;
+    uint8_t buff[TX_BUFF_SIZE] = { 0 };
+    memset(buff, buff_val, TX_BUFF_SIZE);
+    while (usb_cdc->send(buff, TX_BUFF_SIZE)) {
+        break;
+    }
+    buff_val++;
+}
+
 /** Test CDC receive single bytes concurrently
  *
  * Given the USB CDC device connected to a host
@@ -405,9 +415,15 @@ void test_cdc_rx_single_bytes_concurrent()
     ThisThread::sleep_for(LINUX_HOST_DTR_FIX_DELAY_MS);
 #endif
     usb_cdc.wait_ready();
+#if defined(MBED_CONF_RTOS_PRESENT)
     Thread tx_thread;
     event_flags.set(EF_SEND);
     tx_thread.start(mbed::callback(tx_thread_fun, &usb_cdc));
+#else
+    Ticker t;
+    t.attach_us([&] { tx_ticker_fun(&usb_cdc, 0); }, 3000);
+#endif
+
     uint8_t buff = 0x01;
     for (int expected = 0xff; expected >= 0; expected--) {
         TEST_ASSERT(usb_cdc.receive(&buff, 1, NULL));
@@ -418,7 +434,9 @@ void test_cdc_rx_single_bytes_concurrent()
         TEST_ASSERT_EQUAL_UINT8(expected, buff);
     }
     event_flags.clear(EF_SEND);
+#if defined(MBED_CONF_RTOS_PRESENT)
     tx_thread.join();
+#endif
     // Wait for the host to close its port.
     while (usb_cdc.ready()) {
         ThisThread::sleep_for(1);
@@ -482,9 +500,14 @@ void test_cdc_rx_multiple_bytes_concurrent()
     ThisThread::sleep_for(LINUX_HOST_DTR_FIX_DELAY_MS);
 #endif
     usb_cdc.wait_ready();
+#if defined(MBED_CONF_RTOS_PRESENT)
     Thread tx_thread;
     event_flags.set(EF_SEND);
     tx_thread.start(mbed::callback(tx_thread_fun, &usb_cdc));
+#else
+    Ticker t;
+    t.attach_us([&] { tx_ticker_fun(&usb_cdc, 0); }, 3000);
+#endif
     uint8_t buff[RX_BUFF_SIZE] = { 0 };
     uint8_t expected_buff[RX_BUFF_SIZE] = { 0 };
     for (int expected = 0xff; expected >= 0; expected--) {
@@ -501,8 +524,12 @@ void test_cdc_rx_multiple_bytes_concurrent()
             TEST_ASSERT_EQUAL_UINT8_ARRAY(expected_buff, buff, RX_BUFF_SIZE);
         }
     }
+#if defined(MBED_CONF_RTOS_PRESENT)
     event_flags.clear(EF_SEND);
     tx_thread.join();
+#else
+    t.detach();
+#endif
     // Wait for the host to close its port.
     while (usb_cdc.ready()) {
         ThisThread::sleep_for(1);
@@ -742,12 +769,22 @@ void test_serial_printf_scanf()
 
 void line_coding_changed_cb(int baud, int bits, int parity, int stop)
 {
+#if defined(MBED_CONF_RTOS_PRESENT)
     line_coding_t *lc = lc_mail.alloc();
     lc->baud = baud;
     lc->bits = bits;
     lc->parity = parity;
     lc->stop = stop;
     lc_mail.put(lc);
+#else
+    line_coding_t lc = {0};
+    lc.baud = baud;
+    lc.bits = bits;
+    lc.parity = parity;
+    lc.stop = stop;
+    lc_data.push(lc);
+    event_flags.set(EF_SEND);
+#endif
 }
 
 /** Test Serial / CDC line coding change
@@ -785,6 +822,7 @@ void test_serial_line_coding_change()
         // calls to line_coding_changed callback on the device.
         while (num_expected_callbacks > 0) {
             num_expected_callbacks--;
+#if defined(MBED_CONF_RTOS_PRESENT)
             osEvent event = lc_mail.get();
             TEST_ASSERT_EQUAL_UINT32(osEventMail, event.status);
             lc_actual = (line_coding_t *) event.value.p;
@@ -795,12 +833,23 @@ void test_serial_line_coding_change()
                 // set of params.
                 lc_mail.free(lc_actual);
             }
+#else
+            line_coding_t lc_receive = {0};
+            event_flags.wait_all(EF_SEND);
+            lc_data.pop(lc_receive);
+            if (lc_expected->get_num_diffs(lc_receive) == 0) {
+                break;
+            }
+            lc_actual = &lc_receive;
+#endif
         }
         TEST_ASSERT_EQUAL_INT(lc_expected->baud, lc_actual->baud);
         TEST_ASSERT_EQUAL_INT(lc_expected->bits, lc_actual->bits);
         TEST_ASSERT_EQUAL_INT(lc_expected->parity, lc_actual->parity);
         TEST_ASSERT_EQUAL_INT(lc_expected->stop, lc_actual->stop);
+#if defined(MBED_CONF_RTOS_PRESENT)
         lc_mail.free(lc_actual);
+#endif
         lc_prev = lc_expected;
     }
     // Wait for the host to close its port.
@@ -857,5 +906,4 @@ int main()
 }
 
 #endif // !defined(DEVICE_USBDEVICE) || !DEVICE_USBDEVICE
-#endif // !defined(MBED_CONF_RTOS_PRESENT)
 #endif // !defined(USB_DEVICE_TESTS)