X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/cd0bd7bf90e7e64a42b1efcee5a60cfdfc91d7a2..f429975e01c4a7b76e5bafccf4e8e41489c58340:/LUFA/Common/ArchitectureSpecific.h

diff --git a/LUFA/Common/ArchitectureSpecific.h b/LUFA/Common/ArchitectureSpecific.h
index 1a05be812..4c562819a 100644
--- a/LUFA/Common/ArchitectureSpecific.h
+++ b/LUFA/Common/ArchitectureSpecific.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2012.
+     Copyright (C) Dean Camera, 2013.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
@@ -66,11 +66,11 @@
 			#if (ARCH == ARCH_AVR8) || (ARCH == ARCH_XMEGA) || defined(__DOXYGEN__)
 				#if (ARCH == ARCH_AVR8) || defined(__DOXYGEN__)
 					/** Re-enables the AVR's JTAG bus in software, until a system reset. This will re-enable JTAG debugging
-					 *  interface after is has been disbled in software via \ref JTAG_DISABLE().
+					 *  interface after is has been disabled in software via \ref JTAG_DISABLE().
 					 *
 					 *  \note This macro is not available for all architectures.
 					 */
-					#define JTAG_ENABLE()                  MACROS{                                      \
+					#define JTAG_ENABLE()                  MACROS{                                       \
 																	__asm__ __volatile__ (               \
 																	"in __tmp_reg__,__SREG__" "\n\t"     \
 																	"cli" "\n\t"                         \
@@ -136,7 +136,7 @@
 				 *
 				 *  \param[in] Condition  Condition that will be evaluated,
 				 */
-				#define STDOUT_ASSERT(Condition)        MACROS{ if (!(x)) {                                             \
+				#define STDOUT_ASSERT(Condition)        MACROS{ if (!(Condition)) {                                     \
 				                                                     printf_P(PSTR("%s: Function \"%s\", Line %d: "     \
 				                                                                   "Assertion \"%s\" failed.\r\n"),     \
 				                                                                   __FILE__, __func__, __LINE__, #Condition); } }MACROE
@@ -160,7 +160,7 @@
 				#define JTAG_DEBUG_POINT()              __asm__ __volatile__ ("nop" ::)
 				#define JTAG_DEBUG_BREAK()              __asm__ __volatile__ ("breakpoint" ::)
 				#define JTAG_ASSERT(Condition)          MACROS{ if (!(Condition)) { JTAG_DEBUG_BREAK(); } }MACROE
-				#define STDOUT_ASSERT(Condition)        MACROS{ if (!(x)) {                                      \
+				#define STDOUT_ASSERT(Condition)        MACROS{ if (!(Condition)) {                              \
 				                                                     printf("%s: Function \"%s\", Line %d: "     \
 				                                                            "Assertion \"%s\" failed.\r\n"),     \
 				                                                            __FILE__, __func__, __LINE__, #Condition); } }MACROE