Fix compile error on the UC3 targets when INTERRUPT_CONTROL_ENDPOINT compile time...

[pub/USBasp.git] / LUFA / Common / ArchitectureSpecific.h

diff --git a/LUFA/Common/ArchitectureSpecific.h b/LUFA/Common/ArchitectureSpecific.h
index 4f29be6..502723f 100644 (file)
--- a/LUFA/Common/ArchitectureSpecific.h
+++ b/LUFA/Common/ArchitectureSpecific.h
@@ -56,6 +56,11 @@
                        #error Do not include this file directly. Include LUFA/Common/Common.h instead to gain this functionality.\r
                #endif\r
                \r
+       /* Enable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       extern "C" {\r
+               #endif\r
+\r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        #if (ARCH == ARCH_AVR8) || defined(__DOXYGEN__)\r
@@ -84,14 +89,14 @@
                                 *\r
                                 *  \note This macro is not available for all architectures.\r
                                 */\r
-                               #define JTAG_DEBUG_POINT()              __asm__ __volatile__ ("NOP" ::)\r
+                               #define JTAG_DEBUG_POINT()              __asm__ __volatile__ ("nop" ::)\r
 \r
                                /** Defines an explicit JTAG break point in the resulting binary via the assembly \c BREAK statement. When\r
                                 *  a JTAG is used, this causes the program execution to halt when reached until manually resumed.\r
                                 *\r
                                 *  \note This macro is not available for all architectures.\r
                                 */\r
-                               #define JTAG_DEBUG_BREAK()              __asm__ __volatile__ ("BREAK" ::)\r
+                               #define JTAG_DEBUG_BREAK()              __asm__ __volatile__ ("break" ::)\r
 \r
                                /** Macro for testing condition "x" and breaking via \ref JTAG_DEBUG_BREAK() if the condition is false.\r
                                 *\r
@@ -99,7 +104,7 @@
                                 *\r
                                 *  \param[in] Condition  Condition that will be evaluated.\r
                                */\r
-                               #define JTAG_DEBUG_ASSERT(Condition)    MACROS{ if (!(Condition)) { JTAG_DEBUG_BREAK(); } }MACROE\r
+                               #define JTAG_ASSERT(Condition)          MACROS{ if (!(Condition)) { JTAG_DEBUG_BREAK(); } }MACROE\r
 \r
                                /** Macro for testing condition \c "x" and writing debug data to the stdout stream if \c false. The stdout stream\r
                                 *  must be pre-initialized before this macro is run and linked to an output device, such as the microcontroller's\r