Pull out Android Accessory Mode functions into a seperate set of files in the incomplete Android Accessory Mode Host demo. Improve Android Accessory Mode protocol support to correctly query the device's supported protocol and send the approriate device information strings.

Demos/Host/Incomplete/AndroidAccessoryHost/AndroidAccessoryHost.c

@@ -139,7 +139,6 @@ void Android_Host_Task(void)
 			/* Get and process the configuration descriptor data */
 			ErrorCode = ProcessDeviceDescriptor();
 			
-			/* Save whether the Android device needs to be mode-switched later on */
 			bool RequiresModeSwitch = (ErrorCode == NonAccessoryModeAndroidDevice);
 
 			/* Error out if the device is not an Android device or an error occurred */
@@ -179,20 +178,43 @@ void Android_Host_Task(void)
 			/* Check if a valid Android device was attached, but it is not current in Accessory mode */
 			if (RequiresModeSwitch)
 			{
-				USB_ControlRequest = (USB_Request_Header_t)
+				uint16_t AndroidProtocol;
+			
+				/* Fetch the version of the Android Accessory Protocol supported by the device */
+				if ((ErrorCode = Android_GetAccessoryProtocol(&AndroidProtocol)) != HOST_SENDCONTROL_Successful)
 				{
-					.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_VENDOR | REQREC_DEVICE),
+					printf_P(PSTR(ESC_FG_RED "Control Error (Get Protocol).\r\n"
-					.bRequest      = ANDROID_Req_StartAccessoryMode,
+					                         " -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
-					.wValue        = 0,
+
-					.wIndex        = 0,
+					/* Indicate error via status LEDs */
-					.wLength       = 0,
+					LEDs_SetAllLEDs(LEDS_LED1);
-				};
+
-
+					/* Wait until USB device disconnected */
-				/* Send the control request for the Android device to switch to accessory mode */
+					USB_HostState = HOST_STATE_WaitForDeviceRemoval;
-				Pipe_SelectPipe(PIPE_CONTROLPIPE);
+					break;
-				USB_Host_SendControlRequest(NULL);
+				}
-				
+				
-				puts_P(PSTR("Switching to Accessory Mode.\r\n"));
+				/* Validate the returned protocol version */
+				if (AndroidProtocol != ANDROID_PROTOCOL_Accessory)
+				{
+					puts_P(PSTR(ESC_FG_RED "Accessory Mode Not Supported."));
+
+					/* Indicate error via status LEDs */
+					LEDs_SetAllLEDs(LEDS_LED1);
+
+					/* Wait until USB device disconnected */
+					USB_HostState = HOST_STATE_WaitForDeviceRemoval;
+					break;
+				}
+			
+				/* Send the device strings and start the Android Accessory Mode */
+				Android_SendString(ANDROID_STRING_Manufacturer, "Dean Camera");
+				Android_SendString(ANDROID_STRING_Model,        "LUFA Android Demo");
+				Android_SendString(ANDROID_STRING_Description,  "LUFA Android Demo");
+				Android_SendString(ANDROID_STRING_Version,      "1.0");
+				Android_SendString(ANDROID_STRING_URI,          "http://www.lufa-lib.org");
+				Android_SendString(ANDROID_STRING_Serial,       "0000000012345678");
+				Android_StartAccessoryMode();
 			
 				/* Wait until USB device disconnected */
 				USB_HostState = HOST_STATE_WaitForDeviceRemoval;

Demos/Host/Incomplete/AndroidAccessoryHost/AndroidAccessoryHost.h

@@ -46,6 +46,7 @@
 
 		#include "DeviceDescriptor.h"
 		#include "ConfigDescriptor.h"
+		#include "Lib/AndroidAccessoryCommands.h" 
 
 		#include <LUFA/Version.h>
 		#include <LUFA/Drivers/Misc/TerminalCodes.h>
@@ -69,17 +70,6 @@
 		/** LED mask for the library LED driver, to indicate that the USB interface is busy. */
 		#define LEDMASK_USB_BUSY          LEDS_LED2
 
-	/* Enums: */
-		enum Android_Requests_t
-		{
-			ANDROID_Req_GetAccessoryProtocol    = 51,
-			ANDROID_Req_GetString               = 52,
-			ANDROID_Req_StartAccessoryMode      = 53,
-		};
-
-	/* Task Definitions: */
-		void Android_Host_Task(void);
-
 	/* Event Handlers: */
 		void EVENT_USB_Host_DeviceAttached(void);
 		void EVENT_USB_Host_DeviceUnattached(void);
@@ -89,6 +79,7 @@
 		                                            const uint8_t SubErrorCode);
 
 	/* Function Prototypes: */
+		void Android_Host_Task(void);
 		void SetupHardware(void);
 
 #endif

Demos/Host/Incomplete/AndroidAccessoryHost/Lib/AndroidAccessoryCommands.c

@@ -0,0 +1,83 @@
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2011.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2011  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
+  without fee, provided that the above copyright notice appear in
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *
+ *  Android Accessory Mode utility functions, for the configuration of an attached
+ *  Android device into Android Accessory Mode ready for general communication.
+ */
+ 
+#include "AndroidAccessoryCommands.h" 
+
+uint8_t Android_GetAccessoryProtocol(uint16_t* const Protocol)
+{
+	USB_ControlRequest = (USB_Request_Header_t)
+	{
+		.bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_VENDOR | REQREC_DEVICE),
+		.bRequest      = ANDROID_Req_GetAccessoryProtocol,
+		.wValue        = 0,
+		.wIndex        = 0,
+		.wLength       = sizeof(uint16_t),
+	};
+
+	Pipe_SelectPipe(PIPE_CONTROLPIPE);
+	return USB_Host_SendControlRequest(Protocol);
+}
+
+uint8_t Android_SendString(const uint8_t StringIndex,
+                           char* String)
+{
+	USB_ControlRequest = (USB_Request_Header_t)
+	{
+		.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_VENDOR | REQREC_DEVICE),
+		.bRequest      = ANDROID_Req_SendString,
+		.wValue        = 0,
+		.wIndex        = StringIndex,
+		.wLength       = (strlen(String) + 1),
+	};
+
+	Pipe_SelectPipe(PIPE_CONTROLPIPE);
+	return USB_Host_SendControlRequest(String);
+}
+
+uint8_t Android_StartAccessoryMode(void)
+{
+	USB_ControlRequest = (USB_Request_Header_t)
+	{
+		.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_VENDOR | REQREC_DEVICE),
+		.bRequest      = ANDROID_Req_StartAccessoryMode,
+		.wValue        = 0,
+		.wIndex        = 0,
+		.wLength       = 0,
+	};
+
+	Pipe_SelectPipe(PIPE_CONTROLPIPE);
+	return USB_Host_SendControlRequest(NULL);	
+}

Demos/Host/Incomplete/AndroidAccessoryHost/Lib/AndroidAccessoryCommands.h

@@ -0,0 +1,74 @@
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2011.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2011  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
+  without fee, provided that the above copyright notice appear in
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *
+ *  Header file for AndroidAccessoryCommands.c.
+ */
+
+#ifndef _ANDROID_ACCESSORY_COMMANDS_H_
+#define _ANDROID_ACCESSORY_COMMANDS_H_
+
+	/* Includes: */
+		#include <stdint.h>
+		#include <stdbool.h>
+
+		#include <LUFA/Drivers/USB/USB.h>
+
+	/* Enums: */
+		enum Android_Requests_t
+		{
+			ANDROID_Req_GetAccessoryProtocol    = 51,
+			ANDROID_Req_SendString              = 52,
+			ANDROID_Req_StartAccessoryMode      = 53,
+		};
+
+		enum Android_Strings_t
+		{
+			ANDROID_STRING_Manufacturer         = 0,
+			ANDROID_STRING_Model                = 1,
+			ANDROID_STRING_Description          = 2,
+			ANDROID_STRING_Version              = 3,
+			ANDROID_STRING_URI                  = 4,
+			ANDROID_STRING_Serial               = 5,
+		};
+		
+		enum Android_Protocols_t
+		{
+			ANDROID_PROTOCOL_Accessory          = 0x0001,
+		};
+	
+	/* Function Prototypes: */
+		uint8_t Android_GetAccessoryProtocol(uint16_t* const Protocol);
+		uint8_t Android_SendString(const uint8_t StringIndex,
+		                           char* String);
+		uint8_t Android_StartAccessoryMode(void);	
+	
+#endif

Demos/Host/Incomplete/AndroidAccessoryHost/makefile

@@ -132,6 +132,7 @@ include $(LUFA_PATH)/LUFA/makefile
 SRC = $(TARGET).c                                                 \
 	  DeviceDescriptor.c                                          \
 	  ConfigDescriptor.c                                          \
+	  Lib/AndroidAccessoryCommands.c                              \
 	  $(LUFA_SRC_USB)                                             \
 	  $(LUFA_SRC_SERIAL)
 

Demos/Host/Incomplete/BluetoothHost/BluetoothHost.h

@@ -71,9 +71,6 @@
 		/** LED mask for the library LED driver, to indicate that the USB interface is busy. */
 		#define LEDMASK_USB_BUSY          LEDS_LED2
 
-	/* Task Definitions: */
-		void Bluetooth_Host_Task(void);
-
 	/* Event Handlers: */
 		void EVENT_USB_Host_DeviceAttached(void);
 		void EVENT_USB_Host_DeviceUnattached(void);
@@ -83,6 +80,7 @@
 		                                            const uint8_t SubErrorCode);
 
 	/* Function Prototypes: */
+		void Bluetooth_Host_Task(void);
 		void SetupHardware(void);
 
 #endif