X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/8b5aa616013811faf53fb5c1f2fdb819dd671b36..a9abe1fdea5ccf67aaccab6fdde300d6fcf2d15a:/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 a7ea91638..c1c0e8df0 100644
--- a/LUFA/Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h
+++ b/LUFA/Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2012.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
@@ -64,8 +64,10 @@
 		#endif
 
 	/* Macros: */
-		#define ANDROID_VENDOR_ID                   0x18D1
+		/** Product ID value in a Device Descriptor to indicate an Android device in Open Accessory mode. */
 		#define ANDROID_ACCESSORY_PRODUCT_ID        0x2D00
+
+		/** Product ID value in a Device Descriptor to indicate an Android device in Open Accessory and Android Debug mode. */
 		#define ANDROID_ACCESSORY_ADB_PRODUCT_ID    0x2D01
 
 	/* Enums: */
@@ -77,7 +79,7 @@
 			AOA_CSCP_AOADataClass    = 0xFF, /**< Descriptor Class value indicating that the device or interface
 			                                  *   belongs to the AOA data class.
 			                                  */
-			AOA_CSCP_AOADataSubclass = 0x00, /**< Descriptor Subclass value indicating that the device or interface
+			AOA_CSCP_AOADataSubclass = 0xFF, /**< Descriptor Subclass value indicating that the device or interface
 			                                  *   belongs to AOA data subclass.
 			                                  */
 			AOA_CSCP_AOADataProtocol = 0x00, /**< Descriptor Protocol value indicating that the device or interface
@@ -111,7 +113,7 @@
 		/** Enum for the possible Android Open Accessory protocol versions. */
 		enum AOA_Protocols_t
 		{
-			AOA_PROTOCOL_Accessory          = 0x0001, /**< Android Open Accessory version 1. */
+			AOA_PROTOCOL_AccessoryV1        = 0x0001, /**< Android Open Accessory version 1. */
 		};
 
 	/* Disable C linkage for C++ Compilers: */
@@ -123,3 +125,4 @@
 
 /** @} */
 
+