projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update UC3 platform driver support to use the bitmasks defined in the header files...
[pub/USBasp.git]
/
LUFA
/
Drivers
/
USB
/
Core
/
USBController.h
diff --git
a/LUFA/Drivers/USB/Core/USBController.h
b/LUFA/Drivers/USB/Core/USBController.h
index
0568dee
..
290ed9f
100644
(file)
--- a/
LUFA/Drivers/USB/Core/USBController.h
+++ b/
LUFA/Drivers/USB/Core/USBController.h
@@
-52,6
+52,11
@@
#include "../../../Common/Common.h"
\r
#include "USBMode.h"
\r
\r
#include "../../../Common/Common.h"
\r
#include "USBMode.h"
\r
\r
+ /* Enable C linkage for C++ Compilers: */
\r
+ #if defined(__cplusplus)
\r
+ extern "C" {
\r
+ #endif
\r
+
\r
/* Preprocessor Checks and Defines: */
\r
#if !defined(__INCLUDE_FROM_USB_DRIVER)
\r
#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
\r
/* Preprocessor Checks and Defines: */
\r
#if !defined(__INCLUDE_FROM_USB_DRIVER)
\r
#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
\r
@@
-61,7
+66,14
@@
#if (ARCH == ARCH_AVR8)
\r
#include "AVR8/USBController_AVR8.h"
\r
#elif (ARCH == ARCH_UC3)
\r
#if (ARCH == ARCH_AVR8)
\r
#include "AVR8/USBController_AVR8.h"
\r
#elif (ARCH == ARCH_UC3)
\r
- #include "UC3/USBController_UC3.h"
\r
+ #include "UC3/USBController_UC3.h"
\r
+ #elif (ARCH == ARCH_XMEGA)
\r
+ #include "XMEGA/USBController_XMEGA.h"
\r
+ #endif
\r
+
\r
+ /* Disable C linkage for C++ Compilers: */
\r
+ #if defined(__cplusplus)
\r
+ }
\r
#endif
\r
\r
#endif
\r
#endif
\r
\r
#endif
\r