X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/0f45b9c8e076483cd546d0bc9c606b73455295c6..d36c96d6a526f74e3853466bcecf49261c58b9bd:/LUFA/Drivers/USB/LowLevel/USBController.h

diff --git a/LUFA/Drivers/USB/LowLevel/USBController.h b/LUFA/Drivers/USB/LowLevel/USBController.h
index f0db7faf4..298141eef 100644
--- a/LUFA/Drivers/USB/LowLevel/USBController.h
+++ b/LUFA/Drivers/USB/LowLevel/USBController.h
@@ -64,15 +64,17 @@
 		
 		#if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)
 			#include "Host.h"
-			#include "Pipe.h"
 			#include "OTG.h"
+			#include "Pipe.h"
 			#include "../HighLevel/HostStandardReq.h"
+			#include "../HighLevel/PipeStream.h"
 		#endif
 		
 		#if defined(USB_CAN_BE_DEVICE) || defined(__DOXYGEN__)
 			#include "Device.h"
 			#include "Endpoint.h"
 			#include "../HighLevel/DeviceStandardReq.h"
+			#include "../HighLevel/EndpointStream.h"
 		#endif
 
 	/* Enable C linkage for C++ Compilers: */
@@ -315,17 +317,6 @@
 			 */
 			void USB_ResetInterface(void);
 
-		/* Enums: */
-			/** Enum for error codes relating to the powering on of the USB interface. These error codes are
-			 *  used in the ErrorCode parameter value of the \ref EVENT_USB_InitFailure() event.
-			 */
-			enum USB_InitErrorCodes_t
-			{
-				USB_INITERROR_NoUSBModeSpecified       = 0, /**< Indicates that \ref USB_Init() was called with an
-				                                             *   invalid or missing Mode parameter.
-				                                             */
-			};
-
 		/* Global Variables: */
 			#if (!defined(USB_HOST_ONLY) && !defined(USB_DEVICE_ONLY)) || defined(__DOXYGEN__)
 				/** Indicates the mode that the USB interface is currently initialized to. This value will be
@@ -355,6 +346,17 @@
 
 	/* Private Interface - For use in library only: */
 	#if !defined(__DOXYGEN__)
+		/* Function Prototypes: */
+			#if defined(__INCLUDE_FROM_USB_CONTROLLER_C)
+				#if defined(USB_CAN_BE_DEVICE)
+				static void USB_Init_Device(void);
+				#endif
+				
+				#if defined(USB_CAN_BE_HOST)
+				static void USB_Init_Host(void);
+				#endif
+			#endif
+	
 		/* Inline Functions: */
 			static inline void USB_PLL_On(void) ATTR_ALWAYS_INLINE;
 			static inline void USB_PLL_On(void)
@@ -452,7 +454,7 @@
 				  return USB_MODE_HOST;
 			}
 			#endif
-			
+
 	#endif
 	
 	/* Disable C linkage for C++ Compilers: */