Add branch for the conversion of demos to use standard C header files for configurati...

[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 eb4c253..7c564e0 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c
+++ b/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c
@@ -89,45 +89,19 @@ uint8_t AOA_Host_ConfigurePipes(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo
                  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
@@ -260,7 +234,7 @@ uint8_t AOA_Host_SendData(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
 \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
@@ -277,7 +251,7 @@ uint8_t AOA_Host_SendString(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
 \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
@@ -294,7 +268,7 @@ uint8_t AOA_Host_SendByte(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
 \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
@@ -316,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
-       Pipe_SelectPipe(AOAInterfaceInfo->Config.DataINPipeNumber);\r
+       Pipe_SelectPipe(AOAInterfaceInfo->Config.DataINPipe.Address);\r
        Pipe_Unfreeze();\r
 \r
        if (Pipe_IsINReceived())\r
@@ -348,7 +322,7 @@ int16_t AOA_Host_ReceiveByte(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo)
 \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
@@ -372,7 +346,7 @@ uint8_t AOA_Host_Flush(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo)
 \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