Moved interface check to pluggable USB

Author: NicoHood

Diff for: hardware/arduino/avr/cores/arduino/PluggableUSB.cpp

@@ -50,11 +50,16 @@ int PluggableUSB_::getDescriptor(int8_t type)
 	return 0;
 }
 
-bool PluggableUSB_::setup(USBSetup& setup, uint8_t j)
+bool PluggableUSB_::setup(USBSetup& setup, uint8_t interfaceNum)
 {
 	PUSBListNode* node;
 	for (node = rootNode; node; node = node->next) {
-		if (node->setup(setup, j)) {
+		// Only execute the desired interface.
+		// This also prevents calling interfaces with -1
+		// When all endpoints are full.
+		if(node->interface() == interfaceNum){
+			// TODO return value currently ignored?
+			node->setup(setup);
 			return true;
 		}
 	}

Diff for: hardware/arduino/avr/cores/arduino/PluggableUSB.h

@@ -35,7 +35,7 @@ class PUSBListNode {
   inline int8_t endpoint()   const { return pluggedEndpoint; }
 
 protected:
-  virtual bool setup(USBSetup& setup, uint8_t i) = 0;
+  virtual bool setup(USBSetup& setup) = 0;
   virtual int getInterface(uint8_t* interfaceNum) = 0;
   virtual int getDescriptor(int8_t t) = 0;
 
@@ -56,8 +56,8 @@ class PluggableUSB_ {
   PluggableUSB_();
   bool plug(PUSBListNode *node);
   int getInterface(uint8_t* interfaceNum);
-  int getDescriptor(int8_t t);
-  bool setup(USBSetup& setup, uint8_t i);
+  int getDescriptor(int8_t type);
+  bool setup(USBSetup& setup, uint8_t interfaceNum);
 
 private:
   uint8_t lastIf;

Diff for: hardware/arduino/avr/libraries/HID/HID.cpp

@@ -76,12 +76,8 @@ void HID_::SendReport(uint8_t id, const void* data, int len)
 	USB_Send(endpoint() | TRANSFER_RELEASE, data, len);
 }
 
-bool HID_::setup(USBSetup& setup, uint8_t interfaceNum)
+bool HID_::setup(USBSetup& setup)
 {
-	if (interface() != interfaceNum) {
-		return false;
-	}
-
 	uint8_t request = setup.bRequest;
 	uint8_t requestType = setup.bmRequestType;
 

Diff for: hardware/arduino/avr/libraries/HID/HID.h

@@ -81,7 +81,7 @@ class HID_ : public PUSBListNode
   // Implementation of the PUSBListNode
   int getInterface(uint8_t* interfaceNum);
   int getDescriptor(int8_t type);
-  bool setup(USBSetup& setup, uint8_t interfaceNum);
+  bool setup(USBSetup& setup);
 
 private:
   uint8_t epType[1];