From 509183667172199bda5f4ffb32cda530202b49c6 Mon Sep 17 00:00:00 2001
From: Joerg Wunsch <j@uriah.heep.sax.de>
Date: Thu, 17 Aug 2006 16:01:34 +0000
Subject: [PATCH] Unreverse the argument order for CMD_CHIP_ERASE_HVSP; Atmel
says AVR068 is right, and stk500.exe is wrong. (This reverts rev 1.19)
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@611 81a1dc3b-b13d-400b-aceb-764788c761c2
---
ChangeLog | 6 ++++++
stk500v2.c | 8 ++------
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index eddb33ed..90de0718 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-17 Joerg Wunsch <j@uriah.heep.sax.de>
+
+ * stk500v2.c: unreverse the argument order for
+ CMD_CHIP_ERASE_HVSP; Atmel says AVR068 is right, and
+ stk500.exe is wrong.
+
2006-08-17 Joerg Wunsch <j@uriah.heep.sax.de>
Submitted by Neil Davey:
diff --git a/stk500v2.c b/stk500v2.c
index 653e0a1d..79bde7ce 100644
--- a/stk500v2.c
+++ b/stk500v2.c
@@ -459,12 +459,8 @@ static int stk500hv_chip_erase(PROGRAMMER * pgm, AVRPART * p, enum hvmode mode)
buf[2] = p->chiperasepolltimeout;
} else {
buf[0] = CMD_CHIP_ERASE_HVSP;
- /*
- * AVR068 has them the other way around, but that's the sequence
- * Atmel's stk500.exe is issuing.
- */
- buf[1] = p->chiperasetime;
- buf[2] = p->chiperasepolltimeout;
+ buf[1] = p->chiperasepolltimeout;
+ buf[2] = p->chiperasetime;
}
result = stk500v2_command(pgm, buf, 3, sizeof(buf));
usleep(p->chip_erase_delay);