X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/ed031c1df2f5b053b9cd9f48c63e66a42b7c049e..31d8ebebc0796873f7c70db80a04acdcbb307ed8:/Demos/OTG/TestApp/TestEvents.h

diff --git a/Demos/OTG/TestApp/TestEvents.h b/Demos/OTG/TestApp/TestEvents.h
index 6ba06aed8..ee00dd728 100644
--- a/Demos/OTG/TestApp/TestEvents.h
+++ b/Demos/OTG/TestApp/TestEvents.h
@@ -39,64 +39,11 @@
 	/* Includes: */
 		#include <avr/io.h>
 
-		#include <LUFA/Common/Common.h>                          // Commonly used macros
-		#include <LUFA/Drivers/USB/USB.h>                        // USB Functionality
-		#include <LUFA/Drivers/Board/LEDs.h>                     // LED driver
-		#include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h>       // USART Stream driver
-		#include <LUFA/Drivers/Misc/TerminalCodes.h>             // ANSI Terminal Escape Codes
-		#include <LUFA/Scheduler/Scheduler.h>                    // Simple scheduler for task management
-
-	/* Event Catch List: */
-		/** Indicates that this module will catch the USB_VBUSChange event when thrown by the library. */
-		HANDLES_EVENT(USB_VBUSChange);
-
-		/** Indicates that this module will catch the USB_VBUSConnect event when thrown by the library. */
-		HANDLES_EVENT(USB_VBUSConnect);
-
-		/** Indicates that this module will catch the USB_VBUSDisconnect event when thrown by the library. */
-		HANDLES_EVENT(USB_VBUSDisconnect);
-
-		/** Indicates that this module will catch the USB_Connect event when thrown by the library. */
-		HANDLES_EVENT(USB_Connect);
-
-		/** Indicates that this module will catch the USB_Disconnect event when thrown by the library. */
-		HANDLES_EVENT(USB_Disconnect);
-
-		/** Indicates that this module will catch the USB_Suspend event when thrown by the library. */
-		HANDLES_EVENT(USB_Suspend);
-
-		/** Indicates that this module will catch the USB_WakeUp event when thrown by the library. */
-		HANDLES_EVENT(USB_WakeUp);
-
-		/** Indicates that this module will catch the USB_Reset event when thrown by the library. */
-		HANDLES_EVENT(USB_Reset);
-
-		/** Indicates that this module will catch the USB_UIDChange event when thrown by the library. */
-		HANDLES_EVENT(USB_UIDChange);
-
-		/** Indicates that this module will catch the USB_PowerOnFail event when thrown by the library. */
-		HANDLES_EVENT(USB_PowerOnFail);
-
-		/** Indicates that this module will catch the USB_HostError event when thrown by the library. */
-		HANDLES_EVENT(USB_HostError);
-
-		/** Indicates that this module will catch the USB_DeviceEnumerationFailed event when thrown by the library. */
-		HANDLES_EVENT(USB_DeviceEnumerationFailed);
-
-		/** Indicates that this module will catch the USB_DeviceError event when thrown by the library. */
-		HANDLES_EVENT(USB_DeviceError);
-
-		/** Indicates that this module will catch the USB_UnhandledControlPacket event when thrown by the library. */
-		HANDLES_EVENT(USB_UnhandledControlPacket);
-
-		/** Indicates that this module will catch the USB_ConfigurationChanged event when thrown by the library. */
-		HANDLES_EVENT(USB_ConfigurationChanged);
-
-		/** Indicates that this module will catch the USB_DeviceAttached event when thrown by the library. */
-		HANDLES_EVENT(USB_DeviceAttached);
-
-		/** Indicates that this module will catch the USB_DeviceUnattached event when thrown by the library. */
-		HANDLES_EVENT(USB_DeviceUnattached);
+		#include <LUFA/Common/Common.h>
+		#include <LUFA/Drivers/USB/USB.h>
+		#include <LUFA/Drivers/Board/LEDs.h>
+		#include <LUFA/Drivers/Peripheral/SerialStream.h>
+		#include <LUFA/Drivers/Misc/TerminalCodes.h>
 
 	/* Macros: */
 		/** Prefix sent through the USART when an even fires before the actual event message. */
@@ -107,4 +54,19 @@
 			static void Abort_Program(void) ATTR_NO_RETURN;
 		#endif
 
+		void EVENT_USB_InitFailure(const uint8_t ErrorCode);
+		void EVENT_USB_UIDChange(void);
+		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);
+		void EVENT_USB_Host_DeviceAttached(void);
+		void EVENT_USB_Host_DeviceUnattached(void);
+		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);
+		void EVENT_USB_Host_DeviceEnumerationComplete(void);
+		void EVENT_USB_Device_Connect(void);
+		void EVENT_USB_Device_Disconnect(void);
+		void EVENT_USB_Device_ConfigurationChanged(void);
+		void EVENT_USB_Device_ConfigurationChanged(void);
+		void EVENT_USB_Device_Suspend(void);
+		void EVENT_USB_Device_WakeUp(void);
+		void EVENT_USB_Device_Reset(void);	
+		
 #endif