[RFC] Pluggable USB core for AVR

build/shared/examples/09.USB/Keyboard/KeyboardLogout/KeyboardLogout.ino

@@ -29,6 +29,9 @@
 #define WINDOWS 1
 #define UBUNTU 2
 
+#include "Keyboard.h"
+#include "HID.h"
+
 // change this to match your platform:
 int platform = OSX;
 

build/shared/examples/09.USB/Keyboard/KeyboardMessage/KeyboardMessage.ino

@@ -20,6 +20,9 @@
  http://www.arduino.cc/en/Tutorial/KeyboardMessage
  */
 
+#include "Keyboard.h"
+#include "HID.h"
+
 const int buttonPin = 4;          // input pin for pushbutton
 int previousButtonState = HIGH;   // for checking the state of a pushButton
 int counter = 0;                  // button push counter

build/shared/examples/09.USB/Keyboard/KeyboardReprogram/KeyboardReprogram.ino

@@ -27,6 +27,9 @@
  http://www.arduino.cc/en/Tutorial/KeyboardReprogram
  */
 
+#include "Keyboard.h"
+#include "HID.h"
+
 // use this option for OSX.
 // Comment it out if using Windows or Linux:
 char ctrlKey = KEY_LEFT_GUI;

build/shared/examples/09.USB/Keyboard/KeyboardSerial/KeyboardSerial.ino

@@ -19,6 +19,9 @@
  http://www.arduino.cc/en/Tutorial/KeyboardSerial
  */
 
+#include "Keyboard.h"
+#include "HID.h"
+
 void setup() {
   // open the serial port:
   Serial.begin(9600);

build/shared/examples/09.USB/KeyboardAndMouseControl/KeyboardAndMouseControl.ino

@@ -21,6 +21,10 @@
 
  */
 
+#include "Keyboard.h"
+#include "Mouse.h"
+#include "HID.h"
+
 // set pin numbers for the five buttons:
 const int upButton = 2;
 const int downButton = 3;

build/shared/examples/09.USB/Mouse/ButtonMouseControl/ButtonMouseControl.ino

@@ -24,6 +24,9 @@
 
  */
 
+#include "Mouse.h"
+#include "HID.h"
+
 // set pin numbers for the five buttons:
 const int upButton = 2;
 const int downButton = 3;

build/shared/examples/09.USB/Mouse/JoystickMouseControl/JoystickMouseControl.ino

@@ -28,6 +28,9 @@
 
  */
 
+#include "Mouse.h"
+#include "HID.h"
+
 // set pin numbers for switch, joystick axes, and LED:
 const int switchPin = 2;      // switch to turn on and off mouse control
 const int mouseButton = 3;    // input pin for the mouse pushButton

hardware/arduino/avr/cores/arduino/CDC.cpp

@@ -20,7 +20,6 @@
 #include <avr/wdt.h>
 
 #if defined(USBCON)
-#ifdef CDC_ENABLED
 
 typedef struct
 {
@@ -54,13 +53,13 @@ const CDCDescriptor _cdcInterface =
 	D_ENDPOINT(USB_ENDPOINT_IN (CDC_ENDPOINT_IN ),USB_ENDPOINT_TYPE_BULK,0x40,0)
 };
 
-int WEAK CDC_GetInterface(u8* interfaceNum)
+int CDC_GetInterface(u8* interfaceNum)
 {
 	interfaceNum[0] += 2;	// uses 2
 	return USB_SendControl(TRANSFER_PGM,&_cdcInterface,sizeof(_cdcInterface));
 }
 
-bool WEAK CDC_Setup(Setup& setup)
+bool CDC_Setup(USBSetup& setup)
 {
 	u8 r = setup.bRequest;
 	u8 requestType = setup.bmRequestType;
@@ -96,6 +95,7 @@ bool WEAK CDC_Setup(Setup& setup)
 			// We check DTR state to determine if host port is open (bit 0 of lineState).
 			if (1200 == _usbLineInfo.dwDTERate && (_usbLineInfo.lineState & 0x01) == 0)
 			{
+				*(uint16_t *)(RAMEND-1) = *(uint16_t *)0x0800;
 				*(uint16_t *)0x0800 = 0x7777;
 				wdt_enable(WDTO_120MS);
 			}
@@ -108,7 +108,7 @@ bool WEAK CDC_Setup(Setup& setup)
 
 				wdt_disable();
 				wdt_reset();
-				*(uint16_t *)0x0800 = 0x0;
+				*(uint16_t *)0x0800 = *(uint16_t *)(RAMEND-1);
 			}
 		}
 		return true;
@@ -207,5 +207,4 @@ Serial_::operator bool() {
 
 Serial_ Serial;
 
-#endif
 #endif /* if defined(USBCON) */

hardware/arduino/avr/cores/arduino/PluggableUSB.cpp

@@ -0,0 +1,100 @@
+/*
+  PluggableUSB.cpp
+  Copyright (c) 2015 Arduino LLC
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "USBAPI.h"
+#include "PluggableUSB.h"
+
+#if defined(USBCON)	
+#ifdef PLUGGABLE_USB_ENABLED
+
+#define MAX_MODULES	6
+
+static u8 lastIf = CDC_ACM_INTERFACE + CDC_INTERFACE_COUNT;
+static u8 lastEp = CDC_FIRST_ENDPOINT + CDC_ENPOINT_COUNT;
+
+extern u8 _initEndpoints[];
+
+//PUSBCallbacks cbs[MAX_MODULES];
+static u8 modules_count = 0;
+
+static PUSBListNode* rootNode = NULL;
+
+int PUSB_GetInterface(u8* interfaceNum)
+{
+	int ret = 0;
+	PUSBListNode* node = rootNode;
+	for (u8 i=0; i<modules_count; i++) {
+		ret = node->cb->getInterface(interfaceNum);
+		node = node->next;
+	}
+	return ret;
+}
+
+int PUSB_GetDescriptor(int8_t t)
+{
+	int ret = 0;
+	PUSBListNode* node = rootNode;
+	for (u8 i=0; i<modules_count && ret == 0; i++) {
+		ret = node->cb->getDescriptor(t);
+		node = node->next;
+	}
+	return ret;
+}
+
+bool PUSB_Setup(USBSetup& setup, u8 j)
+{
+	bool ret = false;
+	PUSBListNode* node = rootNode;
+	for (u8 i=0; i<modules_count && ret == false; i++) {
+		ret = node->cb->setup(setup, j);
+		node = node->next;
+	}
+	return ret;
+}
+
+int8_t PUSB_AddFunction(PUSBListNode *node, u8* interface)
+{
+	if (modules_count >= MAX_MODULES) {
+		return 0;
+	}
+
+	if (modules_count == 0) {
+		rootNode = node;
+	} else {
+		PUSBListNode *current = rootNode;
+		while(current->next != NULL) {
+			current = current->next;
+		}
+		current->next = node;
+	}
+
+	*interface = lastIf;
+	lastIf += node->cb->numInterfaces;
+	for ( u8 i = 0; i< node->cb->numEndpoints; i++) {
+		_initEndpoints[lastEp] = node->cb->endpointType[i];
+		lastEp++;
+	}
+	modules_count++;
+	return lastEp - node->cb->numEndpoints;
+	// restart USB layer???
+}
+
+#endif
+
+#endif /* if defined(USBCON) */

hardware/arduino/avr/cores/arduino/PluggableUSB.h

@@ -0,0 +1,63 @@
+/*
+  PluggableUSB.h
+  Copyright (c) 2015 Arduino LLC
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef PUSB_h
+#define PUSB_h
+
+#include "USBAPI.h"
+#include <stdint.h>
+
+#if defined(USBCON)
+
+typedef struct __attribute__((packed))
+{
+  bool (*setup)(USBSetup& setup, u8 i);
+  int (*getInterface)(u8* interfaceNum);
+  int (*getDescriptor)(int8_t t);
+  int8_t numEndpoints;
+  int8_t numInterfaces;
+  uint8_t *endpointType;
+} PUSBCallbacks;
+
+typedef struct
+{
+  u8 interface;
+  u8 firstEndpoint;
+} PUSBReturn;
+
+class PUSBListNode {
+public:
+  PUSBListNode *next = NULL;
+  PUSBCallbacks *cb;
+  PUSBListNode(PUSBCallbacks *ncb) {cb = ncb;}
+};
+
+int8_t PUSB_AddFunction(PUSBListNode *node, u8 *interface);
+
+int PUSB_GetInterface(u8* interfaceNum);
+
+int PUSB_GetDescriptor(int8_t t);
+
+bool PUSB_Setup(USBSetup& setup, u8 i);
+
+void PUSB_Begin();
+
+#endif
+
+#endif