Minor code style fixes, documentation improvements.

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

diff --git a/LUFA/Common/ArchitectureSpecific.h b/LUFA/Common/ArchitectureSpecific.h
index f7dca66..e7608d4 100644 (file)
--- a/LUFA/Common/ArchitectureSpecific.h
+++ b/LUFA/Common/ArchitectureSpecific.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2012.
+     Copyright (C) Dean Camera, 2014.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2014  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
 
   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.
 
   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
   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


@@ -65,6 +65,24 @@
                /* Macros: */
                        #if (ARCH == ARCH_AVR8) || (ARCH == ARCH_XMEGA) || defined(__DOXYGEN__)
                                #if (ARCH == ARCH_AVR8) || defined(__DOXYGEN__)
                /* Macros: */
                        #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 disabled in software via \ref JTAG_DISABLE().
+                                        *
+                                        *  \note This macro is not available for all architectures.
+                                        */
+                                       #define JTAG_ENABLE()                  MACROS{                                       \
+                                                                                                                                       __asm__ __volatile__ (               \
+                                                                                                                                       "in __tmp_reg__,__SREG__" "\n\t"     \
+                                                                                                                                       "cli" "\n\t"                         \
+                                                                                                                                       "out %1, %0" "\n\t"                  \
+                                                                                                                                       "out __SREG__, __tmp_reg__" "\n\t"   \
+                                                                                                                                       "out %1, %0" "\n\t"                  \
+                                                                                                                                       :                                    \
+                                                                                                                                       : "r" (MCUCR & ~(1 << JTD)),         \
+                                                                                                                                         "M" (_SFR_IO_ADDR(MCUCR))          \
+                                                                                                                                       : "r0");                             \
+                                                                                                                       }MACROE
+

                                        /** Disables the AVR's JTAG bus in software, until a system reset. This will override the current JTAG
                                         *  status as set by the JTAGEN fuse, disabling JTAG debugging and reverting the JTAG pins back to GPIO
                                         *  mode.
                                        /** Disables the AVR's JTAG bus in software, until a system reset. This will override the current JTAG
                                         *  status as set by the JTAGEN fuse, disabling JTAG debugging and reverting the JTAG pins back to GPIO
                                         *  mode.


@@ -79,7 +97,7 @@
                                                                                                                                        "out __SREG__, __tmp_reg__" "\n\t"   \
                                                                                                                                        "out %1, %0" "\n\t"                  \
                                                                                                                                        :                                    \
                                                                                                                                        "out __SREG__, __tmp_reg__" "\n\t"   \
                                                                                                                                        "out %1, %0" "\n\t"                  \
                                                                                                                                        :                                    \

-                                                                                                                                       : "r" (1 << JTD),                    \
+                                                                                                                                       : "r" (MCUCR | (1 << JTD)),          \

                                                                                                                                          "M" (_SFR_IO_ADDR(MCUCR))          \
                                                                                                                                        : "r0");                             \
                                                                                                                        }MACROE
                                                                                                                                          "M" (_SFR_IO_ADDR(MCUCR))          \
                                                                                                                                        : "r0");                             \
                                                                                                                        }MACROE


@@ -118,14 +136,14 @@
                                 *
                                 *  \param[in] Condition  Condition that will be evaluated,
                                 */
                                 *
                                 *  \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
 
                                #if !defined(pgm_read_ptr) || defined(__DOXYGEN__)
                                        /** Reads a pointer out of PROGMEM space on the AVR8 architecture. This is currently a wrapper for the
                                                                                     printf_P(PSTR("%s: Function \"%s\", Line %d: "     \
                                                                                                   "Assertion \"%s\" failed.\r\n"),     \
                                                                                                   __FILE__, __func__, __LINE__, #Condition); } }MACROE
 
                                #if !defined(pgm_read_ptr) || defined(__DOXYGEN__)
                                        /** Reads a pointer out of PROGMEM space on the AVR8 architecture. This is currently a wrapper for the

-                                        *  avr-libc \c pgm_read_ptr() macro with a \c void* cast, so that its value can be assigned directly
+                                        *  avr-libc \c pgm_read_word() macro with a \c void* cast, so that its value can be assigned directly

                                         *  to a pointer variable or used in pointer arithmetic without further casting in C. In a future
                                         *  avr-libc distribution this will be part of the standard API and will be implemented in a more formal
                                         *  manner.
                                         *  to a pointer variable or used in pointer arithmetic without further casting in C. In a future
                                         *  avr-libc distribution this will be part of the standard API and will be implemented in a more formal
                                         *  manner.


@@ -142,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 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
                                                                                     printf("%s: Function \"%s\", Line %d: "     \
                                                                                            "Assertion \"%s\" failed.\r\n"),     \
                                                                                            __FILE__, __func__, __LINE__, #Condition); } }MACROE