* usbdefs.h (USBDEV_BULK_EP_WRITE_STK600)

(USBDEV_BULK_EP_READ_STK600): new define values * stk500v2.c (stk600_open): use the STK600 EP values, as they are different from AVRISPmkII git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk@1126 81a1dc3b-b13d-400b-aceb-764788c761c2
kcuzner · Dec 18, 2012 · b4dd328 · b4dd328
1 parent 4920a8a
commit b4dd328
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/avrdude/ChangeLog b/avrdude/ChangeLog
@@ -1,3 +1,10 @@
+2012-12-18  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	* usbdefs.h (USBDEV_BULK_EP_WRITE_STK600)
+	(USBDEV_BULK_EP_READ_STK600): new define values
+	* stk500v2.c (stk600_open): use the STK600 EP values,
+	as they are different from AVRISPmkII
+
 2012-12-18  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	bug #37942: Latest SVN can't program in dragon_jtag mode

diff --git a/avrdude/stk500v2.c b/avrdude/stk500v2.c
@@ -1666,8 +1666,8 @@ static int stk600_open(PROGRAMMER * pgm, char * port)
     PDATA(pgm)->pgmtype = PGMTYPE_STK600;
     pgm->set_sck_period = stk600_set_sck_period;
     pgm->fd.usb.max_xfer = USBDEV_MAX_XFER_MKII;
-    pgm->fd.usb.rep = USBDEV_BULK_EP_READ_MKII;
-    pgm->fd.usb.wep = USBDEV_BULK_EP_WRITE_MKII;
+    pgm->fd.usb.rep = USBDEV_BULK_EP_READ_STK600;
+    pgm->fd.usb.wep = USBDEV_BULK_EP_WRITE_STK600;
     pgm->fd.usb.eep = 0;           /* no seperate EP for events */
 #else
     fprintf(stderr, "avrdude was compiled without usb support.\n");

diff --git a/avrdude/usbdevs.h b/avrdude/usbdevs.h
@@ -32,11 +32,15 @@
 #define USB_DEVICE_AVRDRAGON   0x2107
 #define USB_DEVICE_JTAGICE3    0x2110
 
-/* JTAGICEmkII */
+/* JTAGICEmkII, AVRISPmkII */
 #define USBDEV_BULK_EP_WRITE_MKII 0x02
 #define USBDEV_BULK_EP_READ_MKII  0x82
 #define USBDEV_MAX_XFER_MKII 64
 
+/* STK600 */
+#define USBDEV_BULK_EP_WRITE_STK600 0x02
+#define USBDEV_BULK_EP_READ_STK600 0x83
+
 /* JTAGICE3 */
 #define USBDEV_BULK_EP_WRITE_3    0x01
 #define USBDEV_BULK_EP_READ_3     0x82