X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/0e6d5cf5b4fea133cbd3c16b958617deb42332cf..28f1ac81176bbcd9fd13d94e61323522a5279d27:/LUFA/Drivers/USB/LowLevel/Pipe.c

diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.c b/LUFA/Drivers/USB/LowLevel/Pipe.c
index e6ac0e57c..8784bea0c 100644
--- a/LUFA/Drivers/USB/LowLevel/Pipe.c
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.c
@@ -80,14 +80,13 @@ bool Pipe_IsEndpointBound(const uint8_t EndpointAddress)
 		Pipe_SelectPipe(PNum);
 		
 		uint8_t PipeToken = Pipe_GetPipeToken();
+		bool    PipeTokenCorrect = true;
 
 		if (PipeToken != PIPE_TOKEN_SETUP)
-		  PipeToken = (PipeToken == ((EndpointAddress & PIPE_EPDIR_MASK) ? PIPE_TOKEN_IN : PIPE_TOKEN_OUT));
+		  PipeTokenCorrect = (PipeToken == ((EndpointAddress & PIPE_EPDIR_MASK) ? PIPE_TOKEN_IN : PIPE_TOKEN_OUT));
 		
-		if (Pipe_IsConfigured() && (Pipe_BoundEndpointNumber() == (EndpointAddress & PIPE_EPNUM_MASK)) && PipeToken)
-		{		
-			return true;
-		}
+		if (Pipe_IsConfigured() && PipeTokenCorrect && (Pipe_BoundEndpointNumber() == (EndpointAddress & PIPE_EPNUM_MASK)))
+		  return true;
 	}
 	
 	Pipe_SelectPipe(PrevPipeNumber);
@@ -226,15 +225,13 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(pgm_read_byte((uint8_t*)BufferPtr++))
 #include "Template/Template_Pipe_RW.c"
 
-#if defined(__AVR__)
-	#define  TEMPLATE_FUNC_NAME                    Pipe_Write_EStream_LE
-	#define  TEMPLATE_BUFFER_TYPE                  const void*
-	#define  TEMPLATE_TOKEN                        PIPE_TOKEN_OUT
-	#define  TEMPLATE_CLEAR_PIPE()                 Pipe_ClearOUT()
-	#define  TEMPLATE_BUFFER_OFFSET(Length)        0
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)     Pipe_Write_Byte(eeprom_read_byte((uint8_t*)BufferPtr++))
-	#include "Template/Template_Pipe_RW.c"
-#endif
+#define  TEMPLATE_FUNC_NAME                        Pipe_Write_EStream_LE
+#define  TEMPLATE_BUFFER_TYPE                      const void*
+#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT
+#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(eeprom_read_byte((uint8_t*)BufferPtr++))
+#include "Template/Template_Pipe_RW.c"
 
 #define  TEMPLATE_FUNC_NAME                        Pipe_Write_Stream_BE
 #define  TEMPLATE_BUFFER_TYPE                      const void*
@@ -252,15 +249,13 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(pgm_read_byte((uint8_t*)BufferPtr--))
 #include "Template/Template_Pipe_RW.c"
 
-#if defined(__AVR__)
-	#define  TEMPLATE_FUNC_NAME                    Pipe_Write_EStream_BE
-	#define  TEMPLATE_BUFFER_TYPE                  const void*
-	#define  TEMPLATE_TOKEN                        PIPE_TOKEN_OUT
-	#define  TEMPLATE_CLEAR_PIPE()                 Pipe_ClearOUT()
-	#define  TEMPLATE_BUFFER_OFFSET(Length)        (Length - 1)
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)     Pipe_Write_Byte(eeprom_read_byte((uint8_t*)BufferPtr--))
-	#include "Template/Template_Pipe_RW.c"
-#endif
+#define  TEMPLATE_FUNC_NAME                        Pipe_Write_EStream_BE
+#define  TEMPLATE_BUFFER_TYPE                      const void*
+#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT
+#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()
+#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_Byte(eeprom_read_byte((uint8_t*)BufferPtr--))
+#include "Template/Template_Pipe_RW.c"
 
 #define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_LE
 #define  TEMPLATE_BUFFER_TYPE                      void*
@@ -270,15 +265,13 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *((uint8_t*)BufferPtr++) = Pipe_Read_Byte()
 #include "Template/Template_Pipe_RW.c"
 
-#if defined(__AVR__)
-	#define  TEMPLATE_FUNC_NAME                    Pipe_Read_EStream_LE
-	#define  TEMPLATE_BUFFER_TYPE                  void*
-	#define  TEMPLATE_TOKEN                        PIPE_TOKEN_IN
-	#define  TEMPLATE_CLEAR_PIPE()                 Pipe_ClearIN()
-	#define  TEMPLATE_BUFFER_OFFSET(Length)        0
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)     eeprom_write_byte((uint8_t*)BufferPtr++, Pipe_Read_Byte())
-	#include "Template/Template_Pipe_RW.c"
-#endif
+#define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_LE
+#define  TEMPLATE_BUFFER_TYPE                      void*
+#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN
+#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()
+#define  TEMPLATE_BUFFER_OFFSET(Length)            0
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_write_byte((uint8_t*)BufferPtr++, Pipe_Read_Byte())
+#include "Template/Template_Pipe_RW.c"
 
 #define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_BE
 #define  TEMPLATE_BUFFER_TYPE                      void*
@@ -288,14 +281,12 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
 #define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *((uint8_t*)BufferPtr--) = Pipe_Read_Byte()
 #include "Template/Template_Pipe_RW.c"
 
-#if defined(__AVR__)
-	#define  TEMPLATE_FUNC_NAME                    Pipe_Read_EStream_BE
-	#define  TEMPLATE_BUFFER_TYPE                  void*
-	#define  TEMPLATE_TOKEN                        PIPE_TOKEN_IN
-	#define  TEMPLATE_CLEAR_PIPE()                 Pipe_ClearIN()
-	#define  TEMPLATE_BUFFER_OFFSET(Length)        (Length - 1)
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)     eeprom_write_byte((uint8_t*)BufferPtr--, Pipe_Read_Byte())
-	#include "Template/Template_Pipe_RW.c"
-#endif
+#define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_BE
+#define  TEMPLATE_BUFFER_TYPE                      void*
+#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN
+#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()
+#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
+#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_write_byte((uint8_t*)BufferPtr--, Pipe_Read_Byte())
+#include "Template/Template_Pipe_RW.c"
 
 #endif