move files around, updating API

Author: hathach

src/Adafruit_TinyUSB.h

@@ -34,14 +34,12 @@
 #if TUSB_OPT_DEVICE_ENABLED
 
 #include "arduino/Adafruit_USBD_Device.h"
+#include "arduino/Adafruit_USBD_CDC.h"
 
-// CDC can be part of the core
-#include "Adafruit_USBD_CDC.h"
-
-#include "arduino/Adafruit_USBD_HID.h"
-#include "arduino/Adafruit_USBD_MIDI.h"
-#include "arduino/Adafruit_USBD_MSC.h"
-#include "arduino/Adafruit_USBD_WebUSB.h"
+#include "arduino/hid/Adafruit_USBD_HID.h"
+#include "arduino/midi/Adafruit_USBD_MIDI.h"
+#include "arduino/msc/Adafruit_USBD_MSC.h"
+#include "arduino/webusb/Adafruit_USBD_WebUSB.h"
 
 // Initialize device hardware, stack, also Serial as CDC
 // Wrapper for USBDevice.begin(rhport)

src/arduino/Adafruit_TinyUSB.cpp

@@ -37,4 +37,9 @@ void TinyUSB_Device_Init(uint8_t rhport)
   USBDevice.begin(rhport);
 }
 
+void TinyUSB_Device_Task(void)
+{
+
+}
+
 #endif

src/arduino/ports/Adafruit_TinyUSB_PortAPI.h renamed to src/arduino/Adafruit_TinyUSB_API.h

@@ -22,11 +22,28 @@
  * THE SOFTWARE.
  */
 
-#ifndef ADAFRUIT_TINYUSB_PORTAPI_H_
-#define ADAFRUIT_TINYUSB_PORTAPI_H_
+#ifndef ADAFRUIT_TINYUSB_API_H_
+#define ADAFRUIT_TINYUSB_API_H_
+
+#include <stdint.h>
+#include <stdbool.h>
+
+//--------------------------------------------------------------------+
+// Core API
+// Should be called by BSP Core to initialize, process task
+// Weak function allow compile arduino core before linking with this library
+//--------------------------------------------------------------------+
+
+// Called by core/sketch to initialize usb device hardware and stack
+// This also initialize Serial as CDC device
+void TinyUSB_Device_Init(uint8_t rhport) __attribute__((weak));
+
+// Called by core/sketch to handle device event
+void TinyUSB_Device_Task(void) __attribute__((weak));
 
 //--------------------------------------------------------------------+
-// Porting API
+// Port API
+// Must be implemented by each BSP core/platform
 //--------------------------------------------------------------------+
 
 // To enter/reboot to bootloader

src/arduino/Adafruit_USBD_CDC.cpp

@@ -27,9 +27,10 @@
 #if TUSB_OPT_DEVICE_ENABLED && CFG_TUD_CDC
 
 #include "Arduino.h"
+#include "Adafruit_TinyUSB_API.h"
+
 #include "Adafruit_USBD_Device.h"
 #include "Adafruit_USBD_CDC.h"
-#include "ports/Adafruit_TinyUSB_PortAPI.h"
 
 // TODO Multiple instances supports
 //	static uint8_t _itf_count;

src/arduino/Adafruit_USBD_CDC.h

@@ -25,8 +25,9 @@
 #ifndef ADAFRUIT_USBD_CDC_H_
 #define ADAFRUIT_USBD_CDC_H_
 
-#include "Adafruit_USBD_Interface.h"
 #include "Stream.h"
+#include "Adafruit_TinyUSB_API.h"
+#include "Adafruit_USBD_Interface.h"
 
 class Adafruit_USBD_CDC : public Stream, public Adafruit_USBD_Interface
 {

src/arduino/Adafruit_USBD_Device.cpp

@@ -26,9 +26,10 @@
 
 #if TUSB_OPT_DEVICE_ENABLED
 
+#include "Adafruit_TinyUSB_API.h"
+
 #include "Adafruit_USBD_Device.h"
 #include "Adafruit_USBD_CDC.h"
-#include "ports/Adafruit_TinyUSB_PortAPI.h"
 
 #ifndef USB_MANUFACTURER
   #define USB_MANUFACTURER "Unknown"
@@ -245,6 +246,9 @@ bool Adafruit_USBD_Device::begin(uint8_t rhport)
 void Adafruit_USBD_Device::task(void)
 {
   tud_task();
+
+#if CFG_TUSB_OS == OPT_OS_NONE || CFG_TUSB_OS == OPT_OS_PICO
+#endif
 }
 
 bool Adafruit_USBD_Device::mounted (void)

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

@@ -25,7 +25,7 @@
 #ifndef ADAFRUIT_USBD_HID_H_
 #define ADAFRUIT_USBD_HID_H_
 
-#include "Adafruit_USBD_Device.h"
+#include "arduino/Adafruit_USBD_Device.h"
 
 class Adafruit_USBD_HID : public Adafruit_USBD_Interface {
 public:

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

@@ -26,7 +26,7 @@
 #define ADAFRUIT_USBD_MIDI_H_
 
 #include "Stream.h"
-#include "Adafruit_USBD_Device.h"
+#include "arduino/Adafruit_USBD_Device.h"
 
 class Adafruit_USBD_MIDI : public Stream, public Adafruit_USBD_Interface {
 public:

src/arduino/Adafruit_USBD_MIDI.cpp renamed to src/arduino/midi/Adafruit_USBD_MIDI.cpp

@@ -25,7 +25,7 @@
 #ifndef ADAFRUIT_USBD_MSC_H_
 #define ADAFRUIT_USBD_MSC_H_
 
-#include "Adafruit_USBD_Device.h"
+#include "arduino/Adafruit_USBD_Device.h"
 
 class Adafruit_USBD_MSC : public Adafruit_USBD_Interface {
 public:

src/arduino/Adafruit_USBD_MIDI.h renamed to src/arduino/midi/Adafruit_USBD_MIDI.h

@@ -26,7 +26,7 @@
 #define ADAFRUIT_USBD_WEBUSB_H_
 
 #include "Stream.h"
-#include "Adafruit_USBD_Device.h"
+#include "arduino/Adafruit_USBD_Device.h"
 
 #define WEBUSB_URL_DEF(_name, _scheme, _url)                                   \
   struct TU_ATTR_PACKED {                                                      \