Initial move of USB APIs and make PluggableUSB generic

Author: facchinm

Diff for: api/ArduinoAPI.h

@@ -32,10 +32,21 @@
 #include "IPAddress.h"
 #include "Print.h"
 #include "Printable.h"
+#include "PluggableUSB.h"
 #include "Server.h"
 #include "String.h"
 #include "Stream.h"
 #include "Udp.h"
+#include "USBAPI.h"
 #endif
 
+/* Standard C library includes */
+#include <stdlib.h>
+#include <stdbool.h>
+#include <string.h>
+#include <math.h>
+
+// Misc Arduino core functions
+#include "Common.h"
+
 #endif

Diff for: api/PluggableUSB.cpp

@@ -20,11 +20,6 @@
 #include "USBAPI.h"
 #include "PluggableUSB.h"
 
-#if defined(USBCON)	
-#ifdef PLUGGABLE_USB_ENABLED
-
-extern _EP_BUFFER_TYPE _EP_BUFFER_NAME[];
-
 int PluggableUSB_::getInterface(uint8_t* interfaceCount)
 {
 	int sent = 0;
@@ -72,7 +67,7 @@ bool PluggableUSB_::setup(USBSetup& setup)
 
 bool PluggableUSB_::plug(PluggableUSBModule *node)
 {
-	if ((lastEp + node->numEndpoints) > USB_ENDPOINTS) {
+	if ((lastEp + node->numEndpoints) > totalEP) {
 		return false;
 	}
 
@@ -90,7 +85,7 @@ bool PluggableUSB_::plug(PluggableUSBModule *node)
 	node->pluggedEndpoint = lastEp;
 	lastIf += node->numInterfaces;
 	for (uint8_t i = 0; i < node->numEndpoints; i++) {
-		_EP_BUFFER_NAME[lastEp] = node->endpointType[i];
+		*(unsigned int*)(epBuffer(lastEp)) = node->endpointType[i];
 		lastEp++;
 	}
 	return true;
@@ -101,15 +96,4 @@ PluggableUSB_& PluggableUSB()
 {
 	static PluggableUSB_ obj;
 	return obj;
-}
-
-PluggableUSB_::PluggableUSB_() : lastIf(CDC_ACM_INTERFACE + CDC_INTERFACE_COUNT),
-                                 lastEp(CDC_FIRST_ENDPOINT + CDC_ENPOINT_COUNT),
-                                 rootNode(NULL)
-{
-	// Empty
-}
-
-#endif
-
-#endif /* if defined(USBCON) */
+}

Diff for: api/PluggableUSB.h

@@ -22,16 +22,14 @@
 
 #include "USBAPI.h"
 #include <stdint.h>
+#include <stddef.h>
 
 // core need to define
-// EP_BUFFER_TYPE
-// EP_BUFFER_NAME
-
-#if defined(USBCON)
+void* epBuffer(unsigned int n); // -> returns a poointer to the Nth element of the EP buffer structure
 
 class PluggableUSBModule {
 public:
-  PluggableUSBModule(uint8_t numEps, uint8_t numIfs, EP_BUFFER_TYPE *epType) :
+  PluggableUSBModule(uint8_t numEps, uint8_t numIfs, unsigned int *epType) :
     numEndpoints(numEps), numInterfaces(numIfs), endpointType(epType)
   { }
 
@@ -46,7 +44,7 @@ class PluggableUSBModule {
 
   const uint8_t numEndpoints;
   const uint8_t numInterfaces;
-  const EP_BUFFER_TYPE *endpointType;
+  const unsigned int *endpointType;
 
   PluggableUSBModule *next = NULL;
 
@@ -66,13 +64,12 @@ class PluggableUSB_ {
   uint8_t lastIf;
   uint8_t lastEp;
   PluggableUSBModule* rootNode;
+  uint8_t totalEP;
 };
 
 // Replacement for global singleton.
 // This function prevents static-initialization-order-fiasco
 // https://isocpp.org/wiki/faq/ctors#static-init-order-on-first-use
 PluggableUSB_& PluggableUSB();
 
-#endif
-
-#endif
+#endif

Diff for: api/USBAPI.h

@@ -0,0 +1,70 @@
+/*
+  USBAPI.h
+  Copyright (c) 2005-2014 Arduino.  All right reserved.
+
+  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 __USBAPI__
+#define __USBAPI__
+
+#include <stdint.h>
+
+class USBDevice_
+{
+public:
+	USBDevice_();
+	bool configured();
+
+	void attach();
+	void detach();	// Serial port goes down too...
+	void poll();
+	bool wakeupHost(); // returns false, when wakeup cannot be processed
+};
+extern USBDevice_ USBDevice;
+
+//================================================================================
+//================================================================================
+//  Low level API
+
+typedef struct __attribute__((packed))
+{
+	uint8_t 	bmRequestType;
+	uint8_t 	bRequest;
+	uint8_t 	wValueL;
+	uint8_t 	wValueH;
+	uint16_t 	wIndex;
+	uint16_t 	wLength;
+} USBSetup;
+
+//================================================================================
+//================================================================================
+
+#define TRANSFER_PGM		0x80
+#define TRANSFER_RELEASE	0x40
+#define TRANSFER_ZERO		0x20
+
+int USB_SendControl(uint8_t flags, const void* d, int len);
+int USB_RecvControl(void* d, int len);
+int USB_RecvControlLong(void* d, int len);
+
+uint8_t	USB_Available(uint8_t ep);
+uint8_t USB_SendSpace(uint8_t ep);
+int USB_Send(uint8_t ep, const void* data, int len);	// blocking
+int USB_Recv(uint8_t ep, void* data, int len);		// non-blocking
+int USB_Recv(uint8_t ep);							// non-blocking
+void USB_Flush(uint8_t ep);
+
+#endif