X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/eee252603be67c539f9986cde76454f756e55d95..f2740a66bafa876dfcf2cdfa4c6f3e17395e8bf8:/LUFA/Drivers/USB/Core/DeviceStandardReq.c

diff --git a/LUFA/Drivers/USB/Core/DeviceStandardReq.c b/LUFA/Drivers/USB/Core/DeviceStandardReq.c
index ef1a278d4..45b43c237 100644
--- a/LUFA/Drivers/USB/Core/DeviceStandardReq.c
+++ b/LUFA/Drivers/USB/Core/DeviceStandardReq.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2012.
+     Copyright (C) Dean Camera, 2018.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2018  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
@@ -117,16 +117,16 @@ void USB_Device_ProcessControlRequest(void)
 
 	if (Endpoint_IsSETUPReceived())
 	{
-		Endpoint_StallTransaction();
 		Endpoint_ClearSETUP();
+		Endpoint_StallTransaction();
 	}
 }
 
 static void USB_Device_SetAddress(void)
 {
-	uint8_t    DeviceAddress    = (USB_ControlRequest.wValue & 0x7F);
-	uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();
-	GlobalInterruptDisable();
+	uint8_t DeviceAddress = (USB_ControlRequest.wValue & 0x7F);
+
+	USB_Device_SetDeviceAddress(DeviceAddress);
 
 	Endpoint_ClearSETUP();
 
@@ -134,10 +134,9 @@ static void USB_Device_SetAddress(void)
 
 	while (!(Endpoint_IsINReady()));
 
-	USB_Device_SetDeviceAddress(DeviceAddress);
-	USB_DeviceState = (DeviceAddress) ? DEVICE_STATE_Addressed : DEVICE_STATE_Default;
+	USB_Device_EnableDeviceAddress(DeviceAddress);
 
-	SetGlobalInterruptMask(CurrentGlobalInt);
+	USB_DeviceState = (DeviceAddress) ? DEVICE_STATE_Addressed : DEVICE_STATE_Default;
 }
 
 static void USB_Device_SetConfiguration(void)
@@ -153,8 +152,8 @@ static void USB_Device_SetConfiguration(void)
 			#define MemoryAddressSpace  MEMSPACE_FLASH
 		#elif defined(USE_EEPROM_DESCRIPTORS)
 			#define MemoryAddressSpace  MEMSPACE_EEPROM
-		#elif defined(USE_SRAM_DESCRIPTORS)
-			#define MemoryAddressSpace  MEMSPACE_SRAM
+		#elif defined(USE_RAM_DESCRIPTORS)
+			#define MemoryAddressSpace  MEMSPACE_RAM
 		#else
 			uint8_t MemoryAddressSpace;
 		#endif
@@ -293,6 +292,7 @@ static void USB_Device_GetStatus(void)
 	switch (USB_ControlRequest.bmRequestType)
 	{
 		case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE):
+		{
 			#if !defined(NO_DEVICE_SELF_POWER)
 			if (USB_Device_CurrentlySelfPowered)
 			  CurrentStatus |= FEATURE_SELFPOWERED_ENABLED;
@@ -303,9 +303,16 @@ static void USB_Device_GetStatus(void)
 			  CurrentStatus |= FEATURE_REMOTE_WAKEUP_ENABLED;
 			#endif
 			break;
+		}
 		case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_ENDPOINT):
+		{
 			#if !defined(CONTROL_ONLY_DEVICE)
-			Endpoint_SelectEndpoint((uint8_t)USB_ControlRequest.wIndex & ENDPOINT_EPNUM_MASK);
+			uint8_t EndpointIndex = ((uint8_t)USB_ControlRequest.wIndex & ENDPOINT_EPNUM_MASK);
+
+			if (EndpointIndex >= ENDPOINT_TOTAL_ENDPOINTS)
+				return;
+
+			Endpoint_SelectEndpoint(EndpointIndex);
 
 			CurrentStatus = Endpoint_IsStalled();
 
@@ -313,6 +320,7 @@ static void USB_Device_GetStatus(void)
 			#endif
 
 			break;
+		}
 		default:
 			return;
 	}
@@ -331,20 +339,23 @@ static void USB_Device_ClearSetFeature(void)
 	{
 		#if !defined(NO_DEVICE_REMOTE_WAKEUP)
 		case REQREC_DEVICE:
+		{
 			if ((uint8_t)USB_ControlRequest.wValue == FEATURE_SEL_DeviceRemoteWakeup)
 			  USB_Device_RemoteWakeupEnabled = (USB_ControlRequest.bRequest == REQ_SetFeature);
 			else
 			  return;
 
 			break;
+		}
 		#endif
 		#if !defined(CONTROL_ONLY_DEVICE)
 		case REQREC_ENDPOINT:
+		{
 			if ((uint8_t)USB_ControlRequest.wValue == FEATURE_SEL_EndpointHalt)
 			{
 				uint8_t EndpointIndex = ((uint8_t)USB_ControlRequest.wIndex & ENDPOINT_EPNUM_MASK);
 
-				if (EndpointIndex == ENDPOINT_CONTROLEP)
+				if (EndpointIndex == ENDPOINT_CONTROLEP || EndpointIndex >= ENDPOINT_TOTAL_ENDPOINTS)
 				  return;
 
 				Endpoint_SelectEndpoint(EndpointIndex);
@@ -365,6 +376,7 @@ static void USB_Device_ClearSetFeature(void)
 			}
 
 			break;
+		}
 		#endif
 		default:
 			return;