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

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
index 7fecd1f54..fa35a1b61 100644
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -39,7 +39,7 @@ uint8_t USB_ConfigurationNumber;
 bool    USB_RemoteWakeupEnabled;
 bool    USB_CurrentlySelfPowered;
 
-void USB_Device_ProcessControlPacket(void)
+void USB_Device_ProcessControlRequest(void)
 {
 	bool     RequestHandled = false;
 	uint8_t* RequestHeader  = (uint8_t*)&USB_ControlRequest;
@@ -106,7 +106,7 @@ void USB_Device_ProcessControlPacket(void)
 	}
 
 	if (!(RequestHandled))
-	  EVENT_USB_UnhandledControlPacket();
+	  EVENT_USB_Device_UnhandledControlRequest();
 	  
 	if (Endpoint_IsSETUPReceived())
 	{
@@ -139,8 +139,6 @@ static void USB_Device_SetAddress(void)
 
 static void USB_Device_SetConfiguration(void)
 {
-	bool AlreadyConfigured = (USB_ConfigurationNumber != 0);
-
 #if defined(FIXED_NUM_CONFIGURATIONS)
 	if ((uint8_t)USB_ControlRequest.wValue > FIXED_NUM_CONFIGURATIONS)
 	  return;
@@ -195,18 +193,11 @@ static void USB_Device_SetConfiguration(void)
 	Endpoint_ClearIN();
 
 	if (USB_ConfigurationNumber)
-	{
-		USB_DeviceState = DEVICE_STATE_Configured;
-
-		if (!(AlreadyConfigured))
-		  EVENT_USB_DeviceEnumerationComplete();
-	}
+	  USB_DeviceState = DEVICE_STATE_Configured;
 	else
-	{
-		USB_DeviceState = DEVICE_STATE_Addressed;
-	}
+	  USB_DeviceState = DEVICE_STATE_Addressed;
 
-	EVENT_USB_ConfigurationChanged();
+	EVENT_USB_Device_ConfigurationChanged();
 }
 
 void USB_Device_GetConfiguration(void)
@@ -227,6 +218,12 @@ void USB_Device_GetConfiguration(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)
 {
 	struct
@@ -234,9 +231,6 @@ static void USB_Device_GetInternalSerialDescriptor(void)
 		USB_Descriptor_Header_t Header;
 		int16_t                 UnicodeString[20];
 	} SignatureDescriptor;
-	
-	uint8_t SigReadAddress  = 0x0E;
-	bool    OddNibbleRead   = false;
 
 	#if defined(USE_NONSTANDARD_DESCRIPTOR_NAMES)
 		SignatureDescriptor.Header.Size            = sizeof(SignatureDescriptor);
@@ -246,28 +240,19 @@ static void USB_Device_GetInternalSerialDescriptor(void)
 		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 (OddNibbleRead)
+		if (SerialCharNum & 0x01)
 		{
 			SerialByte >>= 4;
 			SigReadAddress++;
 		}
-		else
-		{
-			SerialByte &= 0x0F;
-		}
 		
-		OddNibbleRead = !(OddNibbleRead);
-
-		if (SerialByte < 0x0A)
-		  SerialByte += '0';
-		else
-		  SerialByte += ('A' - 0x0A);
-
-		SignatureDescriptor.UnicodeString[SerialCharNum] = SerialByte;
+		SignatureDescriptor.UnicodeString[SerialCharNum] = USB_Device_NibbleToASCII(SerialByte);
 	}
 	
 	Endpoint_ClearSETUP();
@@ -347,6 +332,8 @@ static void USB_Device_GetStatus(void)
 
 			break;
 #endif
+		default:
+			return;
 	}
 
 	Endpoint_ClearSETUP();