X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/37b2130fb2767a39f3d95414c6aca75a67c26298..a908773a13ee491f2f8907cdf57c26fb39e10658:/LUFA/Drivers/USB/HighLevel/USBTask.c?ds=sidebyside

diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.c b/LUFA/Drivers/USB/HighLevel/USBTask.c
index e1c065905..738dc1592 100644
--- a/LUFA/Drivers/USB/HighLevel/USBTask.c
+++ b/LUFA/Drivers/USB/HighLevel/USBTask.c
@@ -33,9 +33,10 @@
 #define  INCLUDE_FROM_USBTASK_C
 #include "USBTask.h"
 
-volatile bool      USB_IsSuspended;
-volatile bool      USB_IsConnected;
-volatile bool      USB_IsInitialized;
+volatile bool        USB_IsSuspended;
+volatile bool        USB_IsConnected;
+volatile bool        USB_IsInitialized;
+USB_Request_Header_t USB_ControlRequest;
 
 #if defined(USB_CAN_BE_HOST)
 volatile uint8_t   USB_HostState;
@@ -156,7 +157,7 @@ static void USB_HostTask(void)
 			break;
 		case HOST_STATE_Powered:
 			Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL,
-							   PIPE_TOKEN_SETUP, PIPE_CONTROLPIPE,
+							   PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP,
 							   PIPE_CONTROLPIPE_DEFAULT_SIZE, PIPE_BANK_SINGLE);		
 		
 			if (!(Pipe_IsConfigured()))
@@ -169,7 +170,7 @@ static void USB_HostTask(void)
 			USB_HostState = HOST_STATE_Default;
 			break;
 		case HOST_STATE_Default:
-			USB_HostRequest = (USB_Host_Request_Header_t)
+			USB_ControlRequest = (USB_Request_Header_t)
 				{
 					.bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),
 					.bRequest      = REQ_GetDescriptor,
@@ -202,7 +203,7 @@ static void USB_HostTask(void)
 			Pipe_ResetPipe(PIPE_CONTROLPIPE);
 			
 			Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL,
-			                   PIPE_TOKEN_SETUP, PIPE_CONTROLPIPE,
+			                   PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP,
 			                   USB_ControlPipeSize, PIPE_BANK_SINGLE);
 
 			if (!(Pipe_IsConfigured()))
@@ -214,7 +215,7 @@ static void USB_HostTask(void)
 
 			Pipe_SetInfiniteINRequests();
 			
-			USB_HostRequest = (USB_Host_Request_Header_t)
+			USB_ControlRequest = (USB_Request_Header_t)
 				{
 					.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),
 					.bRequest      = REQ_SetAddress,