From dee4bc097309b289d0ba5995edc6a140529e153a Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Mon, 27 Jun 2011 05:57:25 +0000 Subject: Fix logic bug in the incomplete Android Accessory Host demo preventing correct detection of an attached Android Accessory Mode device. --- Demos/Host/Incomplete/AndroidAccessoryHost/AndroidAccessoryHost.c | 2 ++ Demos/Host/Incomplete/AndroidAccessoryHost/DeviceDescriptor.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'Demos') diff --git a/Demos/Host/Incomplete/AndroidAccessoryHost/AndroidAccessoryHost.c b/Demos/Host/Incomplete/AndroidAccessoryHost/AndroidAccessoryHost.c index 69202f7cd..9b5ffbea6 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 4e5a1d4d6..360dfad30 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; -- cgit v1.2.3