X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/0e6d5cf5b4fea133cbd3c16b958617deb42332cf..634abab38ac6a9ebdae67b2da5d100874b6c4f73:/LUFA/Drivers/USB/LowLevel/Pipe.h

diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.h b/LUFA/Drivers/USB/LowLevel/Pipe.h
index 08935e1f1..c22c5aeb0 100644
--- a/LUFA/Drivers/USB/LowLevel/Pipe.h
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.h
@@ -74,16 +74,10 @@
 #define __PIPE_H__
 
 	/* Includes: */
-		#if defined(__AVR32__)
-			#include <avr32/io.h>
-			#include <stdint.h>
-			#include <stdbool.h>
-		#elif defined(__AVR__)
-			#include <avr/io.h>
-			#include <avr/pgmspace.h>
-			#include <avr/eeprom.h>
-			#include <stdbool.h>
-		#endif
+		#include <avr/io.h>
+		#include <avr/pgmspace.h>
+		#include <avr/eeprom.h>
+		#include <stdbool.h>
 
 		#include "../../../Common/Common.h"
 		#include "../HighLevel/USBTask.h"
@@ -99,7 +93,7 @@
 
 	/* Preprocessor Checks: */
 		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
+			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
 		#endif
 		
 	/* Public Interface - May be used in end-application: */
@@ -553,11 +547,7 @@
 			static inline uint8_t Pipe_Read_Byte(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
 			static inline uint8_t Pipe_Read_Byte(void)
 			{
-				#if defined(__AVR32__)
-				return 0; // TODO
-				#elif defined(__AVR__)
 				return UPDATX;
-				#endif
 			}
 
 			/** Writes one byte from the currently selected pipe's bank, for IN direction pipes.
@@ -569,11 +559,7 @@
 			static inline void Pipe_Write_Byte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
 			static inline void Pipe_Write_Byte(const uint8_t Byte)
 			{
-				#if defined(__AVR32__)
-				// TODO
-				#elif defined(__AVR__)
 				UPDATX = Byte;
-				#endif
 			}
 
 			/** Discards one byte from the currently selected pipe's bank, for OUT direction pipes.
@@ -585,11 +571,7 @@
 			{
 				uint8_t Dummy;
 				
-				#if defined(__AVR32__)
-				// TODO
-				#elif defined(__AVR__)
 				Dummy = UPDATX;
-				#endif
 			}
 			
 			/** Reads two bytes from the currently selected pipe's bank in little endian format, for OUT
@@ -608,12 +590,8 @@
 					uint8_t  Bytes[2];
 				} Data;
 				
-				#if defined(__AVR32__)
-				// TODO
-				#elif defined(__AVR__)
 				Data.Bytes[0] = UPDATX;
 				Data.Bytes[1] = UPDATX;
-				#endif
 			
 				return Data.Word;
 			}
@@ -634,12 +612,8 @@
 					uint8_t  Bytes[2];
 				} Data;
 				
-				#if defined(__AVR32__)
-				// TODO
-				#elif defined(__AVR__)
 				Data.Bytes[1] = UPDATX;
 				Data.Bytes[0] = UPDATX;
-				#endif
 			
 				return Data.Word;
 			}
@@ -654,12 +628,8 @@
 			static inline void Pipe_Write_Word_LE(const uint16_t Word) ATTR_ALWAYS_INLINE;
 			static inline void Pipe_Write_Word_LE(const uint16_t Word)
 			{
-				#if defined(__AVR32__)
-				// TODO
-				#elif defined(__AVR__)
 				UPDATX = (Word & 0xFF);
 				UPDATX = (Word >> 8);
-				#endif
 			}
 			
 			/** Writes two bytes to the currently selected pipe's bank in big endian format, for IN
@@ -672,12 +642,8 @@
 			static inline void Pipe_Write_Word_BE(const uint16_t Word) ATTR_ALWAYS_INLINE;
 			static inline void Pipe_Write_Word_BE(const uint16_t Word)
 			{
-				#if defined(__AVR32__)
-				// TODO
-				#elif defined(__AVR__)
 				UPDATX = (Word >> 8);
 				UPDATX = (Word & 0xFF);
-				#endif
 			}
 
 			/** Discards two bytes from the currently selected pipe's bank, for OUT direction pipes.
@@ -689,12 +655,8 @@
 			{
 				uint8_t Dummy;
 				
-				#if defined(__AVR32__)
-				// TODO
-				#elif defined(__AVR__)
 				Dummy = UPDATX;
 				Dummy = UPDATX;
-				#endif
 			}
 
 			/** Reads four bytes from the currently selected pipe's bank in little endian format, for OUT
@@ -713,14 +675,10 @@
 					uint8_t  Bytes[4];
 				} Data;
 				
-				#if defined(__AVR32__)
-				// TODO
-				#elif defined(__AVR__)
 				Data.Bytes[0] = UPDATX;
 				Data.Bytes[1] = UPDATX;
 				Data.Bytes[2] = UPDATX;
 				Data.Bytes[3] = UPDATX;
-				#endif
 			
 				return Data.DWord;
 			}
@@ -741,9 +699,6 @@
 					uint8_t  Bytes[4];
 				} Data;
 				
-				#if defined(__AVR32__)
-				// TODO
-				#elif defined(__AVR__)
 				Data.Bytes[3] = UPDATX;
 				Data.Bytes[2] = UPDATX;
 				Data.Bytes[1] = UPDATX;
@@ -762,14 +717,10 @@
 			static inline void Pipe_Write_DWord_LE(const uint32_t DWord) ATTR_ALWAYS_INLINE;
 			static inline void Pipe_Write_DWord_LE(const uint32_t DWord)
 			{
-				#if defined(__AVR32__)
-				// TODO
-				#elif defined(__AVR__)
 				UPDATX = (DWord &  0xFF);
 				UPDATX = (DWord >> 8);
 				UPDATX = (DWord >> 16);
 				UPDATX = (DWord >> 24);
-				#endif
 			}
 			
 			/** Writes four bytes to the currently selected pipe's bank in big endian format, for IN
@@ -782,14 +733,10 @@
 			static inline void Pipe_Write_DWord_BE(const uint32_t DWord) ATTR_ALWAYS_INLINE;
 			static inline void Pipe_Write_DWord_BE(const uint32_t DWord)
 			{
-				#if defined(__AVR32__)
-				// TODO
-				#elif defined(__AVR__)
 				UPDATX = (DWord >> 24);
 				UPDATX = (DWord >> 16);
 				UPDATX = (DWord >> 8);
 				UPDATX = (DWord &  0xFF);
-				#endif
 			}			
 			
 			/** Discards four bytes from the currently selected pipe's bank, for OUT direction pipes.	
@@ -801,14 +748,10 @@
 			{
 				uint8_t Dummy;
 				
-				#if defined(__AVR32__)
-				// TODO
-				#elif defined(__AVR__)
 				Dummy = UPDATX;
 				Dummy = UPDATX;
 				Dummy = UPDATX;
 				Dummy = UPDATX;
-				#endif
 			}
 
 		/* External Variables: */