[PUSB] Fix for static initialization order fiasco (try 2)

Author: cmaglie

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

@@ -25,6 +25,21 @@
 
 extern uint8_t _initEndpoints[];
 
+PUSBListNode *PluggableUSB_::rootNode = NULL;
+
+void PluggableUSB_::plug(PUSBListNode *node)
+{
+	if (!rootNode) {
+		rootNode = node;
+	} else {
+		PUSBListNode *current = rootNode;
+		while (current->next) {
+			current = current->next;
+		}
+		current->next = node;
+	}
+}
+
 PluggableUSB_ PluggableUSB;
 
 int PluggableUSB_::getInterface(uint8_t* interfaceNum)
@@ -63,36 +78,29 @@ bool PluggableUSB_::setup(USBSetup& setup, uint8_t j)
 	return false;
 }
 
-bool PluggableUSB_::plug(PUSBListNode *node)
+bool PluggableUSB_::init()
 {
-	if ((lastEp + node->numEndpoints) > USB_ENDPOINTS) {
-		return false;
-	}
-
-	if (!rootNode) {
-		rootNode = node;
-	} else {
-		PUSBListNode *current = rootNode;
-		while (current->next) {
-			current = current->next;
+	PUSBListNode* node;
+	for (node = rootNode; node; node = node->next) {
+		if ((lastEp + node->numEndpoints) > USB_ENDPOINTS) {
+			return false;
 		}
-		current->next = node;
-	}
 
-	node->pluggedInterface = lastIf;
-	node->pluggedEndpoint = lastEp;
-	lastIf += node->numInterfaces;
-	for (uint8_t i = 0; i < node->numEndpoints; i++) {
-		_initEndpoints[lastEp] = node->endpointType[i];
-		lastEp++;
+		node->pluggedInterface = lastIf;
+		node->pluggedEndpoint = lastEp;
+		lastIf += node->numInterfaces;
+		for (uint8_t i = 0; i < node->numEndpoints; i++) {
+			_initEndpoints[lastEp] = node->endpointType[i];
+			lastEp++;
+		}
+		node->init();
 	}
 	return true;
 	// restart USB layer???
 }
 
 PluggableUSB_::PluggableUSB_() : lastIf(CDC_ACM_INTERFACE + CDC_INTERFACE_COUNT),
-                                 lastEp(CDC_FIRST_ENDPOINT + CDC_ENPOINT_COUNT),
-                                 rootNode(NULL)
+                                 lastEp(CDC_FIRST_ENDPOINT + CDC_ENPOINT_COUNT)
 {
 	// Empty
 }

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

@@ -35,6 +35,7 @@ class PUSBListNode {
   inline int8_t endpoint()   const { return pluggedEndpoint; }
 
 protected:
+  virtual void init();
   virtual bool setup(USBSetup& setup, uint8_t i) = 0;
   virtual int getInterface(uint8_t* interfaceNum) = 0;
   virtual int getDescriptor(int8_t t) = 0;
@@ -54,16 +55,18 @@ class PUSBListNode {
 
 class PluggableUSB_ {
 public:
+  static void plug(PUSBListNode *node);
+
   PluggableUSB_();
-  bool plug(PUSBListNode *node);
+  bool init();
   int getInterface(uint8_t* interfaceNum);
   int getDescriptor(int8_t t);
   bool setup(USBSetup& setup, uint8_t i);
 
 private:
   uint8_t lastIf;
   uint8_t lastEp;
-  PUSBListNode* rootNode;
+  static PUSBListNode* rootNode;
 };
 
 extern PluggableUSB_ PluggableUSB;

hardware/arduino/avr/cores/arduino/USBCore.cpp

@@ -335,6 +335,9 @@ void InitEP(u8 index, u8 type, u8 size)
 static
 void InitEndpoints()
 {
+#ifdef PLUGGABLE_USB_ENABLED
+	PluggableUSB.init();
+#endif
 	for (u8 i = 1; i < sizeof(_initEndpoints) && _initEndpoints[i] != 0; i++)
 	{
 		UENUM = i;

hardware/arduino/avr/libraries/HID/HID.cpp

@@ -23,6 +23,8 @@
 
 HID_ HID;
 
+HIDDescriptorListNode *HID_::rootNode = NULL;
+
 int HID_::getInterface(uint8_t* interfaceNum)
 {
 	*interfaceNum += 1; // uses 1
@@ -63,7 +65,13 @@ void HID_::AppendDescriptor(HIDDescriptorListNode *node)
 		}
 		current->next = node;
 	}
-	descriptorSize += node->length;
+}
+
+void HID_::init() {
+	HIDDescriptorListNode *node;
+	for (node = rootNode; node; node = node->next) {
+		descriptorSize += node->length;
+	}
 }
 
 void HID_::SendReport(uint8_t id, const void* data, int len)
@@ -109,16 +117,10 @@ bool HID_::setup(USBSetup& setup, uint8_t interfaceNum)
 }
 
 HID_::HID_(void) : PUSBListNode(1, 1, epType),
-                   rootNode(NULL), descriptorSize(0),
-                   protocol(1), idle(1)
+                   descriptorSize(0), protocol(1), idle(1)
 {
 	epType[0] = EP_TYPE_INTERRUPT_IN;
 	PluggableUSB.plug(this);
 }
 
-int HID_::begin(void)
-{
-	return 0;
-}
-
 #endif /* if defined(USBCON) */

hardware/arduino/avr/libraries/HID/HID.h

@@ -73,20 +73,20 @@ class HID_ : public PUSBListNode
 {
 public:
   HID_(void);
-  int begin(void);
   void SendReport(uint8_t id, const void* data, int len);
-  void AppendDescriptor(HIDDescriptorListNode* node);
+  static void AppendDescriptor(HIDDescriptorListNode* node);
 
 protected:
   // Implementation of the PUSBListNode
+  void init();
   int getInterface(uint8_t* interfaceNum);
   int getDescriptor(int8_t type);
   bool setup(USBSetup& setup, uint8_t interfaceNum);
 
 private:
   uint8_t epType[1];
 
-  HIDDescriptorListNode* rootNode;
+  static HIDDescriptorListNode* rootNode;
   uint16_t descriptorSize;
 
   uint8_t protocol;