Add new tag for the LUFA-120219-BETA release.

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Common / AndroidAccessoryClassCommon.h

diff --git a/LUFA/Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h b/LUFA/Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h
index a7ea916..c1c0e8d 100644 (file)
--- a/LUFA/Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h
+++ b/LUFA/Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h
@@ -1,13 +1,13 @@
 /*\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
-  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
@@ -64,8 +64,10 @@
                #endif\r
 \r
        /* Macros: */\r
-               #define ANDROID_VENDOR_ID                   0x18D1\r
+               /** Product ID value in a Device Descriptor to indicate an Android device in Open Accessory mode. */\r
                #define ANDROID_ACCESSORY_PRODUCT_ID        0x2D00\r
+\r
+               /** Product ID value in a Device Descriptor to indicate an Android device in Open Accessory and Android Debug mode. */\r
                #define ANDROID_ACCESSORY_ADB_PRODUCT_ID    0x2D01\r
 \r
        /* Enums: */\r
@@ -77,7 +79,7 @@
                        AOA_CSCP_AOADataClass    = 0xFF, /**< Descriptor Class value indicating that the device or interface\r
                                                          *   belongs to the AOA data class.\r
                                                          */\r
-                       AOA_CSCP_AOADataSubclass = 0x00, /**< Descriptor Subclass value indicating that the device or interface\r
+                       AOA_CSCP_AOADataSubclass = 0xFF, /**< Descriptor Subclass value indicating that the device or interface\r
                                                          *   belongs to AOA data subclass.\r
                                                          */\r
                        AOA_CSCP_AOADataProtocol = 0x00, /**< Descriptor Protocol value indicating that the device or interface\r
@@ -111,7 +113,7 @@
                /** Enum for the possible Android Open Accessory protocol versions. */\r
                enum AOA_Protocols_t\r
                {\r
-                       AOA_PROTOCOL_Accessory          = 0x0001, /**< Android Open Accessory version 1. */\r
+                       AOA_PROTOCOL_AccessoryV1        = 0x0001, /**< Android Open Accessory version 1. */\r
                };\r
 \r
        /* Disable C linkage for C++ Compilers: */\r
@@ -123,3 +125,4 @@
 \r
 /** @} */\r
 \r
+