X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/4421782b7fb49e160b1c18f2295e6cd1f0b00c04..d11ed10c5314c44dc01c06954d1d73d4894cbff8:/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_Control_W.c

diff --git a/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_Control_W.c b/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_Control_W.c
index 6c1445ee0..70560cf46 100644
--- a/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_Control_W.c
+++ b/LUFA/Drivers/USB/LowLevel/Template/Template_Endpoint_Control_W.c
@@ -1,11 +1,13 @@
-uint8_t TEMPLATE_FUNC_NAME (void* Buffer, uint16_t Length)
+uint8_t TEMPLATE_FUNC_NAME (const void* Buffer, uint16_t Length)
 {
-	uint8_t* DataStream     = (uint8_t*)(Buffer + TEMPLATE_BUFFER_OFFSET(Length));
+	uint8_t* DataStream     = ((uint8_t*)Buffer + TEMPLATE_BUFFER_OFFSET(Length));
 	bool     LastPacketFull = false;
 	
 	if (Length > USB_ControlRequest.wLength)
 	  Length = USB_ControlRequest.wLength;
-	
+	else if (!(Length))
+	  Endpoint_ClearIN();
+
 	while (Length || LastPacketFull)
 	{
 		if (Endpoint_IsSETUPReceived())
@@ -19,13 +21,16 @@ uint8_t TEMPLATE_FUNC_NAME (void* Buffer, uint16_t Length)
 		  
 		if (Endpoint_IsINReady())
 		{
-			while (Length && (Endpoint_BytesInEndpoint() < USB_ControlEndpointSize))
+			uint16_t BytesInEndpoint = Endpoint_BytesInEndpoint();
+		
+			while (Length && (BytesInEndpoint < USB_ControlEndpointSize))
 			{
 				TEMPLATE_TRANSFER_BYTE(DataStream);
 				Length--;
+				BytesInEndpoint++;
 			}
 			
-			LastPacketFull = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);
+			LastPacketFull = (BytesInEndpoint == USB_ControlEndpointSize);
 			Endpoint_ClearIN();
 		}
 	}