USB: fix corner case when cdc_acm is in dt and CONFIG_CDC is disabled

Author: facchinm

cores/arduino/SerialUSB.h

@@ -31,6 +31,6 @@ class SerialUSB_ : public ZephyrSerial {
 };
 }  // namespace arduino
 
-#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm)
+#if (DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm) && CONFIG_USB_CDC_ACM)
 extern arduino::SerialUSB_ Serial;
 #endif

cores/arduino/USB.cpp

@@ -4,23 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-// Make PluggableUSB link happy
-#include "api/PluggableUSB.h"
-
-static uint8_t _epBuffer[1];
-void* epBuffer(unsigned int n) {
-    return &_epBuffer[n];
-};
-
-arduino::PluggableUSB_::PluggableUSB_() {}
-
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/uart.h>
 #include <zephyr/drivers/uart/cdc_acm.h>
 #include <zephyr/usb/usb_device.h>
 #include <SerialUSB.h>
 
-#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm)
+#if (DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm) && CONFIG_USB_CDC_ACM)
 const struct device *const usb_dev = DEVICE_DT_GET(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), cdc_acm, 0));
 
 void usb_status_cb(enum usb_dc_status_code cb_status, const uint8_t *param) {

cores/arduino/main.cpp

@@ -10,14 +10,16 @@
 #endif
 
 int main(void) {
-#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm) || DT_NODE_HAS_PROP(DT_PATH(zephyr_user), serials)
+#if (DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm) && CONFIG_USB_CDC_ACM)
   Serial.begin(115200);
 #endif
   setup();
 
   for (;;) {
     loop();
+  #if (DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm) && CONFIG_USB_CDC_ACM) || DT_NODE_HAS_PROP(DT_PATH(zephyr_user), serials)
     if (arduino::serialEventRun) arduino::serialEventRun();
+  #endif
   }
 
   return 0;

cores/arduino/zephyrSerial.cpp

@@ -164,10 +164,25 @@ size_t arduino::ZephyrSerial::write(const uint8_t *buffer, size_t size)
 	return ret;
 }
 
+void arduino::ZephyrSerial::flush() {
+	while (ring_buf_size_get(&tx.ringbuf) > 0) {
+		k_yield();
+	}
+	while (uart_irq_tx_complete(uart) == 0){
+		k_yield();
+	}
+}
+
+#if (DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm))
+#define FIRST_UART_INDEX 1
+#else
+#define FIRST_UART_INDEX 0
+#endif
+
 #if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), serials)
-#if !DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm)
+#if !(DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm) && CONFIG_USB_CDC_ACM)
 // If CDC USB, use that object as Serial (and SerialUSB)
-arduino::ZephyrSerial Serial(DEVICE_DT_GET(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), serials, 0)));
+arduino::ZephyrSerial Serial(DEVICE_DT_GET(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), serials, FIRST_UART_INDEX)));
 #endif
 #if (DT_PROP_LEN(DT_PATH(zephyr_user), serials) > 1)
 #define ARDUINO_SERIAL_DEFINED_0 1

cores/arduino/zephyrSerial.h

@@ -84,7 +84,7 @@ class ZephyrSerial : public HardwareSerial
 }   // namespace arduino
 
 #if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), serials)
-#if !DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm)
+#if !(DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm) && CONFIG_USB_CDC_ACM)
 // If CDC USB, use that object as Serial (and SerialUSB)
 extern arduino::ZephyrSerial Serial;
 #endif