X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/6a8e27f7ee43169b9f6eb928b12e00d6306618ff..18b0d408a9e68cbc1ce36da89d74a799d7fc31de:/Bootloaders/CDC/BootloaderCDC.h

diff --git a/Bootloaders/CDC/BootloaderCDC.h b/Bootloaders/CDC/BootloaderCDC.h
index e302a3966..d83b27f5e 100644
--- a/Bootloaders/CDC/BootloaderCDC.h
+++ b/Bootloaders/CDC/BootloaderCDC.h
@@ -46,12 +46,7 @@
 
 		#include "Descriptors.h"
 
-		#include <LUFA/Drivers/USB/USB.h>                // USB Functionality
-
-	/* Preprocessor Checks: */
-		#if !defined(SIGNATURE_0) || !defined(SIGNATURE_1) || !defined(SIGNATURE_2)
-			#error Device signature byte constants are not defined due to outdated avr-libc version. See demo documentation.
-		#endif
+		#include <LUFA/Drivers/USB/USB.h>
 
 	/* Macros: */
 		/** CDC Class Specific request to get the line encoding on a CDC-ACM virtual serial port, including the
@@ -83,16 +78,6 @@
 
 		/** Eight character bootloader firmware identifier reported to the host when requested */
 		#define SOFTWARE_IDENTIFIER          "LUFACDC"
-
-	/* Event Handlers: */
-		/** 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_ConfigurationChanged event when thrown by the library. */
-		HANDLES_EVENT(USB_ConfigurationChanged);
-
-		/** Indicates that this module will catch the USB_UnhandledControlPacket event when thrown by the library. */
-		HANDLES_EVENT(USB_UnhandledControlPacket);
 		
 	/* Type Defines: */
 		/** Type define for a non-returning pointer to the start of the loaded application in flash memory. */
@@ -119,7 +104,7 @@
 		};
 		
 		/** Enum for the possible parity modes on a CDC-ACM virtual serial port */
-		enum BootloaderCDC_CDC_LineCodeingParity_t
+		enum BootloaderCDC_CDC_LineCodingParity_t
 		{
 			Parity_None         = 0, /**< No data parity checking */
 			Parity_Odd          = 1, /**< Odd data parity checking */
@@ -128,10 +113,14 @@
 			Parity_Space        = 4, /**< Space data parity checking */
 		};
 		
-	/* Tasks: */
-		TASK(CDC_Task);
-
 	/* Function Prototypes: */
+		void CDC_Task(void);
+		void SetupHardware(void);
+		void ResetHardware(void);
+
+		void EVENT_USB_Device_ConfigurationChanged(void);
+		void EVENT_USB_Device_UnhandledControlRequest(void);
+
 		#if defined(INCLUDE_FROM_BOOTLOADERCDC_C) || defined(__DOXYGEN__)
 			static void    ReadWriteMemoryBlock(const uint8_t Command);
 			static uint8_t FetchNextCommandByte(void);