X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/cad5e9ffca70f4f5d3b486049088fd77dfa8f0ca..77a9df36a77d2523dd2bc24fa17f9f04c6c175c5:/LUFA/Drivers/USB/Core/USBController.h

diff --git a/LUFA/Drivers/USB/Core/USBController.h b/LUFA/Drivers/USB/Core/USBController.h
index 2df6df292..290ed9f08 100644
--- a/LUFA/Drivers/USB/Core/USBController.h
+++ b/LUFA/Drivers/USB/Core/USBController.h
@@ -50,11 +50,11 @@
 
 	/* Includes: */
 		#include "../../../Common/Common.h"
+		#include "USBMode.h"		
 
-		#if (ARCH == ARCH_AVR8)
-			#include "AVR8/USBController.h"
-		#elif (ARCH == ARCH_UC3B)
-			#include "UC3B/USBController.h"		
+	/* Enable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			extern "C" {
 		#endif
 
 	/* Preprocessor Checks and Defines: */
@@ -62,6 +62,20 @@
 			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
 		#endif
 
+	/* Architecture Includes: */
+		#if (ARCH == ARCH_AVR8)
+			#include "AVR8/USBController_AVR8.h"
+		#elif (ARCH == ARCH_UC3)
+			#include "UC3/USBController_UC3.h"
+		#elif (ARCH == ARCH_XMEGA)
+			#include "XMEGA/USBController_XMEGA.h"	
+		#endif
+
+	/* Disable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			}
+		#endif
+
 #endif
 
 /** @} */