diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2011-11-24 01:31:31 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2011-11-24 01:31:31 +0000 |
| commit | 4a750900ea828109bfdf195b09f8884a50f8fd60 (patch) | |
| tree | 921ffed6c58a2d54741c54874276798f1577fb9b /Demos/Host/LowLevel/AndroidAccessoryHost/Lib | |
| parent | 00d13f8060021fc75a9d806480d75b366f289998 (diff) | |
Convert the LowLevel AndroidAccessory demo to use the new class driver constants to reduce code duplication.
Add missing Doxygen documentation.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1989 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Demos/Host/LowLevel/AndroidAccessoryHost/Lib')
| -rw-r--r-- | Demos/Host/LowLevel/AndroidAccessoryHost/Lib/AndroidAccessoryCommands.c | 6 | ||||
| -rw-r--r-- | Demos/Host/LowLevel/AndroidAccessoryHost/Lib/AndroidAccessoryCommands.h | 23 |
2 files changed, 3 insertions, 26 deletions
diff --git a/Demos/Host/LowLevel/AndroidAccessoryHost/Lib/AndroidAccessoryCommands.c b/Demos/Host/LowLevel/AndroidAccessoryHost/Lib/AndroidAccessoryCommands.c index 3931716a..42c3a62f 100644 --- a/Demos/Host/LowLevel/AndroidAccessoryHost/Lib/AndroidAccessoryCommands.c +++ b/Demos/Host/LowLevel/AndroidAccessoryHost/Lib/AndroidAccessoryCommands.c @@ -41,7 +41,7 @@ uint8_t Android_GetAccessoryProtocol(uint16_t* const Protocol) USB_ControlRequest = (USB_Request_Header_t) { .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_VENDOR | REQREC_DEVICE), - .bRequest = ANDROID_Req_GetAccessoryProtocol, + .bRequest = AOA_REQ_GetAccessoryProtocol, .wValue = 0, .wIndex = 0, .wLength = sizeof(uint16_t), @@ -57,7 +57,7 @@ uint8_t Android_SendString(const uint8_t StringIndex, USB_ControlRequest = (USB_Request_Header_t) { .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_VENDOR | REQREC_DEVICE), - .bRequest = ANDROID_Req_SendString, + .bRequest = AOA_REQ_SendString, .wValue = 0, .wIndex = StringIndex, .wLength = (strlen(String) + 1), @@ -72,7 +72,7 @@ uint8_t Android_StartAccessoryMode(void) USB_ControlRequest = (USB_Request_Header_t) { .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_VENDOR | REQREC_DEVICE), - .bRequest = ANDROID_Req_StartAccessoryMode, + .bRequest = AOA_REQ_StartAccessoryMode, .wValue = 0, .wIndex = 0, .wLength = 0, diff --git a/Demos/Host/LowLevel/AndroidAccessoryHost/Lib/AndroidAccessoryCommands.h b/Demos/Host/LowLevel/AndroidAccessoryHost/Lib/AndroidAccessoryCommands.h index 59437052..0fab7635 100644 --- a/Demos/Host/LowLevel/AndroidAccessoryHost/Lib/AndroidAccessoryCommands.h +++ b/Demos/Host/LowLevel/AndroidAccessoryHost/Lib/AndroidAccessoryCommands.h @@ -41,29 +41,6 @@ #include <stdbool.h> #include <LUFA/Drivers/USB/USB.h> - - /* Enums: */ - enum Android_Requests_t - { - ANDROID_Req_GetAccessoryProtocol = 51, - ANDROID_Req_SendString = 52, - ANDROID_Req_StartAccessoryMode = 53, - }; - - enum Android_Strings_t - { - ANDROID_STRING_Manufacturer = 0, - ANDROID_STRING_Model = 1, - ANDROID_STRING_Description = 2, - ANDROID_STRING_Version = 3, - ANDROID_STRING_URI = 4, - ANDROID_STRING_Serial = 5, - }; - - enum Android_Protocols_t - { - ANDROID_PROTOCOL_Accessory = 0x0001, - }; /* Function Prototypes: */ uint8_t Android_GetAccessoryProtocol(uint16_t* const Protocol); |