Fix logic bug in the incomplete Android Accessory Host demo preventing correct detection of an attached Android Accessory Mode device.

git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1824 d5102386-fcda-11dd-9fdb-3debd5008f28

2 files changed, 4 insertions, 1 deletions

diff --git a/Demos/Host/Incomplete/AndroidAccessoryHost/AndroidAccessoryHost.c b/Demos/Host/Incomplete/AndroidAccessoryHost/AndroidAccessoryHost.c
index 69202f7c..9b5ffbea 100644
--- a/Demos/Host/Incomplete/AndroidAccessoryHost/AndroidAccessoryHost.c
+++ b/Demos/Host/Incomplete/AndroidAccessoryHost/AndroidAccessoryHost.c
@@ -191,6 +191,8 @@ void Android_Host_Task(void)
 				/* Send the control request for the Android device to switch to accessory mode */
 				Pipe_SelectPipe(PIPE_CONTROLPIPE);
 				USB_Host_SendControlRequest(NULL);
+				
+				puts_P(PSTR("Switching to Accessory Mode.\r\n"));
 			
 				/* Wait until USB device disconnected */
 				USB_HostState = HOST_STATE_WaitForDeviceRemoval;
diff --git a/Demos/Host/Incomplete/AndroidAccessoryHost/DeviceDescriptor.c b/Demos/Host/Incomplete/AndroidAccessoryHost/DeviceDescriptor.c
index 4e5a1d4d..360dfad3 100644
--- a/Demos/Host/Incomplete/AndroidAccessoryHost/DeviceDescriptor.c
+++ b/Demos/Host/Incomplete/AndroidAccessoryHost/DeviceDescriptor.c
@@ -59,7 +59,8 @@ uint8_t ProcessDeviceDescriptor(void)
 	if (DeviceDescriptor.VendorID != ANDROID_VENDOR_ID)
 		return IncorrectAndroidDevice;
 
-	if ((DeviceDescriptor.ProductID != ANDROID_ACCESSORY_PRODUCT_ID) ||
+	/* Check the product ID to determine if the Android device is in accessory mode */
+	if ((DeviceDescriptor.ProductID != ANDROID_ACCESSORY_PRODUCT_ID) &&
 	    (DeviceDescriptor.ProductID != ANDROID_ACCESSORY_ADB_PRODUCT_ID))
 	{
 		return NonAccessoryModeAndroidDevice;