move files to arduino sub folder, separate port api header

Author: hathach

src/Adafruit_TinyUSB.h

@@ -31,18 +31,19 @@
 
 #ifdef USE_TINYUSB
 
-#include "Adafruit_USBD_Device.h"
+#include "arduino/Adafruit_USBD_Device.h"
+
+// CDC can be part of the core
 #include "Adafruit_USBD_CDC.h"
-#include "Adafruit_USBD_HID.h"
-#include "Adafruit_USBD_MIDI.h"
-#include "Adafruit_USBD_MSC.h"
-#include "Adafruit_USBD_WebUSB.h"
 
-// Called by main.cpp to initialize usb device typically with CDC device for Serial
-void Adafruit_TinyUSB_Device_init(uint8_t rhport);
+#include "arduino/Adafruit_USBD_HID.h"
+#include "arduino/Adafruit_USBD_MIDI.h"
+#include "arduino/Adafruit_USBD_MSC.h"
+#include "arduino/Adafruit_USBD_WebUSB.h"
 
-// Invoked when host disconnects cdc at baud 1200, usually touch feature to go into DFU mode
-void Adafruit_TinyUSB_touch1200(void);
+// Initialize device hardware, stack, also Serial as CDC
+// Wrapper for USBDevice.begin(rhport)
+void TinyUSB_Device_Init(uint8_t rhport);
 
 #endif
 

src/Adafruit_TinyUSB.cpp renamed to src/arduino/Adafruit_TinyUSB.cpp

@@ -30,7 +30,7 @@
 // MACRO TYPEDEF CONSTANT ENUM DECLARATION
 //--------------------------------------------------------------------+
 
-void Adafruit_TinyUSB_Device_init(uint8_t rhport)
+void TinyUSB_Device_init(uint8_t rhport)
 {
   USBDevice.begin(rhport);
 }

src/Adafruit_USBD_CDC.cpp renamed to src/arduino/Adafruit_USBD_CDC.cpp

@@ -28,7 +28,7 @@
 #include "tusb.h"
 #include "Adafruit_USBD_CDC.h"
 
-void Adafruit_TinyUSB_touch1200(void);
+#include "arduino/ports/Adafruit_TinyUSB_Port.h"
 
 #define EPOUT   0x00
 #define EPIN    0x80
@@ -178,16 +178,19 @@ extern "C"
 // Use to reset to DFU when disconnect with 1200 bps
 void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts)
 {
-  (void) itf;  // interface ID, not used
   (void) rts;
 
   // DTR = false is counted as disconnected
   if ( !dtr )
   {
-    cdc_line_coding_t coding;
-    tud_cdc_get_line_coding(&coding);
-
-    if ( coding.bit_rate == 1200 ) Adafruit_TinyUSB_touch1200();
+    // touch1200 only with first CDC instance (Serial)
+    if ( itf == 0 )
+    {
+      cdc_line_coding_t coding;
+      tud_cdc_get_line_coding(&coding);
+
+      if ( coding.bit_rate == 1200 ) TinyUSB_Port_EnterDFU();
+    }
   }
 }
 

src/Adafruit_USBD_Device.cpp renamed to src/arduino/Adafruit_USBD_Device.cpp

@@ -26,6 +26,7 @@
 
 #include "Adafruit_USBD_Device.h"
 #include "Adafruit_USBD_CDC.h"
+#include "arduino/ports/Adafruit_TinyUSB_Port.h"
 
 #ifndef USB_MANUFACTURER
   #define USB_MANUFACTURER "Unknown"
@@ -213,7 +214,7 @@ bool Adafruit_USBD_Device::begin(uint8_t rhport)
   USBDevice.addInterface(Serial);
   USBDevice.setID(USB_VID, USB_PID);
 
-  portInitHardware(rhport);
+  TinyUSB_Port_InitDeviceController(rhport);
 
   return tusb_init();
 }

src/Adafruit_USBD_Device.h renamed to src/arduino/Adafruit_USBD_Device.h

@@ -28,13 +28,6 @@
 #include "tusb.h"
 #include "Adafruit_USBD_Interface.h"
 
-extern "C"
-{
-uint8_t const * tud_descriptor_device_cb(void);
-uint8_t const * tud_descriptor_configuration_cb(uint8_t index);
-uint16_t const* tud_descriptor_string_cb(uint8_t index, uint16_t langid);
-}
-
 class Adafruit_USBD_Device
 {
   private:
@@ -88,7 +81,8 @@ class Adafruit_USBD_Device
     uint8_t getSerialDescriptor(uint16_t* serial_str);
 
   private:
-    void portInitHardware(uint8_t rhport);
+    void port_InitHardware(uint8_t rhport);
+    void port_Touch1200(void);
 
   private:
     uint16_t const* descriptor_string_cb(uint8_t index, uint16_t langid);

src/Adafruit_USBD_HID.cpp renamed to src/arduino/Adafruit_USBD_HID.cpp

@@ -0,0 +1,40 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Ha Thach for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef ADAFRUIT_TINYUSB_PORT_H_
+#define ADAFRUIT_TINYUSB_PORT_H_
+
+//--------------------------------------------------------------------+
+// Porting API
+//--------------------------------------------------------------------+
+
+// To enter/reboot to bootloader
+// usually when host disconnects cdc at baud 1200 (touch 1200)
+void TinyUSB_Port_EnterDFU(void);
+
+// Init device hardware.
+// Called by USBDevice.begin()
+void TinyUSB_Port_InitDeviceController(uint8_t rhport);
+
+#endif

src/Adafruit_USBD_HID.h renamed to src/arduino/Adafruit_USBD_HID.h

@@ -25,9 +25,7 @@
 #if defined ARDUINO_ARCH_SAMD & defined USE_TINYUSB
 
 #include "Arduino.h"
-#include "tusb.h"
-#include "Adafruit_USBD_Device.h"
-#include "Adafruit_USBD_CDC.h"
+#include "arduino/Adafruit_USBD_Device.h"
 
 #include <Reset.h> // Needed for auto-reset with 1200bps port touch
 
@@ -74,7 +72,7 @@ extern "C" int serial1_printf(const char *__restrict format, ...)
 // Core Init & Touch1200
 //--------------------------------------------------------------------+
 
-void Adafruit_TinyUSB_touch1200(void)
+void TinyUSB_Port_EnterDFU(void)
 {
   initiateReset(250);
 }
@@ -89,7 +87,7 @@ extern "C" void yield(void)
 //--------------------------------------------------------------------+
 // Adafruit_USBD_Device platform dependent
 //--------------------------------------------------------------------+
-void Adafruit_USBD_Device::portInitHardware(uint8_t rhport)
+void TinyUSB_Port_InitDeviceController(uint8_t rhport)
 {
 	/* Enable USB clock */
 #if defined(__SAMD51__)