X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/2bd88ebc4f37baf81d550e79b3e3118b0843e61c..59becad82f18c158063ef450d65fefa332857e86:/LUFA/Drivers/USB/LowLevel/DevChapter9.c

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
index f02d32ba3..8f53105a6 100644
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -62,7 +62,8 @@ void USB_Device_ProcessControlPacket(void)
 			break;
 		case REQ_ClearFeature:
 		case REQ_SetFeature:
-			if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT))
+			if ((bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE)) ||
+			    (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT)))
 			{
 				USB_Device_ClearSetFeature();
 				RequestHandled = true;
@@ -105,7 +106,7 @@ void USB_Device_ProcessControlPacket(void)
 	}
 
 	if (!(RequestHandled))
-	  RAISE_EVENT(USB_UnhandledControlPacket);
+	  EVENT_USB_UnhandledControlPacket();
 	  
 	if (Endpoint_IsSETUPReceived())
 	{
@@ -118,8 +119,6 @@ static void USB_Device_SetAddress(void)
 {
 	Endpoint_ClearSETUP();
 	
-	while (!(Endpoint_IsINReady()));
-	
 	Endpoint_ClearIN();
 	
 	while (!(Endpoint_IsINReady()));
@@ -158,14 +157,14 @@ static void USB_Device_SetConfiguration(void)
 	Endpoint_ClearIN();
 
 	if (!(AlreadyConfigured) && USB_ConfigurationNumber)
-	  RAISE_EVENT(USB_DeviceEnumerationComplete);
+	  EVENT_USB_DeviceEnumerationComplete();
 
-	RAISE_EVENT(USB_ConfigurationChanged);
+	EVENT_USB_ConfigurationChanged();
 }
 
 void USB_Device_GetConfiguration(void)
 {
-	Endpoint_ClearSETUP();	
+	Endpoint_ClearSETUP();
 
 	Endpoint_Write_Byte(USB_ConfigurationNumber);
 	
@@ -299,7 +298,7 @@ static void USB_Device_ClearSetFeature(void)
 					}
 					else
 					{
-						Endpoint_StallTransaction();						
+						Endpoint_StallTransaction();
 					}
 				}
 			}
@@ -313,9 +312,6 @@ static void USB_Device_ClearSetFeature(void)
 	Endpoint_ClearSETUP();
 
 	Endpoint_ClearIN();
-
-	while (!(Endpoint_IsOUTReceived()));
-	Endpoint_ClearOUT();
 }
 
 #endif