Fix errors in the new Micropendous board drivers. Reorder the board definition macro...

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Host / AndroidAccessoryClassHost.c

diff --git a/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c b/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c
index 299f294..2bac70d 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c
+++ b/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c
@@ -44,9 +44,6 @@ bool AOA_Host_ValidateAccessoryDevice(USB_ClassInfo_AOA_Host_t* const AOAInterfa
        if (DeviceDescriptor->Header.Type != DTYPE_Device)\r
          return false;\r
 \r
        if (DeviceDescriptor->Header.Type != DTYPE_Device)\r
          return false;\r
 \r

-       if (DeviceDescriptor->VendorID != ANDROID_VENDOR_ID)\r
-         return false;\r
-\r

        *NeedModeSwitch = ((DeviceDescriptor->ProductID != ANDROID_ACCESSORY_PRODUCT_ID) &&\r
                           (DeviceDescriptor->ProductID != ANDROID_ACCESSORY_ADB_PRODUCT_ID));\r
 \r
        *NeedModeSwitch = ((DeviceDescriptor->ProductID != ANDROID_ACCESSORY_PRODUCT_ID) &&\r
                           (DeviceDescriptor->ProductID != ANDROID_ACCESSORY_ADB_PRODUCT_ID));\r
 \r


@@ -194,7 +191,7 @@ uint8_t AOA_Host_StartAccessoryMode(USB_ClassInfo_AOA_Host_t* const AOAInterface
        if ((ErrorCode = AOA_Host_GetAccessoryProtocol(&AccessoryProtocol)) != HOST_WAITERROR_Successful)\r
          return ErrorCode;\r
 \r
        if ((ErrorCode = AOA_Host_GetAccessoryProtocol(&AccessoryProtocol)) != HOST_WAITERROR_Successful)\r
          return ErrorCode;\r
 \r

-       if (AccessoryProtocol != CPU_TO_LE16(AOA_PROTOCOL_Accessory))\r
+       if (AccessoryProtocol != CPU_TO_LE16(AOA_PROTOCOL_AccessoryV1))\r

          return AOA_ERROR_LOGICAL_CMD_FAILED;\r
 \r
        for (uint8_t PropertyIndex = 0; PropertyIndex < AOA_STRING_TOTAL_STRINGS; PropertyIndex++)\r
          return AOA_ERROR_LOGICAL_CMD_FAILED;\r
 \r
        for (uint8_t PropertyIndex = 0; PropertyIndex < AOA_STRING_TOTAL_STRINGS; PropertyIndex++)\r


@@ -446,3 +443,4 @@ static int AOA_Host_getchar_Blocking(FILE* Stream)
 \r
 #endif\r
 \r
 \r
 #endif\r
 \r

+