X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/d38fa49cb6cb3804c9bb17601688a62ba466b535..e0420015df848f18d5eb1672da4ccac578d454cf:/LUFA/Drivers/USB/LowLevel/DevChapter9.h

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.h b/LUFA/Drivers/USB/LowLevel/DevChapter9.h
index 23b7b4620..65fa0418c 100644
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.h
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.h
@@ -35,12 +35,25 @@
 		#include <avr/io.h>
 		#include <avr/pgmspace.h>
 		#include <avr/eeprom.h>
+		#include <avr/boot.h>
+		#include <stdlib.h>
+		#include <ctype.h>
 		
 		#include "../HighLevel/StdDescriptors.h"
 		#include "../HighLevel/Events.h"
 		#include "../HighLevel/StdRequestType.h"
+		#include "../HighLevel/USBTask.h"
 		#include "LowLevel.h"
 
+	/* Preprocessor Checks: */
+		#if defined(USE_INTERNAL_SERIAL) && !(defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
+			#error USE_INTERNAL_SERIAL invalid, the selected AVR model does not contain unique serial bytes.
+		#endif
+		
+		#if defined(USE_INTERNAL_SERIAL) && (USE_INTERNAL_SERIAL <= 1)
+			#error USE_INTERNAL_SERIAL must be defined to the string descriptor index chosen for the serial number descriptor.
+		#endif
+
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
 			extern "C" {
@@ -80,29 +93,6 @@
 			 *  \ingroup Group_Device
 			 */
 			extern bool USB_CurrentlySelfPowered;
-
-		/* Throwable Events: */
-			/** This module raises the USB_UnhandledControlPacket event when a request to the default control
-			 *  endpoint has been received, but the library does not implement an internal handler for it.
-			 *
-			 *  \see Events.h for more information on this event.
-			 */
-			RAISES_EVENT(USB_UnhandledControlPacket);
-
-			/** This module raises the USB_ConfigurationChanged event when the host issues a REQ_SetConfiguration
-			 *  device request, to change the currently selected configuration number.
-			 *
-			 *  \see Events.h for more information on this event.
-			 */
-			RAISES_EVENT(USB_ConfigurationChanged);
-
-			/** This module raises the USB_DeviceEnumerationComplete event when the host has completed its
-			 *  enumeration of the device (i.e. when a REQ_SetConfiguration request changes the current configuration
-			 *  number from 0 to a non-zero value).
-			 *
-			 *  \see Events.h for more information on this event.
-			 */
-			RAISES_EVENT(USB_DeviceEnumerationComplete);
 	
 	/* Private Interface - For use in library only: */
 	#if !defined(__DOXYGEN__)
@@ -118,10 +108,8 @@
 				static void USB_Device_SetConfiguration(void);
 				static void USB_Device_GetConfiguration(void);
 				static void USB_Device_GetDescriptor(void);
-				static void USB_Device_GetStatus(const uint8_t bmRequestType);
-				#if !defined(FEATURELESS_CONTROL_ONLY_DEVICE)
-				static void USB_Device_ClearSetFeature(const uint8_t bRequest, const uint8_t bmRequestType);
-				#endif
+				static void USB_Device_GetStatus(void);
+				static void USB_Device_ClearSetFeature(void);
 			#endif
 	#endif