X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/6a10d6b465be27db090d760dc0fbe722c94e4344..b462f2d457ec2f0cfa22a1c3db198cb22f6809a1:/LUFA/Drivers/USB/LowLevel/DevChapter9.c?ds=sidebyside

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
index 9ea3f417c..feaabce46 100644
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -28,7 +28,8 @@
   this software.
 */
 
-#include "USBMode.h"
+#include "../HighLevel/USBMode.h"
+
 #if defined(USB_CAN_BE_DEVICE)
 
 #define  INCLUDE_FROM_DEVCHAPTER9_C
@@ -40,32 +41,35 @@ bool    USB_CurrentlySelfPowered;
 
 void USB_Device_ProcessControlPacket(void)
 {
-	uint8_t bmRequestType  = Endpoint_Read_Byte();
-	uint8_t bRequest       = Endpoint_Read_Byte();
-	bool    RequestHandled = false;	
+	bool     RequestHandled = false;
+	uint8_t* RequestHeader  = (uint8_t*)&USB_ControlRequest;
+	
+	for (uint8_t RequestHeaderByte = 0; RequestHeaderByte < sizeof(USB_Request_Header_t); RequestHeaderByte++)
+	  *(RequestHeader++) = Endpoint_Read_Byte();
+	  
+	uint8_t bmRequestType = USB_ControlRequest.bmRequestType;
 	
-	switch (bRequest)
+	switch (USB_ControlRequest.bRequest)
 	{
 		case REQ_GetStatus:
 			if ((bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE)) ||
 			    (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_ENDPOINT)))
 			{
-				USB_Device_GetStatus(bmRequestType);
+				USB_Device_GetStatus();
 				RequestHandled = true;
 			}
 
 			break;
-#if !defined(NO_CLEARSET_FEATURE_REQUEST)
 		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(bRequest, bmRequestType);
+				USB_Device_ClearSetFeature();
 				RequestHandled = true;
 			}
 
 			break;
-#endif
 		case REQ_SetAddress:
 			if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE))
 			{
@@ -102,145 +106,190 @@ void USB_Device_ProcessControlPacket(void)
 	}
 
 	if (!(RequestHandled))
-	  RAISE_EVENT(USB_UnhandledControlPacket, bRequest, bmRequestType);
+	  EVENT_USB_UnhandledControlPacket();
 	  
-	if (Endpoint_IsSetupReceived())
+	if (Endpoint_IsSETUPReceived())
 	{
 		Endpoint_StallTransaction();
-		Endpoint_ClearSetupReceived();		
+		Endpoint_ClearSETUP();		
 	}
 }
 
 static void USB_Device_SetAddress(void)
 {
-	uint8_t wValue_LSB = Endpoint_Read_Byte();
-
-	Endpoint_ClearSetupReceived();
-	
-	while (!(Endpoint_IsSetupINReady()));
+	Endpoint_ClearSETUP();
 	
-	Endpoint_ClearSetupIN();
+	Endpoint_ClearIN();
 	
-	while (!(Endpoint_IsSetupINReady()));
+	while (!(Endpoint_IsINReady()));
 
-	UDADDR = ((1 << ADDEN) | (wValue_LSB & 0x7F));
+	UDADDR = ((1 << ADDEN) | ((uint8_t)USB_ControlRequest.wValue & 0x7F));
 
 	return;
 }
 
 static void USB_Device_SetConfiguration(void)
 {
-	uint8_t wValue_LSB        = Endpoint_Read_Byte();
-	bool    AlreadyConfigured = (USB_ConfigurationNumber != 0);
+	bool AlreadyConfigured = (USB_ConfigurationNumber != 0);
 
 #if defined(USE_SINGLE_DEVICE_CONFIGURATION)
-	if (wValue_LSB > 1)
+	if ((uint8_t)USB_ControlRequest.wValue > 1)
 #else
 	USB_Descriptor_Device_t* DevDescriptorPtr;
 
-	if ((USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DevDescriptorPtr) == NO_DESCRIPTOR) ||
+	if ((CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DevDescriptorPtr) == NO_DESCRIPTOR) ||
 	#if defined(USE_RAM_DESCRIPTORS)
-	    (wValue_LSB > DevDescriptorPtr->NumberOfConfigurations))
+	    ((uint8_t)USB_ControlRequest.wValue > DevDescriptorPtr->NumberOfConfigurations))
 	#elif defined (USE_EEPROM_DESCRIPTORS)
-	    (wValue_LSB > eeprom_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))
+	    ((uint8_t)USB_ControlRequest.wValue > eeprom_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))
 	#else
-	    (wValue_LSB > pgm_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))
+	    ((uint8_t)USB_ControlRequest.wValue > pgm_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))
 	#endif
 #endif
 	{
 		return;
 	}
 	
-	Endpoint_ClearSetupReceived();
+	Endpoint_ClearSETUP();
 
-	USB_ConfigurationNumber = wValue_LSB;
+	USB_ConfigurationNumber = (uint8_t)USB_ControlRequest.wValue;
 
-	Endpoint_ClearSetupIN();
+	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_ClearSetupReceived();	
+	Endpoint_ClearSETUP();
 
 	Endpoint_Write_Byte(USB_ConfigurationNumber);
 	
-	Endpoint_ClearSetupIN();
+	Endpoint_ClearIN();
 
-	while (!(Endpoint_IsSetupOUTReceived()));
-	Endpoint_ClearSetupOUT();
+	while (!(Endpoint_IsOUTReceived()));
+	Endpoint_ClearOUT();
 }
 
 static void USB_Device_GetDescriptor(void)
 {
-	uint16_t wValue  = Endpoint_Read_Word_LE();
-	uint16_t wIndex  = Endpoint_Read_Word_LE();
-	uint16_t wLength = Endpoint_Read_Word_LE();
-	
 	void*    DescriptorPointer;
 	uint16_t DescriptorSize;
 	
-	bool     SendZLP;
+	#if !defined(NO_INTERNAL_SERIAL) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
+	if (USB_ControlRequest.wValue == ((DTYPE_String << 8) | USE_INTERNAL_SERIAL))
+	{
+		struct
+		{
+			USB_Descriptor_Header_t Header;
+			int16_t                 UnicodeString[12];
+		} 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;		
+		bool     OddRead         = false;
+
+		for (uint8_t SerialCharNum = 0; SerialCharNum < 12; SerialCharNum++)
+		{
+			uint8_t SerialByte = boot_signature_byte_get(SigReadAddress);
+			
+			if (OddRead)
+			{
+				SerialByte >>= 4;
+				SigReadAddress++;
+			}
+			else
+			{
+				SerialByte &= 0x0F;
+			}
+			
+			OddRead = !(OddRead);
+
+			if (SerialByte < 0x0A)
+			  SerialByte += '0';
+			else
+			  SerialByte += ('A' - 0x0A);
+
+			SignatureDescriptor.UnicodeString[SerialCharNum] = SerialByte;
+		}
+		
+		Endpoint_ClearSETUP();
+		Endpoint_Write_Control_Stream_LE(&SignatureDescriptor, sizeof(SignatureDescriptor));
+		Endpoint_ClearOUT();
+
+		return;
+	}
+	#endif
 	
-	if ((DescriptorSize = USB_GetDescriptor(wValue, wIndex, &DescriptorPointer)) == NO_DESCRIPTOR)
-	  return;
+	if ((DescriptorSize = CALLBACK_USB_GetDescriptor(USB_ControlRequest.wValue, USB_ControlRequest.wIndex,
+	                                                 &DescriptorPointer)) == NO_DESCRIPTOR)
+	{
+		return;
+	}
 	
-	Endpoint_ClearSetupReceived();
+	Endpoint_ClearSETUP();
+
+	#if defined(USE_RAM_DESCRIPTORS)
+	Endpoint_Write_Control_Stream_LE(DescriptorPointer, DescriptorSize);
+	#else
+	bool SendZLP;
 	
-	if (wLength > DescriptorSize)
-	  wLength = DescriptorSize;
+	if (USB_ControlRequest.wLength > DescriptorSize)
+	  USB_ControlRequest.wLength = DescriptorSize;
 	
-	while (wLength)
+	while (USB_ControlRequest.wLength)
 	{
-		while (!(Endpoint_IsSetupINReady()))
+		while (!(Endpoint_IsINReady()))
 		{
-			if (Endpoint_IsSetupOUTReceived())
+			if (Endpoint_IsOUTReceived())
 			{
-				Endpoint_ClearSetupOUT();
+				Endpoint_ClearOUT();
 				return;
 			}		
 		}
 		
-		while (wLength && (Endpoint_BytesInEndpoint() < USB_ControlEndpointSize))
+		while (USB_ControlRequest.wLength && (Endpoint_BytesInEndpoint() < USB_ControlEndpointSize))
 		{
-			#if defined(USE_RAM_DESCRIPTORS)
-			Endpoint_Write_Byte(*((uint8_t*)DescriptorPointer++));
-			#elif defined (USE_EEPROM_DESCRIPTORS)
-			Endpoint_Write_Byte(eeprom_read_byte(DescriptorPointer++));			
+			#if defined (USE_EEPROM_DESCRIPTORS)
+			Endpoint_Write_Byte(eeprom_read_byte(DescriptorPointer++));		
 			#else
 			Endpoint_Write_Byte(pgm_read_byte(DescriptorPointer++));
 			#endif
 			
-			wLength--;
+			USB_ControlRequest.wLength--;
 		}
 		
 		SendZLP = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);
-		Endpoint_ClearSetupIN();
+		Endpoint_ClearIN();
 	}
 	
 	if (SendZLP)
 	{
-		while (!(Endpoint_IsSetupINReady()));
-		Endpoint_ClearSetupIN();
+		while (!(Endpoint_IsINReady()));
+		Endpoint_ClearIN();
 	}
 
-	while (!(Endpoint_IsSetupOUTReceived()));
-	Endpoint_ClearSetupOUT();
+	while (!(Endpoint_IsOUTReceived()));
+	#endif
+	
+	Endpoint_ClearOUT();
 }
 
-static void USB_Device_GetStatus(const uint8_t bmRequestType)
+static void USB_Device_GetStatus(void)
 {
 	uint8_t CurrentStatus = 0;
 
-	Endpoint_Discard_Word();
-
-	uint8_t wIndex_LSB = Endpoint_Read_Byte();
-	
-	switch (bmRequestType)
+	switch (USB_ControlRequest.bmRequestType)
 	{
 		case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE):
 			if (USB_CurrentlySelfPowered)
@@ -250,64 +299,74 @@ static void USB_Device_GetStatus(const uint8_t bmRequestType)
 			  CurrentStatus |= FEATURE_REMOTE_WAKEUP_ENABLED;
 			
 			break;
+#if !defined(CONTROL_ONLY_DEVICE)
 		case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_ENDPOINT):
-			Endpoint_SelectEndpoint(wIndex_LSB);
+			Endpoint_SelectEndpoint((uint8_t)USB_ControlRequest.wIndex);
 
 			CurrentStatus = Endpoint_IsStalled();
 
+			Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);			  
+
 			break;
+#endif
 	}
-	
-	Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);			  
-	Endpoint_ClearSetupReceived();
+
+	Endpoint_ClearSETUP();
+
 	Endpoint_Write_Word_LE(CurrentStatus);
 
-	Endpoint_ClearSetupIN();
+	Endpoint_ClearIN();
 	
-	while (!(Endpoint_IsSetupOUTReceived()));
-	Endpoint_ClearSetupOUT();
+	while (!(Endpoint_IsOUTReceived()));
+	Endpoint_ClearOUT();
 }
 
-#if !defined(NO_CLEARSET_FEATURE_REQUEST)
-static void USB_Device_ClearSetFeature(const uint8_t bRequest, const uint8_t bmRequestType)
-{
-	uint16_t wValue = Endpoint_Read_Word_LE();
-	uint16_t wIndex = Endpoint_Read_Word_LE();
-	
-	switch (bmRequestType & CONTROL_REQTYPE_RECIPIENT)
+static void USB_Device_ClearSetFeature(void)
+{	
+	switch (USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT)
 	{
+		case REQREC_DEVICE:
+			if ((uint8_t)USB_ControlRequest.wValue == FEATURE_REMOTE_WAKEUP)
+			  USB_RemoteWakeupEnabled = (USB_ControlRequest.bRequest == REQ_SetFeature);
+			else
+			  return;
+			
+			break;			
+#if !defined(CONTROL_ONLY_DEVICE)
 		case REQREC_ENDPOINT:
-			if (wValue == FEATURE_ENDPOINT_HALT)
+			if ((uint8_t)USB_ControlRequest.wValue == FEATURE_ENDPOINT_HALT)
 			{
-				uint8_t EndpointIndex = (wIndex & ENDPOINT_EPNUM_MASK);
+				uint8_t EndpointIndex = ((uint8_t)USB_ControlRequest.wIndex & ENDPOINT_EPNUM_MASK);
 				
-				if (EndpointIndex != ENDPOINT_CONTROLEP)
-				{
-					Endpoint_SelectEndpoint(EndpointIndex);
-
-					if (Endpoint_IsEnabled())
-					{				
-						if (bRequest == REQ_ClearFeature)
-						{
-							Endpoint_ClearStall();
-							Endpoint_ResetFIFO(EndpointIndex);
-							Endpoint_ResetDataToggle();
-						}
-						else
-						{
-							Endpoint_StallTransaction();						
-						}
+				if (EndpointIndex == ENDPOINT_CONTROLEP)
+				  return;
+
+				Endpoint_SelectEndpoint(EndpointIndex);
+
+				if (Endpoint_IsEnabled())
+				{				
+					if (USB_ControlRequest.bRequest == REQ_ClearFeature)
+					{
+						Endpoint_ClearStall();
+						Endpoint_ResetFIFO(EndpointIndex);
+						Endpoint_ResetDataToggle();
+					}
+					else
+					{
+						Endpoint_StallTransaction();
 					}
-
-					Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);
-					Endpoint_ClearSetupReceived();
-					Endpoint_ClearSetupIN();
 				}
 			}
 			
 			break;
+#endif
 	}
+
+	Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);
+
+	Endpoint_ClearSETUP();
+
+	Endpoint_ClearIN();
 }
-#endif
 
 #endif