X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/6d9948679133bdd6e8747da044e1b26e69732a9a..03ee87b35abdb8b92e8b55ec040fa943f9a6786c:/LUFA/Drivers/USB/LowLevel/DevChapter9.c

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
index fa35a1b61..3118302cf 100644
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2009.
+     Copyright (C) Dean Camera, 2010.
               
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
 
 /*
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, and distribute this software
-  and its documentation for any purpose and without fee is hereby
-  granted, provided that the above copyright notice appear in all
-  copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this 
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
@@ -36,8 +36,14 @@
 #include "DevChapter9.h"
 
 uint8_t USB_ConfigurationNumber;
-bool    USB_RemoteWakeupEnabled;
+
+#if !defined(NO_DEVICE_SELF_POWER)
 bool    USB_CurrentlySelfPowered;
+#endif
+
+#if !defined(NO_DEVICE_REMOTE_WAKEUP)
+bool    USB_RemoteWakeupEnabled;
+#endif
 
 void USB_Device_ProcessControlRequest(void)
 {
@@ -121,7 +127,7 @@ static void USB_Device_SetAddress(void)
 
 	Endpoint_ClearSETUP();
 	
-	Endpoint_ClearIN();
+	Endpoint_ClearStatusStage();
 	
 	while (!(Endpoint_IsINReady()))
 	{
@@ -129,11 +135,11 @@ static void USB_Device_SetAddress(void)
 		  return;
 	}
 
-	UDADDR = ((1 << ADDEN) | DeviceAddress);
-
 	if (DeviceAddress)
 	  USB_DeviceState = DEVICE_STATE_Addressed;
 
+	UDADDR = ((1 << ADDEN) | DeviceAddress);
+
 	return;
 }
 
@@ -190,12 +196,9 @@ static void USB_Device_SetConfiguration(void)
 
 	USB_ConfigurationNumber = (uint8_t)USB_ControlRequest.wValue;
 
-	Endpoint_ClearIN();
+	Endpoint_ClearStatusStage();
 
-	if (USB_ConfigurationNumber)
-	  USB_DeviceState = DEVICE_STATE_Configured;
-	else
-	  USB_DeviceState = DEVICE_STATE_Addressed;
+	USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Addressed;
 
 	EVENT_USB_Device_ConfigurationChanged();
 }
@@ -205,16 +208,9 @@ void USB_Device_GetConfiguration(void)
 	Endpoint_ClearSETUP();
 
 	Endpoint_Write_Byte(USB_ConfigurationNumber);
-	
 	Endpoint_ClearIN();
 
-	while (!(Endpoint_IsOUTReceived()))
-	{
-		if (USB_DeviceState == DEVICE_STATE_Unattached)
-		  return;	
-	}
-
-	Endpoint_ClearOUT();
+	Endpoint_ClearStatusStage();
 }
 
 #if !defined(NO_INTERNAL_SERIAL) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
@@ -232,15 +228,10 @@ static void USB_Device_GetInternalSerialDescriptor(void)
 		int16_t                 UnicodeString[20];
 	} SignatureDescriptor;
 
-	#if defined(USE_NONSTANDARD_DESCRIPTOR_NAMES)
-		SignatureDescriptor.Header.Size            = sizeof(SignatureDescriptor);
-		SignatureDescriptor.Header.Type            = DTYPE_String;
-	#else
-		SignatureDescriptor.Header.bLength         = sizeof(SignatureDescriptor);
-		SignatureDescriptor.Header.bDescriptorType = DTYPE_String;
-	#endif
-
-	uint8_t  SigReadAddress     = 0x0E;
+	SignatureDescriptor.Header.Type = DTYPE_String;
+	SignatureDescriptor.Header.Size = sizeof(SignatureDescriptor);
+	
+	uint8_t SigReadAddress = 0x0E;
 
 	for (uint8_t SerialCharNum = 0; SerialCharNum < 20; SerialCharNum++)
 	{
@@ -256,7 +247,9 @@ static void USB_Device_GetInternalSerialDescriptor(void)
 	}
 	
 	Endpoint_ClearSETUP();
+
 	Endpoint_Write_Control_Stream_LE(&SignatureDescriptor, sizeof(SignatureDescriptor));
+
 	Endpoint_ClearOUT();
 }
 #endif
@@ -314,17 +307,22 @@ static void USB_Device_GetStatus(void)
 
 	switch (USB_ControlRequest.bmRequestType)
 	{
+#if !defined(NO_DEVICE_SELF_POWER) || !defined(NO_DEVICE_REMOTE_WAKEUP)	
 		case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE):
+	#if !defined(NO_DEVICE_SELF_POWER)
 			if (USB_CurrentlySelfPowered)
 			  CurrentStatus |= FEATURE_SELFPOWERED_ENABLED;
-			
+	#endif
+
+	#if !defined(NO_DEVICE_REMOTE_WAKEUP)			
 			if (USB_RemoteWakeupEnabled)
 			  CurrentStatus |= FEATURE_REMOTE_WAKEUP_ENABLED;
-			
+	#endif
 			break;
+#endif
 #if !defined(CONTROL_ONLY_DEVICE)
 		case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_ENDPOINT):
-			Endpoint_SelectEndpoint((uint8_t)USB_ControlRequest.wIndex);
+			Endpoint_SelectEndpoint(USB_ControlRequest.wIndex & 0xFF);
 
 			CurrentStatus = Endpoint_IsStalled();
 
@@ -339,22 +337,16 @@ static void USB_Device_GetStatus(void)
 	Endpoint_ClearSETUP();
 
 	Endpoint_Write_Word_LE(CurrentStatus);
-
 	Endpoint_ClearIN();
 	
-	while (!(Endpoint_IsOUTReceived()))
-	{
-		if (USB_DeviceState == DEVICE_STATE_Unattached)
-		  return;	
-	}
-	
-	Endpoint_ClearOUT();
+	Endpoint_ClearStatusStage();
 }
 
 static void USB_Device_ClearSetFeature(void)
 {	
 	switch (USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT)
 	{
+#if !defined(NO_DEVICE_REMOTE_WAKEUP)			
 		case REQREC_DEVICE:
 			if ((uint8_t)USB_ControlRequest.wValue == FEATURE_REMOTE_WAKEUP)
 			  USB_RemoteWakeupEnabled = (USB_ControlRequest.bRequest == REQ_SetFeature);
@@ -362,6 +354,7 @@ static void USB_Device_ClearSetFeature(void)
 			  return;
 			
 			break;			
+#endif
 #if !defined(CONTROL_ONLY_DEVICE)
 		case REQREC_ENDPOINT:
 			if ((uint8_t)USB_ControlRequest.wValue == FEATURE_ENDPOINT_HALT)
@@ -375,28 +368,30 @@ static void USB_Device_ClearSetFeature(void)
 
 				if (Endpoint_IsEnabled())
 				{				
-					if (USB_ControlRequest.bRequest == REQ_ClearFeature)
+					if (USB_ControlRequest.bRequest == REQ_SetFeature)
 					{
-						Endpoint_ClearStall();
-						Endpoint_ResetFIFO(EndpointIndex);
-						Endpoint_ResetDataToggle();
+						Endpoint_StallTransaction();
 					}
 					else
 					{
-						Endpoint_StallTransaction();
-					}
+						Endpoint_ClearStall();
+						Endpoint_ResetFIFO(EndpointIndex);
+						Endpoint_ResetDataToggle();
+					}					
 				}
 			}
 			
 			break;
 #endif
+		default:
+			return;
 	}
 
 	Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);
 
 	Endpoint_ClearSETUP();
 
-	Endpoint_ClearIN();
+	Endpoint_ClearStatusStage();
 }
 
 #endif