X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/0ec2b55a7c9bc616ad8c78e75410dd27bae1b8b6..77a9df36a77d2523dd2bc24fa17f9f04c6c175c5:/Demos/Host/Incomplete/AndroidAccessoryHost/DeviceDescriptor.c?ds=sidebyside

diff --git a/Demos/Host/Incomplete/AndroidAccessoryHost/DeviceDescriptor.c b/Demos/Host/Incomplete/AndroidAccessoryHost/DeviceDescriptor.c
index 4e5a1d4d6..be6bf1023 100644
--- a/Demos/Host/Incomplete/AndroidAccessoryHost/DeviceDescriptor.c
+++ b/Demos/Host/Incomplete/AndroidAccessoryHost/DeviceDescriptor.c
@@ -41,7 +41,7 @@
  *
  *  This routine checks to ensure that the attached device's VID and PID matches Google's for Android devices.
  *
- *  \return An error code from the \ref BluetoothHost_GetDeviceDescriptorDataCodes_t enum.
+ *  \return An error code from the \ref AndroidHost_GetDeviceDescriptorDataCodes_t enum.
  */
 uint8_t ProcessDeviceDescriptor(void)
 {
@@ -55,11 +55,12 @@ uint8_t ProcessDeviceDescriptor(void)
 	if (DeviceDescriptor.Header.Type != DTYPE_Device)
 	  return InvalidDeviceDataReturned;
 
-	/* Validate returned device Class, SubClass and Protocol values against the Bluetooth spec values */
+	/* Validate returned device Vendor ID against the Android ADK spec values */
 	if (DeviceDescriptor.VendorID != ANDROID_VENDOR_ID)
-		return IncorrectAndroidDevice;
+	  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;