X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/2ee9fc707784e115d744dbc229bdc893f4bb6bc1..d475ea4394ba0e16f89300ebeb452cea7c2d9232:/LUFA/Drivers/USB/LowLevel/Host.c

diff --git a/LUFA/Drivers/USB/LowLevel/Host.c b/LUFA/Drivers/USB/LowLevel/Host.c
index b3b56b8d1..421719bf8 100644
--- a/LUFA/Drivers/USB/LowLevel/Host.c
+++ b/LUFA/Drivers/USB/LowLevel/Host.c
@@ -55,7 +55,7 @@ void USB_Host_ProcessNextHostState(void)
 					break;
 				}
 				
-				if (!(WaitMSRemaining--))
+				if (!(--WaitMSRemaining))
 				  USB_HostState = PostWaitState;
 			}
 		
@@ -210,7 +210,6 @@ uint8_t USB_Host_WaitMS(uint8_t MS)
 	bool    BusSuspended = USB_Host_IsBusSuspended();
 	uint8_t ErrorCode    = HOST_WAITERROR_Successful;
 	
-	USB_INT_Clear(USB_INT_HSOFI);
 	USB_Host_ResumeBus();
 
 	while (MS)
@@ -260,9 +259,10 @@ static void USB_Host_ResetDevice(void)
 	USB_Host_ResetBus();
 	while (!(USB_Host_IsBusResetComplete()));
 
+	USB_Host_ResumeBus();
+
 	USB_INT_Clear(USB_INT_HSOFI);
-	USB_Host_ResumeBus();	
-	
+
 	for (uint8_t MSRem = 10; MSRem != 0; MSRem--)
 	{
 		/* Workaround for powerless-pull-up devices. After a USB bus reset,
@@ -272,6 +272,7 @@ static void USB_Host_ResetDevice(void)
 
 		if (USB_INT_HasOccurred(USB_INT_HSOFI))
 		{
+			USB_INT_Clear(USB_INT_HSOFI);
 			USB_INT_Clear(USB_INT_DDISCI);
 			break;
 		}
@@ -284,4 +285,56 @@ static void USB_Host_ResetDevice(void)
 
 	USB_INT_Enable(USB_INT_DDISCI);
 }
+
+uint8_t USB_Host_SetDeviceConfiguration(uint8_t ConfigNumber)
+{
+	USB_ControlRequest = (USB_Request_Header_t)
+		{
+			.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),
+			.bRequest      = REQ_SetConfiguration,
+			.wValue        = ConfigNumber,
+			.wIndex        = 0,
+			.wLength       = 0,
+		};
+
+	Pipe_SelectPipe(PIPE_CONTROLPIPE);
+	
+	return USB_Host_SendControlRequest(NULL);
+}
+
+uint8_t USB_Host_GetDeviceDescriptor(USB_Descriptor_Device_t* DeviceDescriptorPtr)
+{
+	USB_ControlRequest = (USB_Request_Header_t)
+		{
+			bmRequestType: (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),
+			bRequest:      REQ_GetDescriptor,
+			wValue:        (DTYPE_Device << 8),
+			wIndex:        0,
+			wLength:       sizeof(USB_Descriptor_Device_t),
+		};
+
+	Pipe_SelectPipe(PIPE_CONTROLPIPE);
+	
+	return USB_Host_SendControlRequest(DeviceDescriptorPtr);
+}
+
+uint8_t USB_Host_ClearPipeStall(uint8_t EndpointNum)
+{
+	if (Pipe_GetPipeToken() == PIPE_TOKEN_IN)
+	  EndpointNum |= (1 << 7);
+
+	USB_ControlRequest = (USB_Request_Header_t)
+		{
+			.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT),
+			.bRequest      = REQ_ClearFeature,
+			.wValue        = FEATURE_ENDPOINT_HALT,
+			.wIndex        = EndpointNum,
+			.wLength       = 0,
+		};
+
+	Pipe_SelectPipe(PIPE_CONTROLPIPE);
+	
+	return USB_Host_SendControlRequest(NULL);
+}
+
 #endif