Make all AVRISP-MKII programmer parameters readable, since there's no real good reaso...

[pub/USBasp.git] / Demos / Host / LowLevel / AndroidAccessoryHost / Lib / AndroidAccessoryCommands.c

diff --git a/Demos/Host/LowLevel/AndroidAccessoryHost/Lib/AndroidAccessoryCommands.c b/Demos/Host/LowLevel/AndroidAccessoryHost/Lib/AndroidAccessoryCommands.c
index 3931716..7e1e7c8 100644 (file)
--- a/Demos/Host/LowLevel/AndroidAccessoryHost/Lib/AndroidAccessoryCommands.c
+++ b/Demos/Host/LowLevel/AndroidAccessoryHost/Lib/AndroidAccessoryCommands.c
@@ -33,15 +33,15 @@
  *  Android Accessory Mode utility functions, for the configuration of an attached
  *  Android device into Android Accessory Mode ready for general communication.
  */
  *  Android Accessory Mode utility functions, for the configuration of an attached
  *  Android device into Android Accessory Mode ready for general communication.
  */

- 
-#include "AndroidAccessoryCommands.h" 
+
+#include "AndroidAccessoryCommands.h"

 
 uint8_t Android_GetAccessoryProtocol(uint16_t* const Protocol)
 {
        USB_ControlRequest = (USB_Request_Header_t)
        {
                .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_VENDOR | REQREC_DEVICE),
 
 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),
                .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),
        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),
                .wValue        = 0,
                .wIndex        = StringIndex,
                .wLength       = (strlen(String) + 1),


@@ -72,12 +72,13 @@ uint8_t Android_StartAccessoryMode(void)
        USB_ControlRequest = (USB_Request_Header_t)
        {
                .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_VENDOR | REQREC_DEVICE),
        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,
        };
 
        Pipe_SelectPipe(PIPE_CONTROLPIPE);
                .wValue        = 0,
                .wIndex        = 0,
                .wLength       = 0,
        };
 
        Pipe_SelectPipe(PIPE_CONTROLPIPE);

-       return USB_Host_SendControlRequest(NULL);       
+       return USB_Host_SendControlRequest(NULL);

 }
 }

+