X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/7d4cccc22d60125fac111819df48af1873d11018..d0db78432fc02bacbd57cc9f15eb05b4e56981cb:/LUFA/Drivers/USB/HighLevel/USBMode.h

diff --git a/LUFA/Drivers/USB/HighLevel/USBMode.h b/LUFA/Drivers/USB/HighLevel/USBMode.h
index 138af9ed0..8664c1b7c 100644
--- a/LUFA/Drivers/USB/HighLevel/USBMode.h
+++ b/LUFA/Drivers/USB/HighLevel/USBMode.h
@@ -41,12 +41,15 @@
 				#define USB_DEVICE_ONLY
 			#endif
 			
-			#if (defined(__AVR_AT90USB162__)  || defined(__AVR_AT90USB82__))
-				#define USB_LIMITED_CONTROLLER
+			#if (defined(__AVR_AT90USB162__) || defined(__AVR_AT90USB82__) || \
+			     defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega8U2__))
+				#define USB_SERIES_2_AVR
 			#elif (defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__))
-				#define USB_MODIFIED_FULL_CONTROLLER
-			#else
-				#define USB_FULL_CONTROLLER
+				#define USB_SERIES_4_AVR
+			#elif (defined(__AVR_ATmega32U6__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__))
+				#define USB_SERIES_6_AVR
+			#elif (defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1287__))
+				#define USB_SERIES_7_AVR
 			#endif			
 
 			#if (!defined(USB_DEVICE_ONLY) && !defined(USB_HOST_ONLY))
@@ -55,20 +58,22 @@
 				#define USB_CAN_BE_DEVICE
 			#elif defined(USB_HOST_ONLY)
 				#define USB_CAN_BE_HOST
+
 				#define USB_CurrentMode USB_MODE_HOST
 			#elif defined(USB_DEVICE_ONLY)
 				#define USB_CAN_BE_DEVICE
+
 				#define USB_CurrentMode USB_MODE_DEVICE
 			#endif
 			
+			#if (!defined(USB_SERIES_7_AVR) && defined(USB_HOST_ONLY))
+				#error USB_HOST_ONLY is not available for the currently selected USB AVR model.
+			#endif
+			
 			#if (defined(USB_HOST_ONLY) && defined(USB_DEVICE_ONLY))
 				#error USB_HOST_ONLY and USB_DEVICE_ONLY are mutually exclusive.
 			#endif
 
-			#if (defined(USE_RAM_DESCRIPTORS) && defined(USE_EEPROM_DESCRIPTORS))
-				#error USE_RAM_DESCRIPTORS and USE_EEPROM_DESCRIPTORS are mutually exclusive.
-			#endif
-
 			#if defined(USE_STATIC_OPTIONS)
 				#define USB_Options USE_STATIC_OPTIONS
 			#endif