Speed up bit-banged USART code in the AVRISP project.

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

diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.h b/LUFA/Drivers/USB/HighLevel/USBTask.h
index 9138e68..4c9b717 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBTask.h
+++ b/LUFA/Drivers/USB/HighLevel/USBTask.h
@@ -35,17 +35,20 @@
                #include <avr/io.h>\r
                #include <avr/interrupt.h>\r
                #include <stdbool.h>\r
                #include <avr/io.h>\r
                #include <avr/interrupt.h>\r
                #include <stdbool.h>\r

-               #include <stddef.h>\r

                \r
                #include "../LowLevel/LowLevel.h"\r
                \r
                #include "../LowLevel/LowLevel.h"\r

-               #include "StdRequestType.h"\r
-               #include "USBMode.h"\r

                #include "Events.h"\r
                #include "Events.h"\r

+               #include "StdRequestType.h"\r

                #include "StdDescriptors.h"\r
                #include "StdDescriptors.h"\r

+               #include "USBMode.h"\r
+\r
+               #if defined(USB_CAN_BE_DEVICE)\r
+                       #include "../LowLevel/DevChapter9.h"\r
+               #endif\r

 \r
                #if defined(USB_CAN_BE_HOST)\r
                        #include "../LowLevel/HostChapter9.h"\r
 \r
                #if defined(USB_CAN_BE_HOST)\r
                        #include "../LowLevel/HostChapter9.h"\r

-               #endif          \r
+               #endif\r

                \r
        /* Enable C linkage for C++ Compilers: */\r
                #if defined(__cplusplus)\r
                \r
        /* Enable C linkage for C++ Compilers: */\r
                #if defined(__cplusplus)\r


@@ -65,7 +68,7 @@
                        extern volatile bool USB_IsInitialized;\r
 \r
                        /** Structure containing the last received Control request when in Device mode (for use in user-applications\r
                        extern volatile bool USB_IsInitialized;\r
 \r
                        /** Structure containing the last received Control request when in Device mode (for use in user-applications\r

-                        *  inside of the \ref EVENT_USB_UnhandledControlPacket() event, or for filling up with a control request to issue when\r
+                        *  inside of the \ref EVENT_USB_Device_UnhandledControlRequest() event, or for filling up with a control request to issue when\r

                         *  in Host mode before calling \ref USB_Host_SendControlRequest().\r
                         *\r
                         *  \ingroup Group_USBManagement\r
                         *  in Host mode before calling \ref USB_Host_SendControlRequest().\r
                         *\r
                         *  \ingroup Group_USBManagement\r


@@ -73,7 +76,7 @@
                         extern USB_Request_Header_t USB_ControlRequest;\r
                        \r
                        #if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)\r
                         extern USB_Request_Header_t USB_ControlRequest;\r
                        \r
                        #if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)\r

-                               #if !defined(HOST_STATE_AS_GPIOR1) || defined(__DOXYGEN__)\r
+                               #if !defined(HOST_STATE_AS_GPIOR) || defined(__DOXYGEN__)\r

                                        /** Indicates the current host state machine state. When in host mode, this indicates the state\r
                                         *  via one of the values of the \ref USB_Host_States_t enum values.\r
                                         *\r
                                        /** Indicates the current host state machine state. When in host mode, this indicates the state\r
                                         *  via one of the values of the \ref USB_Host_States_t enum values.\r
                                         *\r


@@ -97,7 +100,7 @@
                                #else\r
                                        #define _GET_HOST_GPIOR_NAME2(y) GPIOR ## y\r
                                        #define _GET_HOST_GPIOR_NAME(x)  _GET_HOST_GPIOR_NAME2(x)\r
                                #else\r
                                        #define _GET_HOST_GPIOR_NAME2(y) GPIOR ## y\r
                                        #define _GET_HOST_GPIOR_NAME(x)  _GET_HOST_GPIOR_NAME2(x)\r

-                                       #define USB_HostState _GET_HOST_GPIOR_NAME(HOST_STATE_AS_GPIOR)\r
+                                       #define USB_HostState            _GET_HOST_GPIOR_NAME(HOST_STATE_AS_GPIOR)\r

                                #endif\r
                        #endif\r
 \r
                                #endif\r
                        #endif\r
 \r


@@ -108,7 +111,7 @@
                                         *\r
                                         *  This value should not be altered by the user application as it is handled automatically by the\r
                                         *  library. The only exception to this rule is if the NO_LIMITED_CONTROLLER_CONNECT token is used\r
                                         *\r
                                         *  This value should not be altered by the user application as it is handled automatically by the\r
                                         *  library. The only exception to this rule is if the NO_LIMITED_CONTROLLER_CONNECT token is used\r

-                                        *  (see \ref EVENT_USB_Connect() and \ref EVENT_USB_Disconnect() events).\r
+                                        *  (see \ref EVENT_USB_Device_Connect() and \ref EVENT_USB_Device_Disconnect() events).\r

                                         *\r
                                         *  To reduce program size and speed up checks of this global, it can be placed into one of the AVR's\r
                                         *  GPIOR hardware registers instead of RAM by defining the DEVICE_STATE_AS_GPIOR token to a value \r
                                         *\r
                                         *  To reduce program size and speed up checks of this global, it can be placed into one of the AVR's\r
                                         *  GPIOR hardware registers instead of RAM by defining the DEVICE_STATE_AS_GPIOR token to a value \r


@@ -129,7 +132,7 @@
                                #else\r
                                        #define _GET_DEVICE_GPIOR_NAME2(y) GPIOR ## y\r
                                        #define _GET_DEVICE_GPIOR_NAME(x)  _GET_DEVICE_GPIOR_NAME2(x)\r
                                #else\r
                                        #define _GET_DEVICE_GPIOR_NAME2(y) GPIOR ## y\r
                                        #define _GET_DEVICE_GPIOR_NAME(x)  _GET_DEVICE_GPIOR_NAME2(x)\r

-                                       #define USB_DeviceState _GET_DEVICE_GPIOR_NAME(DEVICE_STATE_AS_GPIOR)\r
+                                       #define USB_DeviceState            _GET_DEVICE_GPIOR_NAME(DEVICE_STATE_AS_GPIOR)\r

                                #endif\r
                        #endif\r
 \r
                                #endif\r
                        #endif\r
 \r


@@ -142,12 +145,12 @@
                         *  The USB task must be serviced within 30ms while in device mode, or within 1ms while in host mode.\r
                         *  The task may be serviced at all times, or (for minimum CPU consumption):\r
                         *\r
                         *  The USB task must be serviced within 30ms while in device mode, or within 1ms while in host mode.\r
                         *  The task may be serviced at all times, or (for minimum CPU consumption):\r
                         *\r

-                        *    - In device mode, it may be disabled at start-up, enabled on the firing of the \ref EVENT_USB_Connect() event\r
-                        *    and disabled again on the firing of the \ref EVENT_USB_Disconnect() event.\r
+                        *    - In device mode, it may be disabled at start-up, enabled on the firing of the \ref EVENT_USB_Device_Connect() \r
+                        *      event and disabled again on the firing of the \ref EVENT_USB_Device_Disconnect() event.\r

                         *\r
                         *\r

-                        *    - In host mode, it may be disabled at start-up, enabled on the firing of the \ref EVENT_USB_DeviceAttached()\r
-                        *    event and disabled again on the firing of the \ref EVENT_USB_DeviceEnumerationComplete() or\r
-                        *    \ref EVENT_USB_DeviceEnumerationFailed() events.\r
+                        *    - In host mode, it may be disabled at start-up, enabled on the firing of the \ref EVENT_USB_Host_DeviceAttached()\r
+                        *      event and disabled again on the firing of the \ref EVENT_USB_Host_DeviceEnumerationComplete() or\r
+                        *      \ref EVENT_USB_Host_DeviceEnumerationFailed() events.\r

                         *\r
                         *  If in device mode (only), the control endpoint can instead be managed via interrupts entirely by the library\r
                         *  by defining the INTERRUPT_CONTROL_ENDPOINT token and passing it to the compiler via the -D switch.\r
                         *\r
                         *  If in device mode (only), the control endpoint can instead be managed via interrupts entirely by the library\r
                         *  by defining the INTERRUPT_CONTROL_ENDPOINT token and passing it to the compiler via the -D switch.\r


@@ -172,7 +175,9 @@
                        #endif\r
                        \r
                /* Macros: */\r
                        #endif\r
                        \r
                /* Macros: */\r

-                       #define HOST_TASK_NONBLOCK_WAIT(duration, nextstate) {USB_HostState = HOST_STATE_WaitForDevice; WaitMSRemaining = duration; PostWaitState = nextstate; }\r
+                       #define HOST_TASK_NONBLOCK_WAIT(duration, nextstate) MACROS{ USB_HostState = HOST_STATE_WaitForDevice; \\r
+                                                                                    WaitMSRemaining = (duration);             \\r
+                                                                                    PostWaitState = (nextstate);        }MACROE\r

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