From e1c1c256192c099f5bfa23946c050aa5954aca4a Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Tue, 29 Dec 2009 05:18:16 +0000 Subject: Change the AVRISP project's RESET LINE makefile tokens to AUX LINE, as it is not always used for target reset. --- Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c | 8 ++++---- Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'Projects/AVRISP-MKII/Lib/XPROG') diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c index def34991f..856b48903 100644 --- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c +++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c @@ -189,8 +189,8 @@ void XPROGTarget_EnableTargetTPI(void) IsSending = false; /* Set /RESET line low for at least 90ns to enable TPI functionality */ - RESET_LINE_DDR |= RESET_LINE_MASK; - RESET_LINE_PORT &= ~RESET_LINE_MASK; + AUX_LINE_DDR |= AUX_LINE_MASK; + AUX_LINE_PORT &= ~AUX_LINE_MASK; asm volatile ("NOP"::); asm volatile ("NOP"::); @@ -269,8 +269,8 @@ void XPROGTarget_DisableTargetTPI(void) #endif /* Tristate target /RESET line */ - RESET_LINE_DDR &= ~RESET_LINE_MASK; - RESET_LINE_PORT &= ~RESET_LINE_MASK; + AUX_LINE_DDR &= ~AUX_LINE_MASK; + AUX_LINE_PORT &= ~AUX_LINE_MASK; } /** Sends a byte via the USART. diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h index f4c3b7b1d..3bbf454be 100644 --- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h +++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h @@ -63,10 +63,10 @@ #define BITBANG_PDIDATA_PIN PINB #define BITBANG_PDIDATA_MASK (1 << 3) - #define BITBANG_PDICLOCK_PORT RESET_LINE_PORT - #define BITBANG_PDICLOCK_DDR RESET_LINE_DDR - #define BITBANG_PDICLOCK_PIN RESET_LINE_PIN - #define BITBANG_PDICLOCK_MASK RESET_LINE_MASK + #define BITBANG_PDICLOCK_PORT AUX_LINE_PORT + #define BITBANG_PDICLOCK_DDR AUX_LINE_DDR + #define BITBANG_PDICLOCK_PIN AUX_LINE_PIN + #define BITBANG_PDICLOCK_MASK AUX_LINE_MASK #define BITBANG_TPIDATA_PORT PORTB #define BITBANG_TPIDATA_DDR DDRB -- cgit v1.2.3