X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/588886878e0fe948417123b57c108a1bd7992f85..03ee87b35abdb8b92e8b55ec040fa943f9a6786c:/LUFA/Drivers/USB/USB.h?ds=sidebyside

diff --git a/LUFA/Drivers/USB/USB.h b/LUFA/Drivers/USB/USB.h
index 223967008..8d4f2a449 100644
--- a/LUFA/Drivers/USB/USB.h
+++ b/LUFA/Drivers/USB/USB.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2009.
+     Copyright (C) Dean Camera, 2010.
               
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
 
 /*
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
-  Permission to use, copy, modify, and distribute this software
-  and its documentation for any purpose and without fee is hereby
-  granted, provided that the above copyright notice appear in all
-  copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
+  Permission to use, copy, modify, distribute, and sell this 
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
@@ -83,8 +83,8 @@
  *  <table>
  *  <tr>
  *   <th width="100px">USB Class</th> 
- *   <th width="80px">Device</th> 
- *   <th width="80px">Host</th> 
+ *   <th width="90px">Device Mode</th> 
+ *   <th width="90px">Host Mode</th> 
  *  </tr>
  *  <tr>
  *   <td>Audio</td>
@@ -113,13 +113,13 @@
  *  </tr>
  *  <tr>
  *   <td>Printer</td>
- *   <td bgcolor="#00EE00">Yes</td>
+ *   <td bgcolor="#EE0000">No</td>
 *    <td bgcolor="#00EE00">Yes</td>
  *  </tr>
  *  <tr>
  *   <td>RNDIS</td>
  *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
+ *   <td bgcolor="#00EE00">Yes</td>
  *  </tr>
  *  <tr>
  *   <td>Still Image</td>
@@ -132,19 +132,16 @@
 #ifndef __USB_H__
 #define __USB_H__
 
+	/* Includes: */
+		#include "HighLevel/USBMode.h"
+
 	/* Preprocessor Checks: */		
-		#if (!(defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__) ||  \
-		       defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__) ||  \
-			   defined(__AVR_AT90USB162__)  || defined(__AVR_AT90USB82__)  ||  \
-			   defined(__AVR_ATmega32U2__)  || defined(__AVR_ATmega16U2__) ||  \
-			   defined(__AVR_ATmega8U2__)   ||                                 \
-			   defined(__AVR_ATmega16U4__)  || defined(__AVR_ATmega32U4__) ||  \
-			   defined(__AVR_ATmega32U6__)))
+		#if (!defined(USB_SERIES_2_AVR) && !defined(USB_SERIES_4_AVR) && \
+		     !defined(USB_SERIES_6_AVR) && !defined(USB_SERIES_7_AVR))
 			#error The currently selected AVR model is not supported under the USB component of the LUFA library.
 		#endif
 		
 	/* Includes: */
-		#include "HighLevel/USBMode.h"
 		#include "HighLevel/USBTask.h"
 		#include "HighLevel/USBInterrupt.h"
 		#include "HighLevel/Events.h"