X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/00d0883507efdc17688abafa75e81bf62f83d777..da138684e428a40f7f5a0c32617e5c62c9e3a664:/LUFA/Drivers/USB/LowLevel/DevChapter9.c

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
index 9acf30099..f49f5b39b 100644
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -179,30 +179,52 @@ static void USB_Device_GetDescriptor(void)
 	void*    DescriptorPointer;
 	uint16_t DescriptorSize;
 	
-	#if defined(USE_INTERNAL_SERIAL)
+	#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))
 	{
-		uint8_t SignatureDescriptor[2 + (sizeof(int16_t) * 20)];
-
-		SignatureDescriptor[0] = sizeof(SignatureDescriptor);
-		SignatureDescriptor[1] = DTYPE_String;
+		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
 		
-		uint16_t* SigUnicodeChars = (uint16_t*)&SignatureDescriptor[2];
+		uint8_t  SigReadAddress  = 0x0E;		
+		bool     OddRead         = false;
 
-		for (uint8_t SerialByteNum = 0; SerialByteNum < 10; SerialByteNum++)
+		for (uint8_t SerialCharNum = 0; SerialCharNum < 12; SerialCharNum++)
 		{
-			char ConvSigString[3];
-
-			itoa(boot_signature_byte_get(0x0E + SerialByteNum), ConvSigString, 16);
+			uint8_t SerialByte = boot_signature_byte_get(SigReadAddress);
 			
-			SigUnicodeChars[0] = toupper(ConvSigString[0]);
-			SigUnicodeChars[1] = toupper(ConvSigString[1]);
+			if (OddRead)
+			{
+				SerialByte >>= 4;
+				SigReadAddress++;
+			}
+			else
+			{
+				SerialByte &= 0x0F;
+			}
 			
-			SigUnicodeChars += 2;
+			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_Write_Control_Stream_LE(&SignatureDescriptor, sizeof(SignatureDescriptor));
 		Endpoint_ClearOUT();
 
 		return;
@@ -219,47 +241,12 @@ static void USB_Device_GetDescriptor(void)
 
 	#if defined(USE_RAM_DESCRIPTORS)
 	Endpoint_Write_Control_Stream_LE(DescriptorPointer, DescriptorSize);
+	#elif defined(USE_EEPROM_DESCRIPTORS)
+	Endpoint_Write_Control_EStream_LE(DescriptorPointer, DescriptorSize);
 	#else
-	bool SendZLP;
-	
-	if (USB_ControlRequest.wLength > DescriptorSize)
-	  USB_ControlRequest.wLength = DescriptorSize;
-	
-	while (USB_ControlRequest.wLength)
-	{
-		while (!(Endpoint_IsINReady()))
-		{
-			if (Endpoint_IsOUTReceived())
-			{
-				Endpoint_ClearOUT();
-				return;
-			}		
-		}
-		
-		while (USB_ControlRequest.wLength && (Endpoint_BytesInEndpoint() < USB_ControlEndpointSize))
-		{
-			#if defined (USE_EEPROM_DESCRIPTORS)
-			Endpoint_Write_Byte(eeprom_read_byte(DescriptorPointer++));		
-			#else
-			Endpoint_Write_Byte(pgm_read_byte(DescriptorPointer++));
-			#endif
-			
-			USB_ControlRequest.wLength--;
-		}
-		
-		SendZLP = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);
-		Endpoint_ClearIN();
-	}
-	
-	if (SendZLP)
-	{
-		while (!(Endpoint_IsINReady()));
-		Endpoint_ClearIN();
-	}
-
-	while (!(Endpoint_IsOUTReceived()));
+	Endpoint_Write_Control_PStream_LE(DescriptorPointer, DescriptorSize);	
 	#endif
-	
+
 	Endpoint_ClearOUT();
 }