diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2012-06-09 13:00:56 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-06-09 13:00:56 +0000 |
| commit | cd0bd7bf90e7e64a42b1efcee5a60cfdfc91d7a2 (patch) | |
| tree | a2d5f03d455543dbf5b383e28a39268e6d2881aa /LUFA/Common | |
| parent | 7abaafb3cabbe66516b5be2a6708d04604bc2740 (diff) | |
| download | lufa-cd0bd7bf90e7e64a42b1efcee5a60cfdfc91d7a2.tar.gz lufa-cd0bd7bf90e7e64a42b1efcee5a60cfdfc91d7a2.tar.bz2 lufa-cd0bd7bf90e7e64a42b1efcee5a60cfdfc91d7a2.zip | |
Added new JTAG_ENABLE() macro for the AVR8 architecture. Fixed the JTAG_DISABLE() macro clearing all other bits in MCUSR when called.
Moved the XPLAIN board specific bootloader entry condition code to the Application_Jump_Check() function of the DFU bootloader, added support for the original XPLAIN board to the CDC class bootloader.
Diffstat (limited to 'LUFA/Common')
| -rw-r--r-- | LUFA/Common/ArchitectureSpecific.h | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/LUFA/Common/ArchitectureSpecific.h b/LUFA/Common/ArchitectureSpecific.h index f7dca6631..1a05be812 100644 --- a/LUFA/Common/ArchitectureSpecific.h +++ b/LUFA/Common/ArchitectureSpecific.h @@ -65,6 +65,24 @@ /* 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 disbled 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. @@ -79,7 +97,7 @@ "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 |