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

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

diff --git a/Demos/Host/LowLevel/AndroidAccessoryHost/ConfigDescriptor.c b/Demos/Host/LowLevel/AndroidAccessoryHost/ConfigDescriptor.c
index 29fbfca..6db8532 100644 (file)
--- a/Demos/Host/LowLevel/AndroidAccessoryHost/ConfigDescriptor.c
+++ b/Demos/Host/LowLevel/AndroidAccessoryHost/ConfigDescriptor.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2012.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   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
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -66,7 +66,7 @@ uint8_t ProcessConfigurationDescriptor(void)
                default:
                        return DevControlError;
        }
                default:
                        return DevControlError;
        }

-       
+

        /* There should be only one compatible Android Accessory Mode interface in the device, attempt to find it */
        if (USB_GetNextDescriptorComp(&CurrConfigBytesRem, &CurrConfigLocation,
                                      DCOMP_NextAndroidAccessoryInterface) != DESCRIPTOR_SEARCH_COMP_Found)
        /* There should be only one compatible Android Accessory Mode interface in the device, attempt to find it */
        if (USB_GetNextDescriptorComp(&CurrConfigBytesRem, &CurrConfigLocation,
                                      DCOMP_NextAndroidAccessoryInterface) != DESCRIPTOR_SEARCH_COMP_Found)


@@ -95,12 +95,10 @@ uint8_t ProcessConfigurationDescriptor(void)
        }
 
        /* Configure the Android Accessory data IN pipe */
        }
 
        /* Configure the Android Accessory data IN pipe */

-       Pipe_ConfigurePipe(ANDROID_DATA_IN_PIPE, EP_TYPE_BULK, PIPE_TOKEN_IN,
-                          DataINEndpoint->EndpointAddress, DataINEndpoint->EndpointSize, PIPE_BANK_SINGLE);
+       Pipe_ConfigurePipe(ANDROID_DATA_IN_PIPE, EP_TYPE_BULK, DataINEndpoint->EndpointAddress, DataINEndpoint->EndpointSize, 1);

 
        /* Configure the Android Accessory data OUT pipe */
 
        /* Configure the Android Accessory data OUT pipe */

-       Pipe_ConfigurePipe(ANDROID_DATA_OUT_PIPE, EP_TYPE_BULK, PIPE_TOKEN_OUT,
-                                          DataOUTEndpoint->EndpointAddress, DataOUTEndpoint->EndpointSize, PIPE_BANK_SINGLE);
+       Pipe_ConfigurePipe(ANDROID_DATA_OUT_PIPE, EP_TYPE_BULK, DataOUTEndpoint->EndpointAddress, DataOUTEndpoint->EndpointSize, 1);

 
        /* Valid data found, return success */
        return SuccessfulConfigRead;
 
        /* Valid data found, return success */
        return SuccessfulConfigRead;


@@ -123,9 +121,9 @@ uint8_t DCOMP_NextAndroidAccessoryInterface(void* const CurrentDescriptor)
        {
                USB_Descriptor_Interface_t* Interface = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Interface_t);
 
        {
                USB_Descriptor_Interface_t* Interface = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Interface_t);
 

-               if ((Interface->Class    == ANDROID_INTERFACE_CLASS)    &&
-                   (Interface->SubClass == ANDROID_INTERFACE_SUBCLASS) &&
-                   (Interface->Protocol == ANDROID_INTERFACE_PROTOCOL))
+               if ((Interface->Class    == AOA_CSCP_AOADataClass)    &&
+                   (Interface->SubClass == AOA_CSCP_AOADataSubclass) &&
+                   (Interface->Protocol == AOA_CSCP_AOADataProtocol))

                {
                        return DESCRIPTOR_SEARCH_Found;
                }
                {
                        return DESCRIPTOR_SEARCH_Found;
                }