X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/2793c88fc601dcc7ec4961326dd9748a20f3ec83..9d2613d90868b59ac48ccce8b652819d5cd388d5:/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c?ds=inline

diff --git a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c
index b855456ab..3222b770e 100644
--- a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c
+++ b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c
@@ -50,7 +50,6 @@ int main(void)
 	
 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
 
-	/* Startup message */
 	puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
 	       "Bluetooth Host Demo running.\r\n" ESC_INVERSE_OFF));
 		   
@@ -58,6 +57,7 @@ int main(void)
 	{
 		Bluetooth_Stack_Task();
 		Bluetooth_Management_Task();
+		USB_USBTask();
 	}
 }
 
@@ -110,6 +110,7 @@ void EVENT_USB_DeviceEnumerationFailed(uint8_t ErrorCode, uint8_t SubErrorCode)
 {
 	puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));
 	printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);
+	printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);
 	printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);
 	
 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
@@ -138,27 +139,14 @@ void Bluetooth_Management_Task(void)
 				LEDs_SetAllLEDs(LEDS_LED1);
 
 				/* Wait until USB device disconnected */
-				while (USB_IsConnected);
+				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
 			}
 
 			puts_P(PSTR("Bluetooth Dongle Detected.\r\n"));
 
-			/* Standard request to set the device configuration to configuration 1 */
-			USB_ControlRequest = (USB_Request_Header_t)
-				{
-					bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),
-					bRequest:      REQ_SetConfiguration,
-					wValue:        1,
-					wIndex:        0,
-					wLength:       0,
-				};
-				
-			/* Select the control pipe for the request transfer */
-			Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-			/* Send the request, display error and wait for device detatch if request fails */
-			if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)
+			/* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */
+			if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)
 			{
 				puts_P(PSTR("Control Error (Set Configuration).\r\n"));
 				printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
@@ -167,7 +155,7 @@ void Bluetooth_Management_Task(void)
 				LEDs_SetAllLEDs(LEDS_LED1);
 
 				/* Wait until USB device disconnected */
-				while (USB_IsConnected);
+				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
 			}
 				
@@ -190,7 +178,7 @@ void Bluetooth_Management_Task(void)
 				LEDs_SetAllLEDs(LEDS_LED1);
 
 				/* Wait until USB device disconnected */
-				while (USB_IsConnected);
+				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
 			}
 
@@ -198,9 +186,5 @@ void Bluetooth_Management_Task(void)
 
 			USB_HostState = HOST_STATE_Ready;
 			break;
-		case HOST_STATE_Ready:
-			/* Do nothing, Bluetooth stack will take care of enumeration */
-			
-			break;
 	}
 }