USB: only clear pending interrupts explicitely

Author: facchinm

cores/arduino/USB/PluggableUSB.cpp

@@ -70,6 +70,7 @@ uint8_t PluggableUSB_::getShortName(char *iSerialNum)
 bool PluggableUSB_::setup(USBSetup& setup)
 {
 	PluggableUSBModule* node;
+
 	for (node = rootNode; node; node = node->next) {
 		if (node->setup(setup)) {
 			return true;
@@ -78,12 +79,16 @@ bool PluggableUSB_::setup(USBSetup& setup)
 	return false;
 }
 
-void PluggableUSB_::handleEndpoint(int ep)
+int PluggableUSB_::handleEndpoint(int ep)
 {
 	PluggableUSBModule* node;
 	for (node = rootNode; node; node = node->next) {
-		node->handleEndpoint(ep);
+		int r = node->handleEndpoint(ep);
+		if (r != 0) {
+			return r;
+		}
 	}
+	return 0;
 }
 
 bool PluggableUSB_::plug(PluggableUSBModule *node)

cores/arduino/USB/PluggableUSB.h

@@ -35,7 +35,7 @@ class PluggableUSBModule {
   virtual bool setup(USBSetup& setup) = 0;
   virtual int getInterface(uint8_t* interfaceCount) = 0;
   virtual int getDescriptor(USBSetup& setup) = 0;
-  virtual void handleEndpoint(int ep) { (void)ep;/* Do nothing */}
+  virtual int handleEndpoint(int ep) { (void)ep;/* Do nothing */; return 0; }
   virtual uint8_t getShortName(char *name) { name[0] = 'A'+pluggedInterface; return 1; }
 
   uint8_t pluggedInterface;
@@ -57,7 +57,7 @@ class PluggableUSB_ {
   int getInterface(uint8_t* interfaceCount);
   int getDescriptor(USBSetup& setup);
   bool setup(USBSetup& setup);
-  void handleEndpoint(int ep);
+  int handleEndpoint(int ep);
   uint8_t getShortName(char *iSerialNum);
 
 private:

cores/arduino/USB/SAMD21_USBDevice.h

@@ -393,7 +393,9 @@ class DoubleBufferedEPOutHandler : public EPHandler {
 			}
 			release();
 		}
-		usbd.epAckPendingInterrupts(ep);
+		if (usbd.epBank0IsTransferComplete(ep) || usbd.epBank1IsTransferComplete(ep)) {
+			usbd.epAckPendingInterrupts(ep);
+		}
 	}
 
 	// Returns how many bytes are stored in the buffers

cores/arduino/USB/USBCore.cpp

@@ -297,22 +297,23 @@ void USBDeviceClass::standby() {
 void USBDeviceClass::handleEndpoint(uint8_t ep)
 {
 #if defined(CDC_ENABLED)
-	if (ep == CDC_ENDPOINT_IN)
+	if (ep == CDC_ENDPOINT_IN || ep == CDC_ENDPOINT_ACM)
 	{
-		// NAK on endpoint IN, the bank is not yet filled in.
-		usbd.epBank1ResetReady(CDC_ENDPOINT_IN);
-		usbd.epBank1AckTransferComplete(CDC_ENDPOINT_IN);
-	}
-	if (ep == CDC_ENDPOINT_ACM)
-	{
-		// NAK on endpoint IN, the bank is not yet filled in.
-		usbd.epBank1ResetReady(CDC_ENDPOINT_ACM);
-		usbd.epBank1AckTransferComplete(CDC_ENDPOINT_ACM);
+		if (usbd.epBank0IsTransferComplete(ep) || usbd.epBank1IsTransferComplete(ep)) {
+			// NAK on endpoint IN, the bank is not yet filled in.
+			usbd.epBank1ResetReady(ep);
+			usbd.epBank1AckTransferComplete(ep);
+		}
+		return;
 	}
 #endif
 
 #if defined(PLUGGABLE_USB_ENABLED)
-	// Empty
+	int r = PluggableUSB().handleEndpoint(ep);
+	if (r != 0) {
+		usbd.epAckPendingInterrupts(ep);
+		return;
+	}
 #endif
 }
 
@@ -1010,29 +1011,17 @@ void USBDeviceClass::ISRHandler()
 		}
 
 	} // end Received Setup handler
-
-	uint8_t i=0;
-	uint8_t ept_int = usbd.epInterruptSummary() & 0xFE; // Remove endpoint number 0 (setup)
-	while (ept_int != 0)
-	{
-		// Check if endpoint has a pending interrupt
-		if ((ept_int & (1 << i)) != 0)
-		{
-			// Endpoint Transfer Complete (0/1) Interrupt
-			if (usbd.epBank0IsTransferComplete(i) ||
-			    usbd.epBank1IsTransferComplete(i))
-			{
-				if (epHandlers[i]) {
-					epHandlers[i]->handleEndpoint();
-				} else {
-					handleEndpoint(i);
-				}
+	// usbd.epAckPendingInterrupts(0);
+
+	for (int ep = 1; ep < USB_EPT_NUM; ep++) {
+		// Endpoint Transfer Complete (0/1) Interrupt
+		if (usbd.epHasPendingInterrupts(ep)) {
+			if (epHandlers[ep]) {
+				epHandlers[ep]->handleEndpoint();
+			} else {
+				handleEndpoint(ep);
 			}
-			ept_int &= ~(1 << i);
 		}
-		i++;
-		if (i > USB_EPT_NUM)
-			break;  // fire exit
 	}
 }
 

cores/arduino/USB/USBCore.h

@@ -33,8 +33,8 @@
 
 // bEndpointAddress in Endpoint Descriptor
 #define USB_ENDPOINT_DIRECTION_MASK            0x80
-#define USB_ENDPOINT_OUT(addr)                 ((addr) | 0x00)
-#define USB_ENDPOINT_IN(addr)                  ((addr) | 0x80)
+#define USB_ENDPOINT_OUT(addr)                 ((unsigned char)((addr) | 0x00))
+#define USB_ENDPOINT_IN(addr)                  ((unsigned char)((addr) | 0x80))
 
 #define USB_ENDPOINTS                          7