Update UC3 platform driver support to use the bitmasks defined in the header files...

[pub/USBasp.git] / LUFA / Drivers / USB / Core / USBTask.h

diff --git a/LUFA/Drivers/USB/Core/USBTask.h b/LUFA/Drivers/USB/Core/USBTask.h
index f2ed7b7..6084268 100644 (file)
--- a/LUFA/Drivers/USB/Core/USBTask.h
+++ b/LUFA/Drivers/USB/Core/USBTask.h
@@ -43,11 +43,11 @@
 
        /* Includes: */
                #include "../../../Common/Common.h"
 
        /* Includes: */
                #include "../../../Common/Common.h"

+               #include "USBMode.h"            

                #include "USBController.h"
                #include "Events.h"
                #include "StdRequestType.h"
                #include "StdDescriptors.h"
                #include "USBController.h"
                #include "Events.h"
                #include "StdRequestType.h"
                #include "StdDescriptors.h"

-               #include "USBMode.h"

 
                #if defined(USB_CAN_BE_DEVICE)
                        #include "DeviceStandardReq.h"
 
                #if defined(USB_CAN_BE_DEVICE)
                        #include "DeviceStandardReq.h"


@@ -84,6 +84,8 @@
                         *  inside of the \ref EVENT_USB_Device_ControlRequest() event, or for filling up with a control request to 
                         *  issue when in Host mode before calling \ref USB_Host_SendControlRequest().
                         *
                         *  inside of the \ref EVENT_USB_Device_ControlRequest() event, or for filling up with a control request to 
                         *  issue when in Host mode before calling \ref USB_Host_SendControlRequest().
                         *

+                        *  \note The contents of this structure is automatically endian-corrected for the current CPU architecture.
+                        *

                         *  \ingroup Group_USBManagement
                         */
                         extern USB_Request_Header_t USB_ControlRequest;
                         *  \ingroup Group_USBManagement
                         */
                         extern USB_Request_Header_t USB_ControlRequest;


@@ -93,9 +95,8 @@
                                        /** Indicates the current host state machine state. When in host mode, this indicates the state
                                         *  via one of the values of the \ref USB_Host_States_t enum values.
                                         *
                                        /** Indicates the current host state machine state. When in host mode, this indicates the state
                                         *  via one of the values of the \ref USB_Host_States_t enum values.
                                         *

-                                        *  This value may be altered by the user application to implement the \ref HOST_STATE_Addressed,
-                                        *  \ref HOST_STATE_Configured and \ref HOST_STATE_Suspended states which are not implemented by
-                                        *  the library internally.
+                                        *  This value should not be altered by the user application as it is handled automatically by the
+                                        *  library.

                                         *
                                         *  To reduce program size and speed up checks of this global on the AVR8 architecture, it can be
                                         *  placed into one of the AVR's \c GPIOR hardware registers instead of RAM by defining the
                                         *
                                         *  To reduce program size and speed up checks of this global on the AVR8 architecture, it can be
                                         *  placed into one of the AVR's \c GPIOR hardware registers instead of RAM by defining the


@@ -191,7 +192,7 @@
                /* Macros: */
                        #define HOST_TASK_NONBLOCK_WAIT(Duration, NextState) MACROS{ USB_HostState   = HOST_STATE_WaitForDevice; \
                                                                                     WaitMSRemaining = (Duration);               \
                /* Macros: */
                        #define HOST_TASK_NONBLOCK_WAIT(Duration, NextState) MACROS{ USB_HostState   = HOST_STATE_WaitForDevice; \
                                                                                     WaitMSRemaining = (Duration);               \

-                                                                                    PostWaitState   = (NextState);        }MACROE
+                                                                                    PostWaitState   = (NextState);              }MACROE

        #endif
 
        /* Disable C linkage for C++ Compilers: */
        #endif
 
        /* Disable C linkage for C++ Compilers: */