Updated bootloaders to use the new main() function layout and remove any references...

[pub/USBasp.git] / LUFA / Drivers / USB / LowLevel / LowLevel.h

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