cdc instance assigned when begin

revert itf to instance rename

Author: hathach

examples/CDC/multiCDC/multiCDC.ino

@@ -11,7 +11,7 @@
     MIT license, check LICENSE for more information
 
     The example creates three virtual serial ports.  Text entered on
-    any of the ports will be echoed to the other two ports.
+    any of the ports will be echoed to the all ports.
 
     The max number of CDC ports (CFG_TUD_CDC) has to be changed to at
     least 3, changed in the core tusb_config.h file.
@@ -22,61 +22,75 @@
 #define LED LED_BUILTIN
 
 /*
-      Create extra USB Serial Ports.  "Serial" is already created.
+    Create extra USB Serial Ports.  "Serial" is already created.
 */
-Adafruit_USBD_CDC USBSer2(1);
-Adafruit_USBD_CDC USBSer3(2);
-
-Adafruit_USBD_CDC *ports[CFG_TUD_CDC] = { &Serial, &USBSer2, &USBSer3, NULL };
+Adafruit_USBD_CDC USBSer1;
+Adafruit_USBD_CDC USBSer2;
 
 void setup() {
   pinMode(LED, OUTPUT);
+
   // start up all of the USB Vitual ports, and wait for them to enumerate.
-  Serial.begin(115200);   // Do these in order, or
-  USBSer2.begin(115200);  //   "bad things will happen"
-  USBSer3.begin(115200);
-  while (!Serial || !USBSer2 || !USBSer3) {
+  Serial.begin(115200);
+  USBSer1.begin(115200);
+  USBSer2.begin(115200);
+
+  while (!Serial || !USBSer1 || !USBSer2) {
     if (Serial) {
       Serial.println("Waiting for other USB ports");
     }
+    if (USBSer1) {
+      USBSer1.println("Waiting for other USB ports");
+    }
     if (USBSer2) {
       USBSer2.println("Waiting for other USB ports");
     }
-    if (USBSer3) {
-      USBSer3.println("Waiting for other USB ports");
-    }
     delay(1000);
   }
+
   Serial.print("You are port 0\n\r\n0> ");
-  USBSer2.print("You are port 1\n\r\n1> ");
-  USBSer3.print("You are port 2\n\r\n2> ");
+  USBSer1.print("You are port 1\n\r\n1> ");
+  USBSer2.print("You are port 2\n\r\n2> ");
 }
 
 int LEDstate = 0;
 
 void loop() {
   int ch;
+
   ch = Serial.read();
   if (ch > 0) {
-    USBSer2.write(ch);
-    USBSer3.write(ch);
+    printAll(ch);
   }
-  ch = USBSer2.read();
+
+  ch = USBSer1.read();
   if (ch > 0) {
-    Serial.write(ch);
-    USBSer3.write(ch);
+    printAll(ch);
   }
-  ch = USBSer3.read();
+
+  ch = USBSer2.read();
   if (ch > 0) {
-    Serial.write(ch);
-    USBSer2.write(ch);
+    printAll(ch);
   }
+
   if (delay_without_delaying(500)) {
     LEDstate = !LEDstate;
     digitalWrite(LED, LEDstate);
   }
 }
 
+// print to all CDC ports
+void printAll(int ch) {
+  // print as it is
+  Serial.write(ch);
+
+  // always lower case
+  USBSer1.write(tolower(ch));
+
+  // always upper case
+  USBSer2.write(toupper(ch));
+}
+
 // Helper: non-blocking "delay" alternative.
 boolean delay_without_delaying(unsigned long time) {
   // return false if we're still "delaying", true if time ms has passed.
@@ -89,5 +103,3 @@ boolean delay_without_delaying(unsigned long time) {
   }
   return false;
 }
-
-// Helper: non-blocking line-at-a-time read.

src/arduino/Adafruit_TinyUSB_API.cpp

@@ -46,10 +46,13 @@ void TinyUSB_Device_Task(void) {
 }
 #endif
 
+// TODO should use getInstanceCount() API (when closed to BSP release cycle)
+// from Adafruit_USBD_CDC.cpp
+extern uint8_t _cdc_instance_count;
+
 void TinyUSB_Device_FlushCDC(void) {
-  for (uint8_t CDCinstance=0; CDCinstance < CFG_TUD_CDC; CDCinstance++) {
-    // note that flushing an uninitialized CDC is harmless.
-    tud_cdc_n_write_flush(CDCinstance);
+  for (uint8_t instance = 0; instance < _cdc_instance_count; instance++) {
+    tud_cdc_n_write_flush(instance);
   }
 }
 }

src/arduino/Adafruit_USBD_CDC.cpp

@@ -33,14 +33,17 @@
 #include "Adafruit_USBD_CDC.h"
 #include "Adafruit_USBD_Device.h"
 
-#define EPOUT 0x00   // Starting endpoints; adjusted elsewhere as needed
+// Starting endpoints; adjusted elsewhere as needed
+#define EPOUT 0x00
 #define EPIN 0x80
 
+uint8_t _cdc_instance_count = 0;
+
 Adafruit_USBD_CDC Serial;
 
-Adafruit_USBD_CDC::Adafruit_USBD_CDC(int instance) {
+Adafruit_USBD_CDC::Adafruit_USBD_CDC(void) {
   _begun = false;
-  _instance = instance;
+  _itf = 0;
 }
 
 uint16_t Adafruit_USBD_CDC::getInterfaceDescriptor(uint8_t itfnum, uint8_t *buf,
@@ -66,7 +69,13 @@ void Adafruit_USBD_CDC::begin(uint32_t baud) {
     return;
   }
 
+  // too many instances
+  if (!(_cdc_instance_count < CFG_TUD_CDC)) {
+    return;
+  }
+
   _begun = true;
+  _itf = _cdc_instance_count++;
   this->setStringDescriptor("TinyUSB Serial");
   USBDevice.addInterface(*this);
 }
@@ -79,40 +88,41 @@ void Adafruit_USBD_CDC::begin(uint32_t baud, uint8_t config) {
 void Adafruit_USBD_CDC::end(void) {
   // Resset configuration descriptor without Serial as CDC
   USBDevice.clearConfiguration();
+  _cdc_instance_count = 0;
 }
 
 uint32_t Adafruit_USBD_CDC::baud(void) {
   cdc_line_coding_t coding;
-  tud_cdc_n_get_line_coding(_instance, &coding);
+  tud_cdc_n_get_line_coding(_itf, &coding);
 
   return coding.bit_rate;
 }
 
 uint8_t Adafruit_USBD_CDC::stopbits(void) {
   cdc_line_coding_t coding;
-  tud_cdc_n_get_line_coding(_instance, &coding);
+  tud_cdc_n_get_line_coding(_itf, &coding);
 
   return coding.stop_bits;
 }
 
 uint8_t Adafruit_USBD_CDC::paritytype(void) {
   cdc_line_coding_t coding;
-  tud_cdc_n_get_line_coding(_instance, &coding);
+  tud_cdc_n_get_line_coding(_itf, &coding);
 
   return coding.parity;
 }
 
 uint8_t Adafruit_USBD_CDC::numbits(void) {
   cdc_line_coding_t coding;
-  tud_cdc_n_get_line_coding(_instance, &coding);
+  tud_cdc_n_get_line_coding(_itf, &coding);
 
   return coding.data_bits;
 }
 
-int Adafruit_USBD_CDC::dtr(void) { return tud_cdc_n_connected(_instance); }
+int Adafruit_USBD_CDC::dtr(void) { return tud_cdc_n_connected(_itf); }
 
 Adafruit_USBD_CDC::operator bool() {
-  bool ret = tud_cdc_n_connected(_instance);
+  bool ret = tud_cdc_n_connected(_itf);
 
   // Add an yield to run usb background in case sketch block wait as follows
   // while( !Serial ) {}
@@ -123,7 +133,7 @@ Adafruit_USBD_CDC::operator bool() {
 }
 
 int Adafruit_USBD_CDC::available(void) {
-  uint32_t count = tud_cdc_n_available(_instance);
+  uint32_t count = tud_cdc_n_available(_itf);
 
   // Add an yield to run usb background in case sketch block wait as follows
   // while( !Serial.available() ) {}
@@ -136,19 +146,19 @@ int Adafruit_USBD_CDC::available(void) {
 
 int Adafruit_USBD_CDC::peek(void) {
   uint8_t ch;
-  return tud_cdc_n_peek(_instance, &ch) ? (int)ch : -1;
+  return tud_cdc_n_peek(_itf, &ch) ? (int)ch : -1;
 }
 
-int Adafruit_USBD_CDC::read(void) { return (int)tud_cdc_n_read_char(_instance); }
+int Adafruit_USBD_CDC::read(void) { return (int)tud_cdc_n_read_char(_itf); }
 
-void Adafruit_USBD_CDC::flush(void) { tud_cdc_n_write_flush(_instance); }
+void Adafruit_USBD_CDC::flush(void) { tud_cdc_n_write_flush(_itf); }
 
 size_t Adafruit_USBD_CDC::write(uint8_t ch) { return write(&ch, 1); }
 
 size_t Adafruit_USBD_CDC::write(const uint8_t *buffer, size_t size) {
   size_t remain = size;
-  while (remain && tud_cdc_n_connected(_instance)) {
-    size_t wrcount = tud_cdc_n_write(_instance, buffer, remain);
+  while (remain && tud_cdc_n_connected(_itf)) {
+    size_t wrcount = tud_cdc_n_write(_itf, buffer, remain);
     remain -= wrcount;
     buffer += wrcount;
 
@@ -162,14 +172,14 @@ size_t Adafruit_USBD_CDC::write(const uint8_t *buffer, size_t size) {
 }
 
 int Adafruit_USBD_CDC::availableForWrite(void) {
-  return tud_cdc_n_write_available(_instance);
+  return tud_cdc_n_write_available(_itf);
 }
 
 extern "C" {
 
 // Invoked when cdc when line state changed e.g connected/disconnected
 // Use to reset to DFU when disconnect with 1200 bps
-  void tud_cdc_line_state_cb(uint8_t instance, bool dtr, bool rts) {
+void tud_cdc_line_state_cb(uint8_t instance, bool dtr, bool rts) {
   (void)rts;
 
   // DTR = false is counted as disconnected

src/arduino/Adafruit_USBD_CDC.h

@@ -34,8 +34,7 @@
 
 class Adafruit_USBD_CDC : public Stream, public Adafruit_USBD_Interface {
 public:
-  Adafruit_USBD_CDC(int instance);
-  Adafruit_USBD_CDC(void) { Adafruit_USBD_CDC(0); }
+  Adafruit_USBD_CDC(void);
 
   // fron Adafruit_USBD_Interface
   virtual uint16_t getInterfaceDescriptor(uint8_t itfnum, uint8_t *buf,
@@ -71,11 +70,17 @@ class Adafruit_USBD_CDC : public Stream, public Adafruit_USBD_Interface {
   virtual int availableForWrite(void);
   using Print::write; // pull in write(str) from Print
   operator bool();
-  uint8_t getInstance() { return _instance; }
 
 private:
   bool _begun;
-  uint8_t _instance;  // which CDC of CFG_TUD_CDC total CDCs.
+  uint8_t _itf;
+
+  /* TODO when closed to BSP release cycle (SAMD, nRF, rp2040)
+   * rename _itf to _instance and add
+   *
+   * static uint8_t getInstanceCount(void);
+   * static uint8_t _instance_count;
+   */
 };
 
 extern Adafruit_USBD_CDC Serial;