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
/
Endpoint.h
diff --git
a/LUFA/Drivers/USB/Core/Endpoint.h
b/LUFA/Drivers/USB/Core/Endpoint.h
index
557df2c
..
877f0c1
100644
(file)
--- a/
LUFA/Drivers/USB/Core/Endpoint.h
+++ b/
LUFA/Drivers/USB/Core/Endpoint.h
@@
-45,7
+45,7
@@
\r
/** \ingroup Group_EndpointRW
\r
* \defgroup Group_EndpointPrimitiveRW Read/Write of Primitive Data Types
\r
\r
/** \ingroup Group_EndpointRW
\r
* \defgroup Group_EndpointPrimitiveRW Read/Write of Primitive Data Types
\r
- * \brief Endpoint data prim
a
tive read/write definitions.
\r
+ * \brief Endpoint data prim
i
tive read/write definitions.
\r
*
\r
* Functions, macros, variables, enums and types related to data reading and writing of primitive data types
\r
* from and to endpoints.
\r
*
\r
* Functions, macros, variables, enums and types related to data reading and writing of primitive data types
\r
* from and to endpoints.
\r
@@
-74,6
+74,12
@@
\r
/* Includes: */
\r
#include "../../../Common/Common.h"
\r
\r
/* Includes: */
\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: */
\r
#if !defined(__INCLUDE_FROM_USB_DRIVER)
\r
\r
/* Preprocessor Checks: */
\r
#if !defined(__INCLUDE_FROM_USB_DRIVER)
\r
@@
-100,8
+106,15
@@
/* Architecture Includes: */
\r
#if (ARCH == ARCH_AVR8)
\r
#include "AVR8/Endpoint_AVR8.h"
\r
/* Architecture Includes: */
\r
#if (ARCH == ARCH_AVR8)
\r
#include "AVR8/Endpoint_AVR8.h"
\r
- #elif (ARCH == ARCH_UC3B)
\r
- #include "UC3B/Endpoint_UC3B.h"
\r
+ #elif (ARCH == ARCH_UC3)
\r
+ #include "UC3/Endpoint_UC3.h"
\r
+ #elif (ARCH == ARCH_XMEGA)
\r
+ #include "XMEGA/Endpoint_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