Minor documentation adjustments to the demos, projects and bootloaders to ensure...

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

diff --git a/Demos/Host/LowLevel/AndroidAccessoryHost/AndroidAccessoryHost.c b/Demos/Host/LowLevel/AndroidAccessoryHost/AndroidAccessoryHost.c
index 723cf50..c519675 100644 (file)
--- a/Demos/Host/LowLevel/AndroidAccessoryHost/AndroidAccessoryHost.c
+++ b/Demos/Host/LowLevel/AndroidAccessoryHost/AndroidAccessoryHost.c
@@ -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
@@ -78,7 +78,7 @@ void SetupHardware(void)
 void AndroidHost_Task(void)
 {
        if (USB_HostState != HOST_STATE_Configured)
-         return;       
+         return;
 
        /* Select the data IN pipe */
        Pipe_SelectPipe(ANDROID_DATA_IN_PIPE);
@@ -93,7 +93,7 @@ void AndroidHost_Task(void)
                /* Check if data is in the pipe */
                if (Pipe_IsReadWriteAllowed())
                {
-                       uint8_t NextReceivedByte = Pipe_BytesInPipe();
+                       uint8_t NextReceivedByte = Pipe_Read_8();
                        uint8_t LEDMask          = LEDS_NO_LEDS;
 
                        if (NextReceivedByte & 0x01)
@@ -148,7 +148,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
 
        /* Get and process the configuration descriptor data */
        uint8_t ErrorCode = ProcessDeviceDescriptor();
-       
+
        bool RequiresModeSwitch = (ErrorCode == NonAccessoryModeAndroidDevice);
 
        /* Error out if the device is not an Android device or an error occurred */
@@ -166,12 +166,12 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
        }
 
        printf_P(PSTR("Android Device Detected - %sAccessory mode.\r\n"), (RequiresModeSwitch ? "Non-" : ""));
-       
+
        /* Check if a valid Android device was attached, but it is not current in Accessory mode */
        if (RequiresModeSwitch)
        {
                uint16_t AndroidProtocol;
-       
+
                /* Fetch the version of the Android Accessory Protocol supported by the device */
                if ((ErrorCode = Android_GetAccessoryProtocol(&AndroidProtocol)) != HOST_SENDCONTROL_Successful)
                {
@@ -181,25 +181,25 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
                        return;
                }
-               
+
                /* Validate the returned protocol version */
-               if (AndroidProtocol != ANDROID_PROTOCOL_Accessory)
+               if (AndroidProtocol != AOA_PROTOCOL_AccessoryV1)
                {
                        puts_P(PSTR(ESC_FG_RED "Accessory Mode Not Supported."));
 
                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
                        return;
                }
-       
+
                /* Send the device strings and start the Android Accessory Mode */
-               Android_SendString(ANDROID_STRING_Manufacturer, "Dean Camera");
-               Android_SendString(ANDROID_STRING_Model,        "LUFA Android Demo");
-               Android_SendString(ANDROID_STRING_Description,  "LUFA Android Demo");
-               Android_SendString(ANDROID_STRING_Version,      "1.0");
-               Android_SendString(ANDROID_STRING_URI,          "http://www.lufa-lib.org");
-               Android_SendString(ANDROID_STRING_Serial,       "0000000012345678");
-
-               Android_StartAccessoryMode();   
+               Android_SendString(AOA_STRING_Manufacturer, "Dean Camera");
+               Android_SendString(AOA_STRING_Model,        "LUFA Android Demo");
+               Android_SendString(AOA_STRING_Description,  "LUFA Android Demo");
+               Android_SendString(AOA_STRING_Version,      "1.0");
+               Android_SendString(AOA_STRING_URI,          "http://www.lufa-lib.org");
+               Android_SendString(AOA_STRING_Serial,       "0000000012345678");
+
+               Android_StartAccessoryMode();
                return;
        }