diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-12-29 05:18:16 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-12-29 05:18:16 +0000 |
| commit | e1c1c256192c099f5bfa23946c050aa5954aca4a (patch) | |
| tree | d891077e6d8fb3a2b5515ce45255e7bea4dece6f /Projects/AVRISP-MKII/Lib | |
| parent | 93fe420d89012a1bbc80f0e466b4b75167e00ee1 (diff) | |
| download | lufa-e1c1c256192c099f5bfa23946c050aa5954aca4a.tar.gz lufa-e1c1c256192c099f5bfa23946c050aa5954aca4a.tar.bz2 lufa-e1c1c256192c099f5bfa23946c050aa5954aca4a.zip | |
Change the AVRISP project's RESET LINE makefile tokens to AUX LINE, as it is not always used for target reset.
Diffstat (limited to 'Projects/AVRISP-MKII/Lib')
| -rw-r--r-- | Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c | 10 | ||||
| -rw-r--r-- | Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c | 8 | ||||
| -rw-r--r-- | Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c index ebaf2f3e5..1bd688701 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 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
|