X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/0137001ea9f1b3a18fc6e14ab5c5ddbf819680ca..2793c88fc601dcc7ec4961326dd9748a20f3ec83:/LUFA/Drivers/USB/LowLevel/LowLevel.h

diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.h b/LUFA/Drivers/USB/LowLevel/LowLevel.h
index ac5cb9ebf..4279ca315 100644
--- a/LUFA/Drivers/USB/LowLevel/LowLevel.h
+++ b/LUFA/Drivers/USB/LowLevel/LowLevel.h
@@ -118,7 +118,7 @@
 				 *
 				 *  \note This token is not available on AVR models which do not support host mode.
 				 */
-				#define USB_MODE_HOST                      2
+				#define USB_MODE_HOST                  2
 			#endif
 			
 			#if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__)
@@ -159,25 +159,25 @@
 
 			/** Mask for a CONTROL type endpoint or pipe.
 			 *
-			 *  \note See Endpoint.h and Pipe.h headers for endpoint/pipe functions.
+			 *  \note See \ref Group_EndpointManagement and \ref Group_PipeManagement for endpoint/pipe functions.
 			 */
 			#define EP_TYPE_CONTROL                    0x00
 
 			/** Mask for an ISOCHRONOUS type endpoint or pipe.
 			 *
-			 *  \note See Endpoint.h and Pipe.h headers for endpoint/pipe functions.
+			 *  \note See \ref Group_EndpointManagement and \ref Group_PipeManagement for endpoint/pipe functions.
 			 */
 			#define EP_TYPE_ISOCHRONOUS                0x01
 
 			/** Mask for a BULK type endpoint or pipe.
 			 *
-			 *  \note See Endpoint.h and Pipe.h headers for endpoint/pipe functions.
+			 *  \note See \ref Group_EndpointManagement and \ref Group_PipeManagement for endpoint/pipe functions.
 			 */
 			#define EP_TYPE_BULK                       0x02
 
 			/** Mask for an INTERRUPT type endpoint or pipe.
 			 *
-			 *  \note See Endpoint.h and Pipe.h headers for endpoint/pipe functions.
+			 *  \note See \ref Group_EndpointManagement and \ref Group_PipeManagement for endpoint/pipe functions.
 			 */
 			#define EP_TYPE_INTERRUPT                  0x03
 
@@ -283,7 +283,7 @@
 
 		/* 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 USB_InitFailure event.
+			 *  used in the ErrorCode parameter value of the \ref EVENT_USB_InitFailure() event.
 			 */
 			enum USB_InitErrorCodes_t
 			{
@@ -304,33 +304,15 @@
 			#endif
 			
 			#if !defined(USE_STATIC_OPTIONS) || defined(__DOXYGEN__)
-				extern volatile uint8_t USB_Options;
 				/** Indicates the current USB options that the USB interface was initialized with when \ref USB_Init()
 				 *  was called. This value will be one of the USB_MODE_* masks defined elsewhere in this module.
 				 *
 				 *  \note This variable should be treated as read-only in the user application, and never manually
 				 *        changed in value.
 				 */
+				extern volatile uint8_t USB_Options;
 			#endif
 
-		/* Throwable Events: */
-			/** This module raises the \ref USB_Disconnect event if the USB interface is reset (such as during a mode
-			 *  change while in UID mode) while the USB interface is connected to a device when in host mode, or
-			 *  a host while in device mode.
-			 *
-			 *  \see Events.h for more information on this event.
-			 */
-			RAISES_EVENT(USB_Disconnect);
-			
-			#if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__)
-				/** This module raises the Power On Failure event when an error occurs while initializing the USB
-				 *  interface.
-				 *
-				 *  \see Events.h for more information on this event.
-				 */
-				RAISES_EVENT(USB_InitFailure);
-			#endif
-			
 	/* Private Interface - For use in library only: */
 	#if !defined(__DOXYGEN__)
 		/* Macros: */
@@ -359,7 +341,7 @@
 	
 		/* Inline Functions: */
 			#if defined(USB_CAN_BE_BOTH)
-			static inline uint8_t USB_GetUSBModeFromUID(void) ATTR_WARN_UNUSED_RESULT;
+			static inline uint8_t USB_GetUSBModeFromUID(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
 			static inline uint8_t USB_GetUSBModeFromUID(void)
 			{
 				if (USBSTA & (1 << ID))
@@ -368,6 +350,9 @@
 				  return USB_MODE_HOST;
 			}
 			#endif
+		
+		/* External Variables: */
+			extern volatile bool FrameElapsed;
 			
 	#endif