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

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
index 3f2805c5a..fa35a1b61 100644
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -39,34 +39,37 @@ uint8_t USB_ConfigurationNumber;
 bool    USB_RemoteWakeupEnabled;
 bool    USB_CurrentlySelfPowered;
 
-void USB_Device_ProcessControlPacket(void)
+void USB_Device_ProcessControlRequest(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;
 	
-	switch (bRequest)
+	for (uint8_t RequestHeaderByte = 0; RequestHeaderByte < sizeof(USB_Request_Header_t); RequestHeaderByte++)
+	  *(RequestHeader++) = Endpoint_Read_Byte();
+	  
+	uint8_t bmRequestType = USB_ControlRequest.bmRequestType;
+	
+	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(FEATURELESS_CONTROL_ONLY_DEVICE)
 		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))
 			{
@@ -103,7 +106,7 @@ void USB_Device_ProcessControlPacket(void)
 	}
 
 	if (!(RequestHandled))
-	  RAISE_EVENT(USB_UnhandledControlPacket, bRequest, bmRequestType);
+	  EVENT_USB_Device_UnhandledControlRequest();
 	  
 	if (Endpoint_IsSETUPReceived())
 	{
@@ -114,136 +117,202 @@ void USB_Device_ProcessControlPacket(void)
 
 static void USB_Device_SetAddress(void)
 {
-	uint8_t wValue_LSB = Endpoint_Read_Byte();
+	uint8_t DeviceAddress = (USB_ControlRequest.wValue & 0x7F);
 
 	Endpoint_ClearSETUP();
 	
-	while (!(Endpoint_IsINReady()));
-	
 	Endpoint_ClearIN();
 	
-	while (!(Endpoint_IsINReady()));
+	while (!(Endpoint_IsINReady()))
+	{
+		if (USB_DeviceState == DEVICE_STATE_Unattached)
+		  return;
+	}
+
+	UDADDR = ((1 << ADDEN) | DeviceAddress);
 
-	UDADDR = ((1 << ADDEN) | (wValue_LSB & 0x7F));
+	if (DeviceAddress)
+	  USB_DeviceState = DEVICE_STATE_Addressed;
 
 	return;
 }
 
 static void USB_Device_SetConfiguration(void)
 {
-	uint8_t wValue_LSB        = Endpoint_Read_Byte();
-	bool    AlreadyConfigured = (USB_ConfigurationNumber != 0);
-
-#if defined(USE_SINGLE_DEVICE_CONFIGURATION)
-	if (wValue_LSB > 1)
+#if defined(FIXED_NUM_CONFIGURATIONS)
+	if ((uint8_t)USB_ControlRequest.wValue > FIXED_NUM_CONFIGURATIONS)
+	  return;
 #else
+	#if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)
+	uint8_t MemoryAddressSpace;
+	#endif
+	
 	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
+	#if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)
+	                               , &MemoryAddressSpace
+	#endif
+	                               ) == NO_DESCRIPTOR)
+	{
+		return;
+	}
+	
 	#if defined(USE_RAM_DESCRIPTORS)
-	    (wValue_LSB > DevDescriptorPtr->NumberOfConfigurations))
+	if ((uint8_t)USB_ControlRequest.wValue > DevDescriptorPtr->NumberOfConfigurations)
+	  return;
 	#elif defined (USE_EEPROM_DESCRIPTORS)
-	    (wValue_LSB > eeprom_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))
+	if ((uint8_t)USB_ControlRequest.wValue > eeprom_read_byte(&DevDescriptorPtr->NumberOfConfigurations))
+	  return;
+	#elif defined (USE_FLASH_DESCRIPTORS)
+	if ((uint8_t)USB_ControlRequest.wValue > pgm_read_byte(&DevDescriptorPtr->NumberOfConfigurations))
+	  return;
 	#else
-	    (wValue_LSB > pgm_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))
-	#endif
-#endif
+	if (MemoryAddressSpace == MEMSPACE_FLASH)
 	{
-		return;
+		if (((uint8_t)USB_ControlRequest.wValue > pgm_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))
+		  return;
+	}
+	else if (MemoryAddressSpace == MEMSPACE_EEPROM)
+	{
+		if (((uint8_t)USB_ControlRequest.wValue > eeprom_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))
+		  return;
+	}
+	else
+	{
+		if ((uint8_t)USB_ControlRequest.wValue > DevDescriptorPtr->NumberOfConfigurations)
+		  return;
 	}
+	#endif
+#endif
 	
 	Endpoint_ClearSETUP();
 
-	USB_ConfigurationNumber = wValue_LSB;
+	USB_ConfigurationNumber = (uint8_t)USB_ControlRequest.wValue;
 
 	Endpoint_ClearIN();
 
-	if (!(AlreadyConfigured) && USB_ConfigurationNumber)
-	  RAISE_EVENT(USB_DeviceEnumerationComplete);
+	if (USB_ConfigurationNumber)
+	  USB_DeviceState = DEVICE_STATE_Configured;
+	else
+	  USB_DeviceState = DEVICE_STATE_Addressed;
 
-	RAISE_EVENT(USB_ConfigurationChanged);
+	EVENT_USB_Device_ConfigurationChanged();
 }
 
 void USB_Device_GetConfiguration(void)
 {
-	Endpoint_ClearSETUP();	
+	Endpoint_ClearSETUP();
 
 	Endpoint_Write_Byte(USB_ConfigurationNumber);
 	
 	Endpoint_ClearIN();
 
-	while (!(Endpoint_IsOUTReceived()));
+	while (!(Endpoint_IsOUTReceived()))
+	{
+		if (USB_DeviceState == DEVICE_STATE_Unattached)
+		  return;	
+	}
+
 	Endpoint_ClearOUT();
 }
 
-static void USB_Device_GetDescriptor(void)
+#if !defined(NO_INTERNAL_SERIAL) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
+static char USB_Device_NibbleToASCII(uint8_t Nibble)
+{
+	Nibble = ((Nibble & 0x0F) + '0');
+	return (Nibble > '9') ? (Nibble + ('A' - '9' - 1)) : Nibble;
+}
+
+static void USB_Device_GetInternalSerialDescriptor(void)
 {
-	uint16_t wValue  = Endpoint_Read_Word_LE();
-	uint16_t wIndex  = Endpoint_Read_Word_LE();
-	uint16_t wLength = Endpoint_Read_Word_LE();
+	struct
+	{
+		USB_Descriptor_Header_t Header;
+		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;
+
+	for (uint8_t SerialCharNum = 0; SerialCharNum < 20; SerialCharNum++)
+	{
+		uint8_t SerialByte = boot_signature_byte_get(SigReadAddress);
+		
+		if (SerialCharNum & 0x01)
+		{
+			SerialByte >>= 4;
+			SigReadAddress++;
+		}
+		
+		SignatureDescriptor.UnicodeString[SerialCharNum] = USB_Device_NibbleToASCII(SerialByte);
+	}
 	
+	Endpoint_ClearSETUP();
+	Endpoint_Write_Control_Stream_LE(&SignatureDescriptor, sizeof(SignatureDescriptor));
+	Endpoint_ClearOUT();
+}
+#endif
+
+static void USB_Device_GetDescriptor(void)
+{
 	void*    DescriptorPointer;
 	uint16_t DescriptorSize;
 	
-	bool     SendZLP;
-	
-	if ((DescriptorSize = USB_GetDescriptor(wValue, wIndex, &DescriptorPointer)) == NO_DESCRIPTOR)
-	  return;
-	
-	Endpoint_ClearSETUP();	
-	
-	if (wLength > DescriptorSize)
-	  wLength = DescriptorSize;
+	#if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)
+	uint8_t  DescriptorAddressSpace;
+	#endif
 	
-	while (wLength)
+	#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))
 	{
-		while (!(Endpoint_IsINReady()))
-		{
-			if (Endpoint_IsOUTReceived())
-			{
-				Endpoint_ClearOUT();
-				return;
-			}		
-		}
-		
-		while (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++));			
-			#else
-			Endpoint_Write_Byte(pgm_read_byte(DescriptorPointer++));
-			#endif
-			
-			wLength--;
-		}
-		
-		SendZLP = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);
-		Endpoint_ClearIN();
+		USB_Device_GetInternalSerialDescriptor();
+		return;
 	}
+	#endif
 	
-	if (SendZLP)
+	if ((DescriptorSize = CALLBACK_USB_GetDescriptor(USB_ControlRequest.wValue, USB_ControlRequest.wIndex,
+	                                                 &DescriptorPointer
+	#if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)
+	                                                 , &DescriptorAddressSpace
+	#endif
+													 )) == NO_DESCRIPTOR)
 	{
-		while (!(Endpoint_IsINReady()));
-		Endpoint_ClearIN();
+		return;
 	}
+	
+	Endpoint_ClearSETUP();
+
+	#if defined(USE_RAM_DESCRIPTORS)
+	Endpoint_Write_Control_Stream_LE(DescriptorPointer, DescriptorSize);
+	#elif defined(USE_EEPROM_DESCRIPTORS)
+	Endpoint_Write_Control_EStream_LE(DescriptorPointer, DescriptorSize);
+	#elif defined(USE_FLASH_DESCRIPTORS)
+	Endpoint_Write_Control_PStream_LE(DescriptorPointer, DescriptorSize);	
+	#else
+	if (DescriptorAddressSpace == MEMSPACE_FLASH)
+	  Endpoint_Write_Control_PStream_LE(DescriptorPointer, DescriptorSize);	
+	else if (DescriptorAddressSpace == MEMSPACE_EEPROM)
+	  Endpoint_Write_Control_EStream_LE(DescriptorPointer, DescriptorSize);
+	else
+	  Endpoint_Write_Control_Stream_LE(DescriptorPointer, DescriptorSize);	
+	#endif
 
-	while (!(Endpoint_IsOUTReceived()));
 	Endpoint_ClearOUT();
 }
 
-static void USB_Device_GetStatus(const uint8_t bmRequestType)
+static void USB_Device_GetStatus(void)
 {
 	uint8_t CurrentStatus = 0;
 
-	Endpoint_Discard_Word();
-
-#if !defined(FEATURELESS_CONTROL_ONLY_DEVICE)
-	uint8_t wIndex_LSB = Endpoint_Read_Byte();
-#endif
-	
-	switch (bmRequestType)
+	switch (USB_ControlRequest.bmRequestType)
 	{
 		case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE):
 			if (USB_CurrentlySelfPowered)
@@ -253,67 +322,81 @@ static void USB_Device_GetStatus(const uint8_t bmRequestType)
 			  CurrentStatus |= FEATURE_REMOTE_WAKEUP_ENABLED;
 			
 			break;
-#if !defined(FEATURELESS_CONTROL_ONLY_DEVICE)
+#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
+		default:
+			return;
 	}
-	
-	Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);			  
+
 	Endpoint_ClearSETUP();
 
 	Endpoint_Write_Word_LE(CurrentStatus);
 
 	Endpoint_ClearIN();
 	
-	while (!(Endpoint_IsOUTReceived()));
+	while (!(Endpoint_IsOUTReceived()))
+	{
+		if (USB_DeviceState == DEVICE_STATE_Unattached)
+		  return;	
+	}
+	
 	Endpoint_ClearOUT();
 }
 
-#if !defined(FEATURELESS_CONTROL_ONLY_DEVICE)
-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_ClearSETUP();
-					Endpoint_ClearIN();
 				}
 			}
 			
 			break;
+#endif
 	}
+
+	Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);
+
+	Endpoint_ClearSETUP();
+
+	Endpoint_ClearIN();
 }
-#endif
 
 #endif