Add extra LUFA TAR archive export exclusions.

[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..eb4c253 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c
+++ b/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c
@@ -1,13 +1,13 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2011.\r
+     Copyright (C) Dean Camera, 2012.\r

 \r
   dean [at] fourwalledcubicle [dot] com\r
            www.lufa-lib.org\r
 */\r
 \r
 /*\r
 \r
   dean [at] fourwalledcubicle [dot] com\r
            www.lufa-lib.org\r
 */\r
 \r
 /*\r

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r

 \r
   Permission to use, copy, modify, distribute, and sell this\r
   software and its documentation for any purpose is hereby granted\r
 \r
   Permission to use, copy, modify, distribute, and sell this\r
   software and its documentation for any purpose is hereby granted\r


@@ -41,10 +41,9 @@ bool AOA_Host_ValidateAccessoryDevice(USB_ClassInfo_AOA_Host_t* const AOAInterfa
                                       const USB_Descriptor_Device_t* const DeviceDescriptor,\r
                                       bool* const NeedModeSwitch)\r
 {\r
                                       const USB_Descriptor_Device_t* const DeviceDescriptor,\r
                                       bool* const NeedModeSwitch)\r
 {\r

-       if (DeviceDescriptor->Header.Type != DTYPE_Device)\r
-         return false;\r
+       (void)AOAInterfaceInfo;\r

 \r
 \r

-       if (DeviceDescriptor->VendorID != ANDROID_VENDOR_ID)\r
+       if (DeviceDescriptor->Header.Type != DTYPE_Device)\r

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


@@ -194,7 +193,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


@@ -234,7 +233,7 @@ static uint8_t AOA_Host_GetAccessoryProtocol(uint16_t* const Protocol)
 static uint8_t AOA_Host_SendPropertyString(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,\r
                                            const uint8_t StringIndex)\r
 {      \r
 static uint8_t AOA_Host_SendPropertyString(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,\r
                                            const uint8_t StringIndex)\r
 {      \r

-       const char* String = ((char**)&AOAInterfaceInfo->Config.PropertyStrings)[StringIndex];\r
+       const char* String = AOAInterfaceInfo->Config.PropertyStrings[StringIndex];\r

        \r
        if (String == NULL)\r
          String = "";\r
        \r
        if (String == NULL)\r
          String = "";\r


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

+