From e1c1c256192c099f5bfa23946c050aa5954aca4a Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Tue, 29 Dec 2009 05:18:16 +0000 Subject: [PATCH] Change the AVRISP project's RESET LINE makefile tokens to AUX LINE, as it is not always used for target reset. --- Projects/AVRISP-MKII/AVRISP.txt | 34 +++++++++++--------- Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c | 10 +++--- Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c | 8 ++--- Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h | 8 ++--- Projects/AVRISP-MKII/makefile | 8 ++--- 5 files changed, 36 insertions(+), 32 deletions(-) diff --git a/Projects/AVRISP-MKII/AVRISP.txt b/Projects/AVRISP-MKII/AVRISP.txt index 8ea8c8dac1..9bed59e566 100644 --- a/Projects/AVRISP-MKII/AVRISP.txt +++ b/Projects/AVRISP-MKII/AVRISP.txt @@ -109,7 +109,7 @@ * * * 1 Optional, see \ref SSec_Options section - for USB AVRs with ADC modules only \n - * 2 See \ref SSec_Options section + * 2 See AUX line related tokens in the \ref SSec_Options section * * \section Sec_PDI PDI Connections * Connections to the device for PDI programming1 (when enabled): @@ -153,7 +153,8 @@ * * * 1 When XPROG_VIA_HARDWARE_USART is set, the AVR's Tx and Rx become the DATA line when connected together - * via a pair of 300 ohm resistors, and the AVR's XCK pin becomes CLOCK. + * via a pair of 300 ohm resistors, and the AVR's XCK pin becomes CLOCK. \n + * 2 See AUX line related tokens in the \ref SSec_Options section * * \section Sec_TPI TPI Connections * Connections to the device for TPI programming1 (when enabled): @@ -197,7 +198,8 @@ * * * 1 When XPROG_VIA_HARDWARE_USART is set, the AVR's Tx and Rx become the DATA line when connected together - * via a pair of 300 ohm resistors, and the AVR's XCK pin becomes CLOCK. + * via a pair of 300 ohm resistors, and the AVR's XCK pin becomes CLOCK. \n + * 2 See AUX line related tokens in the \ref SSec_Options section * * \section SSec_Options Project Options * @@ -210,27 +212,29 @@ * Description: * * - * RESET_LINE_PORT + * AUX_LINE_PORT * Makefile CDEFS - * PORT register for the programmer's target RESET line. Ignored when compiled for the XPLAIN board. + * PORT register for the programmer's AUX target line. The use of this line varies between the programming protocols, + * but is generally used for the target's /RESET line. Ignored when compiled for the XPLAIN board. * * - * RESET_LINE_PIN + * AUX_LINE_PIN * Makefile CDEFS - * PIN register for the programmer's target RESET line. Ignored when compiled for the XPLAIN board. + * PIN register for the programmer's AUX target line. The use of this line varies between the programming protocols, + * but is generally used for the target's /RESET line. Ignored when compiled for the XPLAIN board. * * - * RESET_LINE_DDR + * AUX_LINE_DDR * Makefile CDEFS - * DDR register for the programmer's target RESET line. Ignored when compiled for the XPLAIN board. + * DDR register for the programmer's AUX target line. The use of this line varies between the programming protocols, + * but is generally used for the target's /RESET line. Ignored when compiled for the XPLAIN board. * * - * RESET_LINE_MASK + * AUX_LINE_MASK * Makefile CDEFS - * Mask for the programmer's target RESET line on the chosen port. Must not be the AVR's /SS pin, as the - * target pins are tri-stated when not in use, and low signals on the /SS pin will force SPI slave mode when the - * pin is configured as an input. When in PDI programming mode, this is the target clock pin. - * Ignored when compiled for the XPLAIN board. + * Mask for the programmer's AUX target line. The use of this line varies between the programming protocols, + * but is generally used for the target's /RESET line. Must not be the AVR's /SS pin. Ignored when + * compiled for the XPLAIN board. * * * VTARGET_ADC_CHANNEL @@ -252,7 +256,7 @@ * Makefile CDEFS * Define to force the PDI and TPI protocols (when enabled) to use the much faster hardware USART instead of bit-banging * to match the official AVRISP pinout. This breaks pinout compatibility with the official AVRISP MKII (and requires - * seperate ISP and PDI/TPI programming headers) but increases programming speed dramatically. + * seperate ISP, PDI, and TPI programming headers) but increases programming speed dramatically. * Ignored when compiled for the XPLAIN board. * * diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c index ebaf2f3e56..1bd688701b 100644 --- a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c +++ b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c @@ -84,15 +84,15 @@ void ISPTarget_ChangeTargetResetLine(const bool ResetTarget) { if (ResetTarget) { - RESET_LINE_DDR |= RESET_LINE_MASK; + AUX_LINE_DDR |= AUX_LINE_MASK; if (!(V2Params_GetParameterValue(PARAM_RESET_POLARITY))) - RESET_LINE_PORT |= RESET_LINE_MASK; + AUX_LINE_PORT |= AUX_LINE_MASK; } else { - RESET_LINE_DDR &= ~RESET_LINE_MASK; - RESET_LINE_PORT &= ~RESET_LINE_MASK; + AUX_LINE_DDR &= ~AUX_LINE_MASK; + AUX_LINE_PORT &= ~AUX_LINE_MASK; } } @@ -144,7 +144,7 @@ uint8_t ISPTarget_WaitForProgComplete(const uint8_t ProgrammingMode, const uint1 } /** Waits until the target has completed the last operation, by continuously polling the device's - * BUSY flag until it is cleared, or until the \ref TARGET_BUSY_TIMEOUT_MS timeout period has expired. + * BUSY flag until it is cleared, or until the command timeout period has expired. * * \return V2 Protocol status \ref STATUS_CMD_OK if the no timeout occurred, \ref STATUS_RDY_BSY_TOUT otherwise */ diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c index def34991ff..856b489039 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 f4c3b7b1d3..3bbf454bef 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 diff --git a/Projects/AVRISP-MKII/makefile b/Projects/AVRISP-MKII/makefile index f5bb5b7123..a3f1368387 100644 --- a/Projects/AVRISP-MKII/makefile +++ b/Projects/AVRISP-MKII/makefile @@ -191,10 +191,10 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) -CDEFS += -DRESET_LINE_PORT=PORTB -CDEFS += -DRESET_LINE_PIN=PINB -CDEFS += -DRESET_LINE_DDR=DDRB -CDEFS += -DRESET_LINE_MASK="(1 << 4)" +CDEFS += -DAUX_LINE_PORT=PORTB +CDEFS += -DAUX_LINE_PIN=PINB +CDEFS += -DAUX_LINE_DDR=DDRB +CDEFS += -DAUX_LINE_MASK="(1 << 4)" CDEFS += -DVTARGET_ADC_CHANNEL=2 CDEFS += -DENABLE_ISP_PROTOCOL CDEFS += -DENABLE_XPROG_PROTOCOL