X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/fc5fa769ef3389271547a2b3f452962996b69f50..3223786c49335e732ed5719510c24b4c50ff8b46:/LUFA/Common/ArchitectureSpecific.h?ds=sidebyside

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