USBDevice: interrupts are now enabled on init

This change allow to rationalize EP initalization logic in one
single place.

Author: cmaglie

cores/arduino/USB/CDC.cpp

@@ -27,8 +27,6 @@
 
 #ifdef CDC_ENABLED
 
-extern USBDevice_SAMD21G18x usbd;
-
 #define CDC_SERIAL_BUFFER_SIZE	256
 
 /* For information purpose only since RTS is not always handled by the terminal application */
@@ -186,11 +184,6 @@ Serial_::Serial_(USBDeviceClass &_usb) : PluggableUSBModule(3, 2, epType), usb(_
   PluggableUSB().plug(this);
 }
 
-void Serial_::enableInterrupt() {
-	usbd.epBank1EnableTransferComplete(CDC_ENDPOINT_ACM);
-	usbd.epBank0EnableTransferComplete(CDC_ENDPOINT_OUT);
-}
-
 void Serial_::begin(uint32_t /* baud_count */)
 {
 	// uart config is ignored in USB-CDC

cores/arduino/USB/CDC.h

@@ -143,7 +143,6 @@ class Serial_ : public Stream, public PluggableUSBModule {
     bool setup(USBSetup& setup);
     uint8_t getShortName(char* name);
     void handleEndpoint(int ep);
-    void enableInterrupt();
 
 friend USBDeviceClass;
 

cores/arduino/USB/USBCore.cpp

@@ -394,6 +394,7 @@ void USBDeviceClass::initEP(uint32_t ep, uint32_t config)
 		usbd.epBank1SetSize(ep, 64);
 		usbd.epBank1SetAddress(ep, &udd_ep_in_cache_buffer[ep]);
 		usbd.epBank1SetType(ep, 4); // INTERRUPT IN
+		usbd.epBank1EnableTransferComplete(ep);
 	}
 	else if (config == (USB_ENDPOINT_TYPE_BULK | USB_ENDPOINT_OUT(0)))
 	{
@@ -411,6 +412,9 @@ void USBDeviceClass::initEP(uint32_t ep, uint32_t config)
 		usbd.epBank1ResetReady(ep);
 
 		usbd.epBank1SetType(ep, 3); // BULK IN
+
+		// XXX: this somehow interfere with CDC rx - WHY???
+		// usbd.epBank1EnableTransferComplete(ep);
 	}
 	else if (config == USB_ENDPOINT_TYPE_CONTROL)
 	{
@@ -426,6 +430,9 @@ void USBDeviceClass::initEP(uint32_t ep, uint32_t config)
 
 		// Release OUT EP
 		usbd.epReleaseOutBank0(ep, 64);
+
+		// Enable Setup-Received interrupt
+		usbd.epBank0EnableSetupReceived(ep);
 	}
 }
 
@@ -763,10 +770,6 @@ bool USBDeviceClass::handleStandardSetup(USBSetup &setup)
 			initEndpoints();
 			_usbConfiguration = setup.wValueL;
 
-			#ifdef CDC_ENABLED
-			SerialUSB.enableInterrupt();
-			#endif
-
 			sendZlp(0);
 			return true;
 		} else {
@@ -801,9 +804,6 @@ void USBDeviceClass::ISRHandler()
 		// Configure EP 0
 		initEP(0, USB_ENDPOINT_TYPE_CONTROL);
 
-		// Enable Setup-Received interrupt
-		usbd.epBank0EnableSetupReceived(0);
-
 		_usbConfiguration = 0;
 	}