X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/c5eeedd522c12c8b4996594f3c4167393d0af7ff..be9d0a5aa97c84cc8723f69f2b88576965e386aa:/LUFA/Drivers/USB/HighLevel/USBTask.h

diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.h b/LUFA/Drivers/USB/HighLevel/USBTask.h
index 9138e687f..9c0abf013 100644
--- a/LUFA/Drivers/USB/HighLevel/USBTask.h
+++ b/LUFA/Drivers/USB/HighLevel/USBTask.h
@@ -35,17 +35,20 @@
 		#include <avr/io.h>
 		#include <avr/interrupt.h>
 		#include <stdbool.h>
-		#include <stddef.h>
 		
 		#include "../LowLevel/LowLevel.h"
-		#include "StdRequestType.h"
-		#include "USBMode.h"
 		#include "Events.h"
+		#include "StdRequestType.h"
 		#include "StdDescriptors.h"
+		#include "USBMode.h"
+
+		#if defined(USB_CAN_BE_DEVICE)
+			#include "../LowLevel/DevChapter9.h"
+		#endif
 
 		#if defined(USB_CAN_BE_HOST)
 			#include "../LowLevel/HostChapter9.h"
-		#endif		
+		#endif
 		
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
@@ -65,7 +68,7 @@
 			extern volatile bool USB_IsInitialized;
 
 			/** Structure containing the last received Control request when in Device mode (for use in user-applications
-			 *  inside of the \ref EVENT_USB_UnhandledControlPacket() event, or for filling up with a control request to issue when
+			 *  inside of the \ref EVENT_USB_Device_UnhandledControlRequest() event, or for filling up with a control request to issue when
 			 *  in Host mode before calling \ref USB_Host_SendControlRequest().
 			 *
 			 *  \ingroup Group_USBManagement
@@ -108,7 +111,7 @@
 					 *
 					 *  This value should not be altered by the user application as it is handled automatically by the
 					 *  library. The only exception to this rule is if the NO_LIMITED_CONTROLLER_CONNECT token is used
-					 *  (see \ref EVENT_USB_Connect() and \ref EVENT_USB_Disconnect() events).
+					 *  (see \ref EVENT_USB_Device_Connect() and \ref EVENT_USB_Device_Disconnect() events).
 					 *
 					 *  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 DEVICE_STATE_AS_GPIOR token to a value 
@@ -142,12 +145,12 @@
 			 *  The USB task must be serviced within 30ms while in device mode, or within 1ms while in host mode.
 			 *  The task may be serviced at all times, or (for minimum CPU consumption):
 			 *
-			 *    - In device mode, it may be disabled at start-up, enabled on the firing of the \ref EVENT_USB_Connect() event
-			 *    and disabled again on the firing of the \ref EVENT_USB_Disconnect() event.
+			 *    - In device mode, it may be disabled at start-up, enabled on the firing of the \ref EVENT_USB_Device_Connect() 
+			 *      event and disabled again on the firing of the \ref EVENT_USB_Device_Disconnect() event.
 			 *
-			 *    - In host mode, it may be disabled at start-up, enabled on the firing of the \ref EVENT_USB_DeviceAttached()
-			 *    event and disabled again on the firing of the \ref EVENT_USB_DeviceEnumerationComplete() or
-			 *    \ref EVENT_USB_DeviceEnumerationFailed() events.
+			 *    - In host mode, it may be disabled at start-up, enabled on the firing of the \ref EVENT_USB_Host_DeviceAttached()
+			 *      event and disabled again on the firing of the \ref EVENT_USB_Host_DeviceEnumerationComplete() or
+			 *      \ref EVENT_USB_Host_DeviceEnumerationFailed() events.
 			 *
 			 *  If in device mode (only), the control endpoint can instead be managed via interrupts entirely by the library
 			 *  by defining the INTERRUPT_CONTROL_ENDPOINT token and passing it to the compiler via the -D switch.