X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/e21b620bf6cc9fb1bb9e516efb57b1cb12c00085..beb0b2bda0c45e958e88933a055d409e42fa0a0b:/LUFA/Drivers/USB/LowLevel/Pipe.c

diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.c b/LUFA/Drivers/USB/LowLevel/Pipe.c
index 4bd89ecb5..189aaa63b 100644
--- a/LUFA/Drivers/USB/LowLevel/Pipe.c
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.c
@@ -45,7 +45,7 @@ bool Pipe_ConfigurePipe(const uint8_t Number, const uint8_t Type, const uint8_t
 
 	UPCFG1X = 0;
 	
-	UPCFG0X = ((Type << EPTYPE0) | Token | (EndpointNumber << PEPNUM0));
+	UPCFG0X = ((Type << EPTYPE0) | Token | ((EndpointNumber & PIPE_EPNUM_MASK) << PEPNUM0));
 	UPCFG1X = ((1 << ALLOC) | Banks | Pipe_BytesToEPSizeMask(Size));
 
 	return Pipe_IsConfigured();
@@ -70,9 +70,11 @@ void Pipe_ClearPipes(void)
 
 uint8_t Pipe_WaitUntilReady(void)
 {
+	#if (USB_STREAM_TIMEOUT_MS < 0xFF)
+	uint8_t  TimeoutMSRem = USB_STREAM_TIMEOUT_MS;	
+	#else
 	uint16_t TimeoutMSRem = USB_STREAM_TIMEOUT_MS;
-
-	USB_INT_Clear(USB_INT_HSOFI);
+	#endif
 
 	for (;;)
 	{
@@ -104,7 +106,7 @@ uint8_t Pipe_WaitUntilReady(void)
 
 uint8_t Pipe_Write_Stream_LE(const void* Data, uint16_t Length
 #if !defined(NO_STREAM_CALLBACKS)
-                                 , uint8_t (* const Callback)(void)
+                                 , StreamCallbackPtr_t Callback
 #endif
 								 )
 {
@@ -122,7 +124,7 @@ uint8_t Pipe_Write_Stream_LE(const void* Data, uint16_t Length
 				
 			#if !defined(NO_STREAM_CALLBACKS)
 			if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
-			  return PIPE_RWSTREAM_ERROR_CallbackAborted;
+			  return PIPE_RWSTREAM_CallbackAborted;
 			#endif
 
 			if ((ErrorCode = Pipe_WaitUntilReady()))
@@ -135,12 +137,12 @@ uint8_t Pipe_Write_Stream_LE(const void* Data, uint16_t Length
 		}
 	}
 
-	return PIPE_RWSTREAM_ERROR_NoError;
+	return PIPE_RWSTREAM_NoError;
 }
 
 uint8_t Pipe_Write_Stream_BE(const void* Data, uint16_t Length
 #if !defined(NO_STREAM_CALLBACKS)
-                                 , uint8_t (* const Callback)(void)
+                                 , StreamCallbackPtr_t Callback
 #endif
 								 )
 {
@@ -158,7 +160,7 @@ uint8_t Pipe_Write_Stream_BE(const void* Data, uint16_t Length
 				
 			#if !defined(NO_STREAM_CALLBACKS)
 			if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
-			  return PIPE_RWSTREAM_ERROR_CallbackAborted;
+			  return PIPE_RWSTREAM_CallbackAborted;
 			#endif
 
 			if ((ErrorCode = Pipe_WaitUntilReady()))
@@ -171,12 +173,12 @@ uint8_t Pipe_Write_Stream_BE(const void* Data, uint16_t Length
 		}
 	}
 
-	return PIPE_RWSTREAM_ERROR_NoError;
+	return PIPE_RWSTREAM_NoError;
 }
 
 uint8_t Pipe_Discard_Stream(uint16_t Length
 #if !defined(NO_STREAM_CALLBACKS)
-                                 , uint8_t (* const Callback)(void)
+                                 , StreamCallbackPtr_t Callback
 #endif
 								 )
 {
@@ -193,7 +195,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
 				
 			#if !defined(NO_STREAM_CALLBACKS)
 			if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
-			  return PIPE_RWSTREAM_ERROR_CallbackAborted;
+			  return PIPE_RWSTREAM_CallbackAborted;
 			#endif
 
 			if ((ErrorCode = Pipe_WaitUntilReady()))
@@ -206,12 +208,12 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
 		}
 	}
 
-	return PIPE_RWSTREAM_ERROR_NoError;
+	return PIPE_RWSTREAM_NoError;
 }
 
 uint8_t Pipe_Read_Stream_LE(void* Buffer, uint16_t Length
 #if !defined(NO_STREAM_CALLBACKS)
-                                 , uint8_t (* const Callback)(void)
+                                 , StreamCallbackPtr_t Callback
 #endif
 								 )
 {
@@ -229,7 +231,7 @@ uint8_t Pipe_Read_Stream_LE(void* Buffer, uint16_t Length
 				
 			#if !defined(NO_STREAM_CALLBACKS)
 			if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
-			  return PIPE_RWSTREAM_ERROR_CallbackAborted;
+			  return PIPE_RWSTREAM_CallbackAborted;
 			#endif
 
 			if ((ErrorCode = Pipe_WaitUntilReady()))
@@ -242,12 +244,12 @@ uint8_t Pipe_Read_Stream_LE(void* Buffer, uint16_t Length
 		}
 	}
 
-	return PIPE_RWSTREAM_ERROR_NoError;
+	return PIPE_RWSTREAM_NoError;
 }
 
 uint8_t Pipe_Read_Stream_BE(void* Buffer, uint16_t Length
 #if !defined(NO_STREAM_CALLBACKS)
-                                 , uint8_t (* const Callback)(void)
+                                 , StreamCallbackPtr_t Callback
 #endif
 								 )
 {
@@ -265,7 +267,7 @@ uint8_t Pipe_Read_Stream_BE(void* Buffer, uint16_t Length
 				
 			#if !defined(NO_STREAM_CALLBACKS)
 			if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
-			  return PIPE_RWSTREAM_ERROR_CallbackAborted;
+			  return PIPE_RWSTREAM_CallbackAborted;
 			#endif
 
 			if ((ErrorCode = Pipe_WaitUntilReady()))
@@ -278,7 +280,7 @@ uint8_t Pipe_Read_Stream_BE(void* Buffer, uint16_t Length
 		}
 	}
 	
-	return PIPE_RWSTREAM_ERROR_NoError;
+	return PIPE_RWSTREAM_NoError;
 }
 
 #endif