eqmk
/
qmk_firmware
forked from mfulz_github/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update Android Accessory Class driver to be compatible with protocol version 2 devices.

This commit is contained in:
Dean Camera 2013-05-10 21:45:37 +02:00
parent 39603f05b2
commit 0223c3668c
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
LUFA/DoxygenPages/ChangeLog.txt
View File

@ -8,16 +8,18 @@
* *
* \section Sec_ChangeLogXXXXXX Version XXXXXX * \section Sec_ChangeLogXXXXXX Version XXXXXX
* <b>New:</b> * <b>New:</b>
* - Library Applications: * - Core:
* - Added new Printer class bootloader
* - Added new Mass Storage class bootloader
* - Added additional MIDI command definitions to the MIDI class driver (thanks to Daniel Dreibrodt) * - Added additional MIDI command definitions to the MIDI class driver (thanks to Daniel Dreibrodt)
* - Added new CONCAT() and CONCAT_EXPANDED() convenience macros * - Added new CONCAT() and CONCAT_EXPANDED() convenience macros
* - Added new Printer Device Class driver * - Added new Printer Device Class driver
* - Library Applications:
* - Added new Printer class bootloader
* - Added new Mass Storage class bootloader
* *
* <b>Changed:</b> * <b>Changed:</b>
* - Core: * - Core:
* - Updated the BUILD build system module to produce binary BIN files in addition to Intel HEX files * - Updated the BUILD build system module to produce binary BIN files in addition to Intel HEX files
* - Updated the Android Accessory Class to accept version 2 protocol devices (with version 1 functionality)
* *
* <b>Fixed:</b> * <b>Fixed:</b>
* - Core: * - Core:

5
LUFA/Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h
View File

@ -104,16 +104,17 @@
AOA_STRING_Version = 3, /**< Index of the Version Number property string. */ AOA_STRING_Version = 3, /**< Index of the Version Number property string. */
AOA_STRING_URI = 4, /**< Index of the URI Information property string. */ AOA_STRING_URI = 4, /**< Index of the URI Information property string. */
AOA_STRING_Serial = 5, /**< Index of the Serial Number property string. */ AOA_STRING_Serial = 5, /**< Index of the Serial Number property string. */
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)
AOA_STRING_TOTAL_STRINGS AOA_STRING_TOTAL_STRINGS
#endif #endif
}; };
/** Enum for the possible Android Open Accessory protocol versions. */ /** Enum for the possible Android Open Accessory protocol versions. */
enum AOA_Protocols_t enum AOA_Protocols_t
{ {
AOA_PROTOCOL_AccessoryV1 = 0x0001, /**< Android Open Accessory version 1. */ AOA_PROTOCOL_AccessoryV1 = 0x0001, /**< Android Open Accessory version 1. */
AOA_PROTOCOL_AccessoryV2 = 0x0002, /**< Android Open Accessory version 2. */
}; };
/* Disable C linkage for C++ Compilers: */ /* Disable C linkage for C++ Compilers: */

2
LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c
View File

@ -167,7 +167,7 @@ uint8_t AOA_Host_StartAccessoryMode(USB_ClassInfo_AOA_Host_t* const AOAInterface
if ((ErrorCode = AOA_Host_GetAccessoryProtocol(&AccessoryProtocol)) != HOST_WAITERROR_Successful) if ((ErrorCode = AOA_Host_GetAccessoryProtocol(&AccessoryProtocol)) != HOST_WAITERROR_Successful)
return ErrorCode; return ErrorCode;
if (AccessoryProtocol != CPU_TO_LE16(AOA_PROTOCOL_AccessoryV1)) if ((AccessoryProtocol != CPU_TO_LE16(AOA_PROTOCOL_AccessoryV1)) && (AccessoryProtocol != CPU_TO_LE16(AOA_PROTOCOL_AccessoryV2)))
return AOA_ERROR_LOGICAL_CMD_FAILED; return AOA_ERROR_LOGICAL_CMD_FAILED;
for (uint8_t PropertyIndex = 0; PropertyIndex < AOA_STRING_TOTAL_STRINGS; PropertyIndex++) for (uint8_t PropertyIndex = 0; PropertyIndex < AOA_STRING_TOTAL_STRINGS; PropertyIndex++)