X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/2793c88fc601dcc7ec4961326dd9748a20f3ec83..e4bf986bb351121a39076a7c85c09cd40b43f123:/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c

diff --git a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c
index b855456ab..7be0e6b3a 100644
--- a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c
+++ b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c
@@ -50,14 +50,13 @@ 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));
+	puts_P(PSTR(ESC_FG_CYAN "Bluetooth Host Demo running.\r\n" ESC_FG_WHITE));
 		   
 	for (;;)
 	{
 		Bluetooth_Stack_Task();
 		Bluetooth_Management_Task();
+		USB_USBTask();
 	}
 }
 
@@ -76,41 +75,42 @@ void SetupHardware(void)
 	USB_Init();
 }
 
-void EVENT_USB_DeviceAttached(void)
+void EVENT_USB_Host_DeviceAttached(void)
 {
-	puts_P(PSTR("Device Attached.\r\n"));
+	puts_P(PSTR(ESC_FG_GREEN "Device Attached.\r\n" ESC_FG_WHITE));
 
 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
 }
 
-void EVENT_USB_DeviceUnattached(void)
+void EVENT_USB_Host_DeviceUnattached(void)
 {
-	puts_P(PSTR("\r\nDevice Unattached.\r\n"));
+	puts_P(PSTR(ESC_FG_GREEN "\r\nDevice Unattached.\r\n" ESC_FG_WHITE));
 
 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
 }
 
-void EVENT_USB_DeviceEnumerationComplete(void)
+void EVENT_USB_Host_DeviceEnumerationComplete(void)
 {
 	LEDs_SetAllLEDs(LEDMASK_USB_READY);
 }
 
-void EVENT_USB_HostError(uint8_t ErrorCode)
+void EVENT_USB_Host_HostError(uint8_t ErrorCode)
 {
 	USB_ShutDown();
 
-	puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));
-	printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);
+	printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
+	                         " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
 
 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 	for(;;);
 }
 
-void EVENT_USB_DeviceEnumerationFailed(uint8_t ErrorCode, uint8_t SubErrorCode)
+void EVENT_USB_Host_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(" -- In State %d\r\n"), USB_HostState);
+	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"
+	                         " -- Error Code %d\r\n"
+	                         " -- Sub Error Code %d\r\n"
+	                         " -- In State %d\r\n" ESC_FG_WHITE), ErrorCode, SubErrorCode, USB_HostState);
 	
 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 }
@@ -128,79 +128,59 @@ void Bluetooth_Management_Task(void)
 			if ((ErrorCode = ProcessDeviceDescriptor()) != SuccessfulDeviceRead)
 			{
 				if (ErrorCode == ControlErrorDuringDeviceRead)
-				  puts_P(PSTR("Control Error (Get Device).\r\n"));
+				  puts_P(PSTR(ESC_FG_RED "Control Error (Get Device).\r\n"));
 				else
-				  puts_P(PSTR("Invalid Device.\r\n"));
+				  puts_P(PSTR(ESC_FG_RED "Invalid Device.\r\n"));
 
-				printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
+				printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
 				
 				/* Indicate error via status LEDs */
 				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);
+				printf_P(PSTR(ESC_FG_RED "Control Error (Set Configuration).\r\n"
+				                         " -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
 
 				/* Indicate error via status LEDs */
 				LEDs_SetAllLEDs(LEDS_LED1);
 
 				/* Wait until USB device disconnected */
-				while (USB_IsConnected);
+				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
 			}
 				
-			USB_HostState = HOST_STATE_Configured;
-			break;
-		case HOST_STATE_Configured:
 			puts_P(PSTR("Getting Config Data.\r\n"));
 		
 			/* Get and process the configuration descriptor data */
 			if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)
 			{
 				if (ErrorCode == ControlErrorDuringConfigRead)
-				  puts_P(PSTR("Control Error (Get Configuration).\r\n"));
+				  puts_P(PSTR(ESC_FG_RED "Control Error (Get Configuration).\r\n"));
 				else
-				  puts_P(PSTR("Invalid Device.\r\n"));
+				  puts_P(PSTR(ESC_FG_RED "Invalid Device.\r\n"));
 
-				printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
+				printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
 				
 				/* Indicate error via status LEDs */
 				LEDs_SetAllLEDs(LEDS_LED1);
 
 				/* Wait until USB device disconnected */
-				while (USB_IsConnected);
+				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
 				break;
 			}
 
 			puts_P(PSTR("Bluetooth Dongle Enumerated.\r\n"));
 
-			USB_HostState = HOST_STATE_Ready;
-			break;
-		case HOST_STATE_Ready:
-			/* Do nothing, Bluetooth stack will take care of enumeration */
-			
+			USB_HostState = HOST_STATE_Configured;
 			break;
 	}
 }