diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-11-24 01:31:31 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-11-24 01:31:31 +0000 |
| commit | 7f8dbb4908abd33b5ee8bfba7cc3870fa14f7366 (patch) | |
| tree | 921ffed6c58a2d54741c54874276798f1577fb9b /LUFA/Drivers/USB/Class | |
| parent | 8b5aa616013811faf53fb5c1f2fdb819dd671b36 (diff) | |
| download | lufa-7f8dbb4908abd33b5ee8bfba7cc3870fa14f7366.tar.gz lufa-7f8dbb4908abd33b5ee8bfba7cc3870fa14f7366.tar.bz2 lufa-7f8dbb4908abd33b5ee8bfba7cc3870fa14f7366.zip | |
Convert the LowLevel AndroidAccessory demo to use the new class driver constants to reduce code duplication.
Add missing Doxygen documentation.
Diffstat (limited to 'LUFA/Drivers/USB/Class')
| -rw-r--r-- | LUFA/Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h | 7 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/LUFA/Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h b/LUFA/Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h index a7ea91638..2c1a598fd 100644 --- a/LUFA/Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h +++ b/LUFA/Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h @@ -64,8 +64,13 @@ #endif
/* Macros: */
+ /** Vendor ID value in a Device Descriptor to indicate an Android device. */
#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: */
@@ -111,7 +116,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: */
diff --git a/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c b/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c index 299f294c9..56a913d13 100644 --- a/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c +++ b/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c @@ -194,7 +194,7 @@ uint8_t AOA_Host_StartAccessoryMode(USB_ClassInfo_AOA_Host_t* const AOAInterface if ((ErrorCode = AOA_Host_GetAccessoryProtocol(&AccessoryProtocol)) != HOST_WAITERROR_Successful)
return ErrorCode;
- if (AccessoryProtocol != CPU_TO_LE16(AOA_PROTOCOL_Accessory))
+ if (AccessoryProtocol != CPU_TO_LE16(AOA_PROTOCOL_AccessoryV1))
return AOA_ERROR_LOGICAL_CMD_FAILED;
for (uint8_t PropertyIndex = 0; PropertyIndex < AOA_STRING_TOTAL_STRINGS; PropertyIndex++)
|