Remove non-functional maintenance link check.

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Host / AndroidAccessoryClassHost.c

diff --git a/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c b/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c
index 56a913d..7c564e0 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c
+++ b/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c
@@ -1,13 +1,13 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

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

 \r
   dean [at] fourwalledcubicle [dot] com\r
            www.lufa-lib.org\r
 */\r
 \r
 /*\r
 \r
   dean [at] fourwalledcubicle [dot] com\r
            www.lufa-lib.org\r
 */\r
 \r
 /*\r

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r

 \r
   Permission to use, copy, modify, distribute, and sell this\r
   software and its documentation for any purpose is hereby granted\r
 \r
   Permission to use, copy, modify, distribute, and sell this\r
   software and its documentation for any purpose is hereby granted\r


@@ -41,10 +41,9 @@ bool AOA_Host_ValidateAccessoryDevice(USB_ClassInfo_AOA_Host_t* const AOAInterfa
                                       const USB_Descriptor_Device_t* const DeviceDescriptor,\r
                                       bool* const NeedModeSwitch)\r
 {\r
                                       const USB_Descriptor_Device_t* const DeviceDescriptor,\r
                                       bool* const NeedModeSwitch)\r
 {\r

-       if (DeviceDescriptor->Header.Type != DTYPE_Device)\r
-         return false;\r
+       (void)AOAInterfaceInfo;\r

 \r
 \r

-       if (DeviceDescriptor->VendorID != ANDROID_VENDOR_ID)\r
+       if (DeviceDescriptor->Header.Type != DTYPE_Device)\r

          return false;\r
 \r
        *NeedModeSwitch = ((DeviceDescriptor->ProductID != ANDROID_ACCESSORY_PRODUCT_ID) &&\r
          return false;\r
 \r
        *NeedModeSwitch = ((DeviceDescriptor->ProductID != ANDROID_ACCESSORY_PRODUCT_ID) &&\r


@@ -90,45 +89,19 @@ uint8_t AOA_Host_ConfigurePipes(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo
                  DataOUTEndpoint = EndpointData;\r
        }\r
 \r
                  DataOUTEndpoint = EndpointData;\r
        }\r
 \r

-       for (uint8_t PipeNum = 1; PipeNum < PIPE_TOTAL_PIPES; PipeNum++)\r
-       {\r
-               uint16_t Size;\r
-               uint8_t  Type;\r
-               uint8_t  Token;\r
-               uint8_t  EndpointAddress;\r
-               bool     DoubleBanked;\r
-\r
-               if (PipeNum == AOAInterfaceInfo->Config.DataINPipeNumber)\r
-               {\r
-                       Size            = le16_to_cpu(DataINEndpoint->EndpointSize);\r
-                       EndpointAddress = DataINEndpoint->EndpointAddress;\r
-                       Token           = PIPE_TOKEN_IN;\r
-                       Type            = EP_TYPE_BULK;\r
-                       DoubleBanked    = AOAInterfaceInfo->Config.DataINPipeDoubleBank;\r
-\r
-                       AOAInterfaceInfo->State.DataINPipeSize = DataINEndpoint->EndpointSize;\r
-               }\r
-               else if (PipeNum == AOAInterfaceInfo->Config.DataOUTPipeNumber)\r
-               {\r
-                       Size            = le16_to_cpu(DataOUTEndpoint->EndpointSize);\r
-                       EndpointAddress = DataOUTEndpoint->EndpointAddress;\r
-                       Token           = PIPE_TOKEN_OUT;\r
-                       Type            = EP_TYPE_BULK;\r
-                       DoubleBanked    = AOAInterfaceInfo->Config.DataOUTPipeDoubleBank;\r
-\r
-                       AOAInterfaceInfo->State.DataOUTPipeSize = DataOUTEndpoint->EndpointSize;\r
-               }\r
-               else\r
-               {\r
-                       continue;\r
-               }\r
-               \r
-               if (!(Pipe_ConfigurePipe(PipeNum, Type, Token, EndpointAddress, Size,\r
-                                        DoubleBanked ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE)))\r
-               {\r
-                       return AOA_ENUMERROR_PipeConfigurationFailed;\r
-               }\r
-       }\r
+       AOAInterfaceInfo->Config.DataINPipe.Size  = le16_to_cpu(DataINEndpoint->EndpointSize);\r
+       AOAInterfaceInfo->Config.DataINPipe.EndpointAddress = DataINEndpoint->EndpointAddress;\r
+       AOAInterfaceInfo->Config.DataINPipe.Type  = EP_TYPE_BULK;\r
+       \r
+       AOAInterfaceInfo->Config.DataOUTPipe.Size = le16_to_cpu(DataOUTEndpoint->EndpointSize);\r
+       AOAInterfaceInfo->Config.DataOUTPipe.EndpointAddress = DataOUTEndpoint->EndpointAddress;\r
+       AOAInterfaceInfo->Config.DataOUTPipe.Type = EP_TYPE_BULK;\r
+       \r
+       if (!(Pipe_ConfigurePipeTable(&AOAInterfaceInfo->Config.DataINPipe, 1)))\r
+         return false;\r
+       \r
+       if (!(Pipe_ConfigurePipeTable(&AOAInterfaceInfo->Config.DataOUTPipe, 1)))\r
+         return false;\r

 \r
        AOAInterfaceInfo->State.IsActive        = true;\r
        AOAInterfaceInfo->State.InterfaceNumber = AOAInterface->InterfaceNumber;\r
 \r
        AOAInterfaceInfo->State.IsActive        = true;\r
        AOAInterfaceInfo->State.InterfaceNumber = AOAInterface->InterfaceNumber;\r


@@ -234,7 +207,7 @@ static uint8_t AOA_Host_GetAccessoryProtocol(uint16_t* const Protocol)
 static uint8_t AOA_Host_SendPropertyString(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,\r
                                            const uint8_t StringIndex)\r
 {      \r
 static uint8_t AOA_Host_SendPropertyString(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,\r
                                            const uint8_t StringIndex)\r
 {      \r

-       const char* String = ((char**)&AOAInterfaceInfo->Config.PropertyStrings)[StringIndex];\r
+       const char* String = AOAInterfaceInfo->Config.PropertyStrings[StringIndex];\r

        \r
        if (String == NULL)\r
          String = "";\r
        \r
        if (String == NULL)\r
          String = "";\r


@@ -261,7 +234,7 @@ uint8_t AOA_Host_SendData(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
 \r
        uint8_t ErrorCode;\r
 \r
 \r
        uint8_t ErrorCode;\r
 \r

-       Pipe_SelectPipe(AOAInterfaceInfo->Config.DataOUTPipeNumber);\r
+       Pipe_SelectPipe(AOAInterfaceInfo->Config.DataOUTPipe.Address);\r

 \r
        Pipe_Unfreeze();\r
        ErrorCode = Pipe_Write_Stream_LE(Buffer, Length, NULL);\r
 \r
        Pipe_Unfreeze();\r
        ErrorCode = Pipe_Write_Stream_LE(Buffer, Length, NULL);\r


@@ -278,7 +251,7 @@ uint8_t AOA_Host_SendString(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
 \r
        uint8_t ErrorCode;\r
 \r
 \r
        uint8_t ErrorCode;\r
 \r

-       Pipe_SelectPipe(AOAInterfaceInfo->Config.DataOUTPipeNumber);\r
+       Pipe_SelectPipe(AOAInterfaceInfo->Config.DataOUTPipe.Address);\r

 \r
        Pipe_Unfreeze();\r
        ErrorCode = Pipe_Write_Stream_LE(String, strlen(String), NULL);\r
 \r
        Pipe_Unfreeze();\r
        ErrorCode = Pipe_Write_Stream_LE(String, strlen(String), NULL);\r


@@ -295,7 +268,7 @@ uint8_t AOA_Host_SendByte(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
 \r
        uint8_t ErrorCode;\r
 \r
 \r
        uint8_t ErrorCode;\r
 \r

-       Pipe_SelectPipe(AOAInterfaceInfo->Config.DataOUTPipeNumber);\r
+       Pipe_SelectPipe(AOAInterfaceInfo->Config.DataOUTPipe.Address);\r

        Pipe_Unfreeze();\r
 \r
        if (!(Pipe_IsReadWriteAllowed()))\r
        Pipe_Unfreeze();\r
 \r
        if (!(Pipe_IsReadWriteAllowed()))\r


@@ -317,7 +290,7 @@ uint16_t AOA_Host_BytesReceived(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo
        if ((USB_HostState != HOST_STATE_Configured) || !(AOAInterfaceInfo->State.IsActive))\r
          return 0;\r
 \r
        if ((USB_HostState != HOST_STATE_Configured) || !(AOAInterfaceInfo->State.IsActive))\r
          return 0;\r
 \r

-       Pipe_SelectPipe(AOAInterfaceInfo->Config.DataINPipeNumber);\r
+       Pipe_SelectPipe(AOAInterfaceInfo->Config.DataINPipe.Address);\r

        Pipe_Unfreeze();\r
 \r
        if (Pipe_IsINReceived())\r
        Pipe_Unfreeze();\r
 \r
        if (Pipe_IsINReceived())\r


@@ -349,7 +322,7 @@ int16_t AOA_Host_ReceiveByte(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo)
 \r
        int16_t ReceivedByte = -1;\r
 \r
 \r
        int16_t ReceivedByte = -1;\r
 \r

-       Pipe_SelectPipe(AOAInterfaceInfo->Config.DataINPipeNumber);\r
+       Pipe_SelectPipe(AOAInterfaceInfo->Config.DataINPipe.Address);\r

        Pipe_Unfreeze();\r
 \r
        if (Pipe_IsINReceived())\r
        Pipe_Unfreeze();\r
 \r
        if (Pipe_IsINReceived())\r


@@ -373,7 +346,7 @@ uint8_t AOA_Host_Flush(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo)
 \r
        uint8_t ErrorCode;\r
 \r
 \r
        uint8_t ErrorCode;\r
 \r

-       Pipe_SelectPipe(AOAInterfaceInfo->Config.DataOUTPipeNumber);\r
+       Pipe_SelectPipe(AOAInterfaceInfo->Config.DataOUTPipe.Address);\r

        Pipe_Unfreeze();\r
 \r
        if (!(Pipe_BytesInPipe()))\r
        Pipe_Unfreeze();\r
 \r
        if (!(Pipe_BytesInPipe()))\r


@@ -446,3 +419,4 @@ static int AOA_Host_getchar_Blocking(FILE* Stream)
 \r
 #endif\r
 \r
 \r
 #endif\r
 \r

+