Reintegrate the FullEPAddresses development branch into trunk.

1 files changed, 19 insertions, 45 deletions

diff --git a/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c b/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c
index eb4c2530d..7c564e012 100644
--- 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;

 	}

 

-	for (uint8_t PipeNum = 1; PipeNum < PIPE_TOTAL_PIPES; PipeNum++)

-	{

-		uint16_t Size;

-		uint8_t  Type;

-		uint8_t  Token;

-		uint8_t  EndpointAddress;

-		bool     DoubleBanked;

-

-		if (PipeNum == AOAInterfaceInfo->Config.DataINPipeNumber)

-		{

-			Size            = le16_to_cpu(DataINEndpoint->EndpointSize);

-			EndpointAddress = DataINEndpoint->EndpointAddress;

-			Token           = PIPE_TOKEN_IN;

-			Type            = EP_TYPE_BULK;

-			DoubleBanked    = AOAInterfaceInfo->Config.DataINPipeDoubleBank;

-

-			AOAInterfaceInfo->State.DataINPipeSize = DataINEndpoint->EndpointSize;

-		}

-		else if (PipeNum == AOAInterfaceInfo->Config.DataOUTPipeNumber)

-		{

-			Size            = le16_to_cpu(DataOUTEndpoint->EndpointSize);

-			EndpointAddress = DataOUTEndpoint->EndpointAddress;

-			Token           = PIPE_TOKEN_OUT;

-			Type            = EP_TYPE_BULK;

-			DoubleBanked    = AOAInterfaceInfo->Config.DataOUTPipeDoubleBank;

-

-			AOAInterfaceInfo->State.DataOUTPipeSize = DataOUTEndpoint->EndpointSize;

-		}

-		else

-		{

-			continue;

-		}

-		

-		if (!(Pipe_ConfigurePipe(PipeNum, Type, Token, EndpointAddress, Size,

-		                         DoubleBanked ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE)))

-		{

-			return AOA_ENUMERROR_PipeConfigurationFailed;

-		}

-	}

+	AOAInterfaceInfo->Config.DataINPipe.Size  = le16_to_cpu(DataINEndpoint->EndpointSize);

+	AOAInterfaceInfo->Config.DataINPipe.EndpointAddress = DataINEndpoint->EndpointAddress;

+	AOAInterfaceInfo->Config.DataINPipe.Type  = EP_TYPE_BULK;

+	

+	AOAInterfaceInfo->Config.DataOUTPipe.Size = le16_to_cpu(DataOUTEndpoint->EndpointSize);

+	AOAInterfaceInfo->Config.DataOUTPipe.EndpointAddress = DataOUTEndpoint->EndpointAddress;

+	AOAInterfaceInfo->Config.DataOUTPipe.Type = EP_TYPE_BULK;

+	

+	if (!(Pipe_ConfigurePipeTable(&AOAInterfaceInfo->Config.DataINPipe, 1)))

+	  return false;

+	

+	if (!(Pipe_ConfigurePipeTable(&AOAInterfaceInfo->Config.DataOUTPipe, 1)))

+	  return false;

 

 	AOAInterfaceInfo->State.IsActive        = true;

 	AOAInterfaceInfo->State.InterfaceNumber = AOAInterface->InterfaceNumber;

@@ -260,7 +234,7 @@ uint8_t AOA_Host_SendData(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
 

 	uint8_t ErrorCode;

 

-	Pipe_SelectPipe(AOAInterfaceInfo->Config.DataOUTPipeNumber);

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

 

 	Pipe_Unfreeze();

 	ErrorCode = Pipe_Write_Stream_LE(Buffer, Length, NULL);

@@ -277,7 +251,7 @@ uint8_t AOA_Host_SendString(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
 

 	uint8_t ErrorCode;

 

-	Pipe_SelectPipe(AOAInterfaceInfo->Config.DataOUTPipeNumber);

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

 

 	Pipe_Unfreeze();

 	ErrorCode = Pipe_Write_Stream_LE(String, strlen(String), NULL);

@@ -294,7 +268,7 @@ uint8_t AOA_Host_SendByte(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
 

 	uint8_t ErrorCode;

 

-	Pipe_SelectPipe(AOAInterfaceInfo->Config.DataOUTPipeNumber);

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

 	Pipe_Unfreeze();

 

 	if (!(Pipe_IsReadWriteAllowed()))

@@ -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))

 	  return 0;

 

-	Pipe_SelectPipe(AOAInterfaceInfo->Config.DataINPipeNumber);

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

 	Pipe_Unfreeze();

 

 	if (Pipe_IsINReceived())

@@ -348,7 +322,7 @@ int16_t AOA_Host_ReceiveByte(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo)
 

 	int16_t ReceivedByte = -1;

 

-	Pipe_SelectPipe(AOAInterfaceInfo->Config.DataINPipeNumber);

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

 	Pipe_Unfreeze();

 

 	if (Pipe_IsINReceived())

@@ -372,7 +346,7 @@ uint8_t AOA_Host_Flush(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo)
 

 	uint8_t ErrorCode;

 

-	Pipe_SelectPipe(AOAInterfaceInfo->Config.DataOUTPipeNumber);

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

 	Pipe_Unfreeze();

 

 	if (!(Pipe_BytesInPipe()))