X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/0d5baf9bb3e88ebcbc53cc9a71566582d585f7dd..32f0f605efa293430a47d60bb857695ff6937d21:/LUFA/Drivers/USB/HighLevel/USBInterrupt.c

diff --git a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
index 93bd6d084..14d277c9a 100644
--- a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
+++ b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
@@ -174,6 +174,10 @@ ISR(USB_GEN_vect, ISR_BLOCK)
 		                           ENDPOINT_DIR_OUT, USB_ControlEndpointSize,
 		                           ENDPOINT_BANK_SINGLE);
 
+		#if defined(INTERRUPT_CONTROL_ENDPOINT)
+		USB_INT_Enable(USB_INT_ENDPOINT_SETUP);
+		#endif
+
 		RAISE_EVENT(USB_Reset);
 	}
 	#endif
@@ -249,3 +253,16 @@ ISR(USB_GEN_vect, ISR_BLOCK)
 	}
 	#endif
 }
+
+#if defined(INTERRUPT_CONTROL_ENDPOINT)
+ISR(USB_COM_vect, ISR_BLOCK)
+{
+	uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint();
+
+	USB_USBTask();
+
+	USB_INT_Clear(USB_INT_ENDPOINT_SETUP);
+	
+	Endpoint_SelectEndpoint(PrevSelectedEndpoint);	
+}
+#endif