Fix board name redefinition in BoardTypes.h (thanks to Daniel Czigany).

[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 1637fb4..4eb1b8b 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBTask.h
+++ b/LUFA/Drivers/USB/HighLevel/USBTask.h
@@ -42,22 +42,22 @@
 #define __USBTASK_H__
 
        /* Includes: */
 #define __USBTASK_H__
 
        /* Includes: */

-               #include <avr/io.h>

                #include <avr/interrupt.h>
                #include <avr/interrupt.h>

+               #include <stdint.h>

                #include <stdbool.h>
                
                #include <stdbool.h>
                

-               #include "../LowLevel/LowLevel.h"
+               #include "../LowLevel/USBController.h"

                #include "Events.h"
                #include "StdRequestType.h"
                #include "StdDescriptors.h"
                #include "USBMode.h"
 
                #if defined(USB_CAN_BE_DEVICE)
                #include "Events.h"
                #include "StdRequestType.h"
                #include "StdDescriptors.h"
                #include "USBMode.h"
 
                #if defined(USB_CAN_BE_DEVICE)

-                       #include "../LowLevel/DevChapter9.h"
+                       #include "DeviceStandardReq.h"

                #endif
 
                #if defined(USB_CAN_BE_HOST)
                #endif
 
                #if defined(USB_CAN_BE_HOST)

-                       #include "../LowLevel/HostChapter9.h"
+                       #include "HostStandardReq.h"

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


@@ -97,7 +97,7 @@
                                         *
                                         *  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
                                         *
                                         *  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.
+                                        *  the library internally.

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


@@ -107,7 +107,7 @@
                                         *
                                         *  \note This global is only present if the user application can be a USB host.
                                         *
                                         *
                                         *  \note This global is only present if the user application can be a USB host.
                                         *

-                                        *  \see \ref USB_Host_States_t for a list of possible device states
+                                        *  \see \ref USB_Host_States_t for a list of possible device states.

                                         *
                                         *  \ingroup Group_Host
                                         */
                                         *
                                         *  \ingroup Group_Host
                                         */


@@ -140,7 +140,7 @@
                                         *  \note This variable should be treated as read-only in the user application, and never manually
                                         *        changed in value except in the circumstances outlined above.
                                         *
                                         *  \note This variable should be treated as read-only in the user application, and never manually
                                         *        changed in value except in the circumstances outlined above.
                                         *

-                                        *  \see \ref USB_Device_States_t for a list of possible device states
+                                        *  \see \ref USB_Device_States_t for a list of possible device states.

                                         *
                                         *  \ingroup Group_Device
                                         */
                                         *
                                         *  \ingroup Group_Device
                                         */


@@ -153,7 +153,7 @@
                        #endif
 
                /* Function Prototypes: */
                        #endif
 
                /* Function Prototypes: */

-                       /** This is the main USB management task. The USB driver requires that this task be executed
+                       /** This is the main USB management task. The USB driver requires this task to be executed

                         *  continuously when the USB system is active (device attached in host mode, or attached to a host
                         *  in device mode) in order to manage USB communications. This task may be executed inside an RTOS,
                         *  fast timer ISR or the main user application loop.
                         *  continuously when the USB system is active (device attached in host mode, or attached to a host
                         *  in device mode) in order to manage USB communications. This task may be executed inside an RTOS,
                         *  fast timer ISR or the main user application loop.


@@ -191,9 +191,9 @@
                        #endif
                        
                /* Macros: */
                        #endif
                        
                /* Macros: */

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

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