The FAST_STREAM_TRANSFERS compile time option has been removed due to lack of use and low cost/benefit ratio.

Add GCC_FORCE_POINTER_ACCESS() macro use to the RingBuffer library header, to attempt to force GCC into producing more efficient code for manipulating the buffers.

5 files changed, 9 insertions, 165 deletions

diff --git a/LUFA/Drivers/Misc/RingBuffer.h b/LUFA/Drivers/Misc/RingBuffer.h
index d9d3a8340..605f92c11 100644
--- a/LUFA/Drivers/Misc/RingBuffer.h
+++ b/LUFA/Drivers/Misc/RingBuffer.h
@@ -126,10 +126,10 @@
 		 */

 		static inline void RingBuffer_InitBuffer(RingBuffer_t* Buffer, uint8_t* const DataPtr, const uint16_t Size)

 		{

+			GCC_FORCE_POINTER_ACCESS(Buffer);

+

 			ATOMIC_BLOCK(ATOMIC_RESTORESTATE)

-			{

-				GCC_FORCE_POINTER_ACCESS(Buffer);

-				

+			{	

 				Buffer->In     = DataPtr;

 				Buffer->Out    = DataPtr;

 				Buffer->Start  = &DataPtr[0];

@@ -203,9 +203,11 @@
 		 *  \param[in,out] Buffer  Pointer to a ring buffer structure to insert into.

 		 *  \param[in]     Data    Data element to insert into the buffer.

 		 */

-		static inline void RingBuffer_Insert(RingBuffer_t* const Buffer,

+		static inline void RingBuffer_Insert(RingBuffer_t* Buffer,

 		                                     const uint8_t Data)

 		{

+			GCC_FORCE_POINTER_ACCESS(Buffer);

+

 			*Buffer->In = Data;

 

 			if (++Buffer->In == Buffer->End)

@@ -227,8 +229,10 @@
 		 *

 		 *  \return Next data element stored in the buffer.

 		 */

-		static inline uint8_t RingBuffer_Remove(RingBuffer_t* const Buffer)

+		static inline uint8_t RingBuffer_Remove(RingBuffer_t* Buffer)

 		{

+			GCC_FORCE_POINTER_ACCESS(Buffer);

+		

 			uint8_t Data = *Buffer->Out;

 

 			if (++Buffer->Out == Buffer->End)

diff --git a/LUFA/Drivers/USB/HighLevel/EndpointStream.c b/LUFA/Drivers/USB/HighLevel/EndpointStream.c
index 76875b258..c2bb3922c 100644
--- a/LUFA/Drivers/USB/HighLevel/EndpointStream.c
+++ b/LUFA/Drivers/USB/HighLevel/EndpointStream.c
@@ -44,46 +44,6 @@ uint8_t Endpoint_Discard_Stream(uint16_t Length
 	if ((ErrorCode = Endpoint_WaitUntilReady()))

 	  return ErrorCode;

 

-	#if defined(FAST_STREAM_TRANSFERS)

-	uint8_t BytesRemToAlignment = (Endpoint_BytesInEndpoint() & 0x07);

-

-	if (Length >= 8)

-	{

-		Length -= BytesRemToAlignment;

-

-		switch (BytesRemToAlignment)

-		{

-			default:

-				do

-				{

-					if (!(Endpoint_IsReadWriteAllowed()))

-					{

-						Endpoint_ClearOUT();

-

-						#if !defined(NO_STREAM_CALLBACKS)

-						if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))

-						  return ENDPOINT_RWSTREAM_CallbackAborted;

-						#endif

-

-						if ((ErrorCode = Endpoint_WaitUntilReady()))

-						  return ErrorCode;

-					}

-

-					Length -= 8;

-					

-					Endpoint_Discard_Byte();

-			case 7: Endpoint_Discard_Byte();

-			case 6: Endpoint_Discard_Byte();

-			case 5: Endpoint_Discard_Byte();

-			case 4: Endpoint_Discard_Byte();

-			case 3: Endpoint_Discard_Byte();

-			case 2: Endpoint_Discard_Byte();

-			case 1:	Endpoint_Discard_Byte();

-				} while (Length >= 8);	

-		}

-	}

-	#endif

-

 	while (Length)

 	{

 		if (!(Endpoint_IsReadWriteAllowed()))

diff --git a/LUFA/Drivers/USB/HighLevel/PipeStream.c b/LUFA/Drivers/USB/HighLevel/PipeStream.c
index 624340017..98c57206f 100644
--- a/LUFA/Drivers/USB/HighLevel/PipeStream.c
+++ b/LUFA/Drivers/USB/HighLevel/PipeStream.c
@@ -45,46 +45,6 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
 	if ((ErrorCode = Pipe_WaitUntilReady()))

 	  return ErrorCode;

 

-	#if defined(FAST_STREAM_TRANSFERS)

-	uint8_t BytesRemToAlignment = (Pipe_BytesInPipe() & 0x07);

-

-	if (Length >= 8)

-	{

-		Length -= BytesRemToAlignment;

-

-		switch (BytesRemToAlignment)

-		{

-			default:

-				do

-				{

-					if (!(Pipe_IsReadWriteAllowed()))

-					{

-						Pipe_ClearIN();

-							

-						#if !defined(NO_STREAM_CALLBACKS)

-						if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))

-						  return PIPE_RWSTREAM_CallbackAborted;

-						#endif

-

-						if ((ErrorCode = Pipe_WaitUntilReady()))

-						  return ErrorCode;

-					}

-

-					Length -= 8;

-					

-					Pipe_Discard_Byte();

-			case 7: Pipe_Discard_Byte();

-			case 6: Pipe_Discard_Byte();

-			case 5: Pipe_Discard_Byte();

-			case 4: Pipe_Discard_Byte();

-			case 3: Pipe_Discard_Byte();

-			case 2: Pipe_Discard_Byte();

-			case 1:	Pipe_Discard_Byte();

-				} while (Length >= 8);	

-		}

-	}

-	#endif

-

 	while (Length)

 	{

 		if (!(Pipe_IsReadWriteAllowed()))

diff --git a/LUFA/Drivers/USB/HighLevel/Template/Template_Endpoint_RW.c b/LUFA/Drivers/USB/HighLevel/Template/Template_Endpoint_RW.c
index 6657f38eb..8a97e1565 100644
--- a/LUFA/Drivers/USB/HighLevel/Template/Template_Endpoint_RW.c
+++ b/LUFA/Drivers/USB/HighLevel/Template/Template_Endpoint_RW.c
@@ -8,46 +8,6 @@ uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE Buffer,
 	if ((ErrorCode = Endpoint_WaitUntilReady()))
 	  return ErrorCode;
 
-	#if defined(FAST_STREAM_TRANSFERS)
-	uint8_t BytesRemToAlignment = (Endpoint_BytesInEndpoint() & 0x07);
-
-	if (Length >= 8)
-	{
-		Length -= BytesRemToAlignment;
-
-		switch (BytesRemToAlignment)
-		{
-			default:
-				do
-				{
-					if (!(Endpoint_IsReadWriteAllowed()))
-					{
-						TEMPLATE_CLEAR_ENDPOINT();
-
-						#if !defined(NO_STREAM_CALLBACKS)
-						if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
-						  return ENDPOINT_RWSTREAM_CallbackAborted;
-						#endif
-
-						if ((ErrorCode = Endpoint_WaitUntilReady()))
-						  return ErrorCode;
-					}
-
-					Length -= 8;
-
-					TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 7: TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 6: TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 5: TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 4: TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 3: TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 2: TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 1:	TEMPLATE_TRANSFER_BYTE(DataStream);
-				} while (Length >= 8);
-		}
-	}
-	#endif
-
 	while (Length)
 	{
 		if (!(Endpoint_IsReadWriteAllowed()))
diff --git a/LUFA/Drivers/USB/HighLevel/Template/Template_Pipe_RW.c b/LUFA/Drivers/USB/HighLevel/Template/Template_Pipe_RW.c
index a998469d2..eebe52f12 100644
--- a/LUFA/Drivers/USB/HighLevel/Template/Template_Pipe_RW.c
+++ b/LUFA/Drivers/USB/HighLevel/Template/Template_Pipe_RW.c
@@ -10,46 +10,6 @@ uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE Buffer,
 	if ((ErrorCode = Pipe_WaitUntilReady()))
 	  return ErrorCode;
 
-	#if defined(FAST_STREAM_TRANSFERS)
-	uint8_t BytesRemToAlignment = (Pipe_BytesInPipe() & 0x07);
-
-	if (Length >= 8)
-	{
-		Length -= BytesRemToAlignment;
-
-		switch (BytesRemToAlignment)
-		{
-			default:
-				do
-				{
-					if (!(Pipe_IsReadWriteAllowed()))
-					{
-						TEMPLATE_CLEAR_PIPE();
-
-						#if !defined(NO_STREAM_CALLBACKS)
-						if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
-						  return PIPE_RWSTREAM_CallbackAborted;
-						#endif
-
-						if ((ErrorCode = Pipe_WaitUntilReady()))
-						  return ErrorCode;
-					}
-
-					Length -= 8;
-
-					TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 7: TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 6: TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 5: TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 4: TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 3: TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 2: TEMPLATE_TRANSFER_BYTE(DataStream);
-			case 1:	TEMPLATE_TRANSFER_BYTE(DataStream);
-				} while (Length >= 8);
-		}
-	}
-	#endif
-
 	while (Length)
 	{
 		if (!(Pipe_IsReadWriteAllowed()))