2007-10-29 18:03:02 +00:00
|
|
|
/*
|
|
|
|
* avrdude - A Downloader/Uploader for AVR device programmers
|
|
|
|
* Copyright (C) 2007 Dick Streefland, adapted for 5.4 by Limor Fried
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2012-11-20 14:03:50 +00:00
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
2007-10-29 18:03:02 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Driver for "usbtiny"-type programmers
|
|
|
|
* Please see http://www.xs4all.nl/~dicks/avr/usbtiny/
|
|
|
|
* and http://www.ladyada.net/make/usbtinyisp/
|
|
|
|
* For example schematics and detailed documentation
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "ac_cfg.h"
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <sys/time.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
|
|
|
|
#include "avrdude.h"
|
2014-05-19 10:01:59 +00:00
|
|
|
#include "libavrdude.h"
|
|
|
|
|
2007-10-29 18:03:02 +00:00
|
|
|
#include "usbtiny.h"
|
2014-02-27 13:06:03 +00:00
|
|
|
#include "usbdevs.h"
|
2007-10-29 18:03:02 +00:00
|
|
|
|
|
|
|
#if defined(HAVE_LIBUSB) // we use LIBUSB to talk to the board
|
2012-01-20 09:39:56 +00:00
|
|
|
#if defined(HAVE_USB_H)
|
|
|
|
# include <usb.h>
|
|
|
|
#elif defined(HAVE_LUSB0_USB_H)
|
|
|
|
# include <lusb0_usb.h>
|
|
|
|
#else
|
|
|
|
# error "libusb needs either <usb.h> or <lusb0_usb.h>"
|
|
|
|
#endif
|
2007-10-29 18:03:02 +00:00
|
|
|
|
2018-01-12 23:31:35 +00:00
|
|
|
#include "tpi.h"
|
|
|
|
|
|
|
|
#define TPIPCR_GT_0b 0x07
|
|
|
|
#define TPI_STOP_BITS 0x03
|
|
|
|
|
2022-01-07 12:15:55 +00:00
|
|
|
#define LITTLE_TO_BIG_16(x) ((((x) << 8) & 0xFF00) | (((x) >> 8) & 0x00FF))
|
2018-01-12 23:31:35 +00:00
|
|
|
|
2009-02-23 22:04:57 +00:00
|
|
|
#ifndef HAVE_UINT_T
|
2007-10-29 18:03:02 +00:00
|
|
|
typedef unsigned int uint_t;
|
2009-02-23 22:04:57 +00:00
|
|
|
#endif
|
|
|
|
#ifndef HAVE_ULONG_T
|
2007-10-29 18:03:02 +00:00
|
|
|
typedef unsigned long ulong_t;
|
2009-02-23 22:04:57 +00:00
|
|
|
#endif
|
2007-10-29 18:03:02 +00:00
|
|
|
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
/*
|
|
|
|
* Private data for this programmer.
|
|
|
|
*/
|
|
|
|
struct pdata
|
|
|
|
{
|
|
|
|
usb_dev_handle *usb_handle;
|
|
|
|
int sck_period;
|
|
|
|
int chunk_size;
|
2009-02-18 20:10:32 +00:00
|
|
|
int retries;
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
};
|
2007-10-29 18:03:02 +00:00
|
|
|
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
#define PDATA(pgm) ((struct pdata *)(pgm->cookie))
|
2007-10-29 18:03:02 +00:00
|
|
|
|
|
|
|
// ----------------------------------------------------------------------
|
|
|
|
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
static void usbtiny_setup(PROGRAMMER * pgm)
|
|
|
|
{
|
|
|
|
if ((pgm->cookie = malloc(sizeof(struct pdata))) == 0) {
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, "%s: usbtiny_setup(): Out of memory allocating private data\n",
|
2014-05-18 08:41:46 +00:00
|
|
|
progname);
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
memset(pgm->cookie, 0, sizeof(struct pdata));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void usbtiny_teardown(PROGRAMMER * pgm)
|
|
|
|
{
|
|
|
|
free(pgm->cookie);
|
|
|
|
}
|
|
|
|
|
2007-10-29 18:03:02 +00:00
|
|
|
// Wrapper for simple usb_control_msg messages
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
static int usb_control (const PROGRAMMER *pgm,
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
unsigned int requestid, unsigned int val, unsigned int index )
|
2007-10-29 18:03:02 +00:00
|
|
|
{
|
|
|
|
int nbytes;
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
nbytes = usb_control_msg( PDATA(pgm)->usb_handle,
|
2007-10-29 18:03:02 +00:00
|
|
|
USB_ENDPOINT_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
|
|
|
|
requestid,
|
|
|
|
val, index, // 2 bytes each of data
|
2022-01-07 10:31:16 +00:00
|
|
|
NULL, 0, // no data buffer in control message
|
2007-10-29 18:03:02 +00:00
|
|
|
USB_TIMEOUT ); // default timeout
|
|
|
|
if(nbytes < 0){
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, "\n%s: error: usbtiny_transmit: %s\n", progname, usb_strerror());
|
2009-02-18 20:20:56 +00:00
|
|
|
return -1;
|
2007-10-29 18:03:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return nbytes;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Wrapper for simple usb_control_msg messages to receive data from programmer
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
static int usb_in (const PROGRAMMER *pgm,
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
unsigned int requestid, unsigned int val, unsigned int index,
|
2007-10-29 18:03:02 +00:00
|
|
|
unsigned char* buffer, int buflen, int bitclk )
|
|
|
|
{
|
|
|
|
int nbytes;
|
|
|
|
int timeout;
|
2009-02-18 20:10:32 +00:00
|
|
|
int i;
|
2007-10-29 18:03:02 +00:00
|
|
|
|
2022-01-07 10:31:16 +00:00
|
|
|
// calculate the amount of time we expect the process to take by
|
2007-10-29 18:03:02 +00:00
|
|
|
// figuring the bit-clock time and buffer size and adding to the standard USB timeout.
|
|
|
|
timeout = USB_TIMEOUT + (buflen * bitclk) / 1000;
|
|
|
|
|
2009-02-18 20:10:32 +00:00
|
|
|
for (i = 0; i < 10; i++) {
|
|
|
|
nbytes = usb_control_msg( PDATA(pgm)->usb_handle,
|
|
|
|
USB_ENDPOINT_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
|
|
|
|
requestid,
|
|
|
|
val, index,
|
|
|
|
(char *)buffer, buflen,
|
|
|
|
timeout);
|
|
|
|
if (nbytes == buflen) {
|
|
|
|
return nbytes;
|
|
|
|
}
|
|
|
|
PDATA(pgm)->retries++;
|
2007-10-29 18:03:02 +00:00
|
|
|
}
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, "\n%s: error: usbtiny_receive: %s (expected %d, got %d)\n",
|
2009-02-18 20:10:32 +00:00
|
|
|
progname, usb_strerror(), buflen, nbytes);
|
2009-02-18 20:20:56 +00:00
|
|
|
return -1;
|
2009-02-18 20:10:32 +00:00
|
|
|
}
|
2007-10-29 18:03:02 +00:00
|
|
|
|
2009-02-18 20:10:32 +00:00
|
|
|
// Report the number of retries, and reset the counter.
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
static void check_retries (const PROGRAMMER *pgm, const char *operation) {
|
2009-02-18 20:10:32 +00:00
|
|
|
if (PDATA(pgm)->retries > 0 && quell_progress < 2) {
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, "%s: %d retries during %s\n", progname,
|
2009-02-18 20:10:32 +00:00
|
|
|
PDATA(pgm)->retries, operation);
|
|
|
|
}
|
|
|
|
PDATA(pgm)->retries = 0;
|
2007-10-29 18:03:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Wrapper for simple usb_control_msg messages to send data to programmer
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
static int usb_out (const PROGRAMMER *pgm,
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
unsigned int requestid, unsigned int val, unsigned int index,
|
|
|
|
unsigned char* buffer, int buflen, int bitclk )
|
2007-10-29 18:03:02 +00:00
|
|
|
{
|
|
|
|
int nbytes;
|
|
|
|
int timeout;
|
|
|
|
|
2022-01-07 10:31:16 +00:00
|
|
|
// calculate the amount of time we expect the process to take by
|
2007-10-29 18:03:02 +00:00
|
|
|
// figuring the bit-clock time and buffer size and adding to the standard USB timeout.
|
|
|
|
timeout = USB_TIMEOUT + (buflen * bitclk) / 1000;
|
|
|
|
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
nbytes = usb_control_msg( PDATA(pgm)->usb_handle,
|
2007-10-29 18:03:02 +00:00
|
|
|
USB_ENDPOINT_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
|
|
|
|
requestid,
|
|
|
|
val, index,
|
|
|
|
(char *)buffer, buflen,
|
|
|
|
timeout);
|
|
|
|
if (nbytes != buflen) {
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, "\n%s: error: usbtiny_send: %s (expected %d, got %d)\n",
|
2007-10-29 18:03:02 +00:00
|
|
|
progname, usb_strerror(), buflen, nbytes);
|
2009-02-18 20:20:56 +00:00
|
|
|
return -1;
|
2007-10-29 18:03:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return nbytes;
|
|
|
|
}
|
|
|
|
|
2022-01-07 10:31:16 +00:00
|
|
|
/* Reverse the bits in a byte. Needed since TPI uses little-endian
|
2018-01-12 23:31:35 +00:00
|
|
|
bit order (LSB first) whereas SPI uses big-endian (MSB first).*/
|
|
|
|
static unsigned char reverse(unsigned char b) {
|
|
|
|
return
|
|
|
|
( (b & 0x01) << 7)
|
|
|
|
| ((b & 0x02) << 5)
|
|
|
|
| ((b & 0x04) << 3)
|
|
|
|
| ((b & 0x08) << 1)
|
|
|
|
| ((b & 0x10) >> 1)
|
|
|
|
| ((b & 0x20) >> 3)
|
|
|
|
| ((b & 0x40) >> 5)
|
|
|
|
| ((b & 0x80) >> 7);
|
|
|
|
}
|
|
|
|
|
2022-01-07 10:31:16 +00:00
|
|
|
/* Calculate even parity. */
|
2018-01-12 23:31:35 +00:00
|
|
|
static unsigned char tpi_parity(unsigned char b)
|
|
|
|
{
|
|
|
|
unsigned char parity = 0;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < 8; ++i) {
|
|
|
|
if (b & 1)
|
|
|
|
parity ^= 1;
|
|
|
|
b >>= 1;
|
|
|
|
}
|
|
|
|
return parity;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Encode 1 start bit (0), 8 data bits, 1 parity, 2 stop bits (1)
|
2022-01-07 10:31:16 +00:00
|
|
|
inside 16 bits. The data is padded to 16 bits by 4 leading 1s
|
|
|
|
(which will be ignored since they're not start bits). This layout
|
|
|
|
enables a write to be followed by a read. */
|
2018-01-12 23:31:35 +00:00
|
|
|
static unsigned short tpi_frame(unsigned char b) {
|
|
|
|
return LITTLE_TO_BIG_16(0xf000 |
|
|
|
|
(reverse(b) << 3) |
|
|
|
|
tpi_parity(b) << 2 |
|
|
|
|
TPI_STOP_BITS);
|
|
|
|
}
|
|
|
|
|
2022-01-07 10:31:16 +00:00
|
|
|
/* Transmit a single byte encapsulated in a 32-bit transfer. Unused
|
|
|
|
bits are padded with 1s. */
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
static int usbtiny_tpi_tx(const PROGRAMMER *pgm, unsigned char b0) {
|
2018-01-12 23:31:35 +00:00
|
|
|
unsigned char res[4];
|
|
|
|
|
|
|
|
if (usb_in(pgm, USBTINY_SPI, tpi_frame(b0), 0xffff,
|
|
|
|
res, sizeof(res), 8 * sizeof(res) * PDATA(pgm)->sck_period) < 0)
|
|
|
|
return -1;
|
|
|
|
if (verbose > 1)
|
|
|
|
fprintf(stderr, "CMD_TPI_TX: [0x%02x]\n", b0);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2022-01-07 10:31:16 +00:00
|
|
|
/* Transmit a two bytes encapsulated in a 32-bit transfer. Unused
|
|
|
|
bits are padded with 1s. */
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
static int usbtiny_tpi_txtx(const PROGRAMMER *pgm,
|
2018-01-12 23:31:35 +00:00
|
|
|
unsigned char b0, unsigned char b1)
|
|
|
|
{
|
|
|
|
unsigned char res[4];
|
|
|
|
|
|
|
|
if (usb_in(pgm, USBTINY_SPI, tpi_frame(b0), tpi_frame(b1),
|
|
|
|
res, sizeof(res), 8 * sizeof(res) * PDATA(pgm)->sck_period) < 0)
|
|
|
|
return -1;
|
|
|
|
if (verbose > 1)
|
|
|
|
fprintf(stderr, "CMD_TPI_TX_TX: [0x%02x 0x%02x]\n", b0, b1);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Transmit a byte then receive a byte, all encapsulated in a 32-bit
|
|
|
|
transfer. Unused bits are padded with 1s. This code assumes that
|
|
|
|
the start bit of the byte being received arrives within at most 2
|
|
|
|
TPICLKs. We ensure this by calling avr_tpi_program_enable() with
|
|
|
|
delay==TPIPCR_GT_0b. */
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
static int usbtiny_tpi_txrx(const PROGRAMMER *pgm, unsigned char b0) {
|
2018-01-12 23:31:35 +00:00
|
|
|
unsigned char res[4], r;
|
|
|
|
short w;
|
|
|
|
|
|
|
|
if (usb_in(pgm, USBTINY_SPI, tpi_frame(b0), 0xffff,
|
|
|
|
res, sizeof(res), 8 * sizeof(res) * PDATA(pgm)->sck_period) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
w = (res[2] << 8) | res[3];
|
2022-01-07 10:31:16 +00:00
|
|
|
/* Look for start bit (there should be no more than two 1 bits): */
|
2018-01-12 23:31:35 +00:00
|
|
|
while (w < 0)
|
|
|
|
w <<= 1;
|
|
|
|
/* Now that we found the start bit, the top 9 bits contain the start
|
2022-01-07 10:31:16 +00:00
|
|
|
bit and the 8 data bits, but the latter in reverse order. */
|
2018-01-12 23:31:35 +00:00
|
|
|
r = reverse(w >> 7);
|
|
|
|
if (tpi_parity(r) != ((w >> 6) & 1)) {
|
|
|
|
fprintf(stderr, "%s: parity bit is wrong\n", __func__);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (((w >> 4) & 0x3) != TPI_STOP_BITS) {
|
|
|
|
fprintf(stderr, "%s: stop bits not received correctly\n", __func__);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (verbose > 1)
|
|
|
|
fprintf(stderr, "CMD_TPI_TX_RX: [0x%02x -> 0x%02x]\n", b0, r);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2007-10-29 18:03:02 +00:00
|
|
|
// Sometimes we just need to know the SPI command for the part to perform
|
|
|
|
// a function. Here we wrap this request for an operation so that we
|
|
|
|
// can just specify the part and operation and it'll do the right stuff
|
|
|
|
// to get the information from AvrDude and send to the USBtiny
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
static int usbtiny_avr_op (const PROGRAMMER *pgm, const AVRPART *p,
|
2007-10-29 18:03:02 +00:00
|
|
|
int op,
|
2013-09-02 20:22:53 +00:00
|
|
|
unsigned char *res)
|
2007-10-29 18:03:02 +00:00
|
|
|
{
|
|
|
|
unsigned char cmd[4];
|
|
|
|
|
|
|
|
if (p->op[op] == NULL) {
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, "Operation %d not defined for this chip!\n", op );
|
2007-10-29 18:03:02 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
memset(cmd, 0, sizeof(cmd));
|
|
|
|
avr_set_bits(p->op[op], cmd);
|
|
|
|
|
|
|
|
return pgm->cmd(pgm, cmd, res);
|
|
|
|
}
|
|
|
|
|
|
|
|
// ----------------------------------------------------------------------
|
|
|
|
|
|
|
|
/* Find a device with the correct VID/PID match for USBtiny */
|
|
|
|
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
static int usbtiny_open(PROGRAMMER *pgm, const char *name) {
|
2007-10-29 18:03:02 +00:00
|
|
|
struct usb_bus *bus;
|
|
|
|
struct usb_device *dev = 0;
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
const char *bus_name = NULL;
|
2011-08-17 15:24:09 +00:00
|
|
|
char *dev_name = NULL;
|
2013-01-29 18:33:34 +00:00
|
|
|
int vid, pid;
|
2011-08-17 15:24:09 +00:00
|
|
|
|
|
|
|
// if no -P was given or '-P usb' was given
|
2012-01-30 17:08:48 +00:00
|
|
|
if(strcmp(name, "usb") == 0)
|
2011-08-17 15:24:09 +00:00
|
|
|
name = NULL;
|
|
|
|
else {
|
|
|
|
// calculate bus and device names from -P option
|
|
|
|
const size_t usb_len = strlen("usb");
|
|
|
|
if(strncmp(name, "usb", usb_len) == 0 && ':' == name[usb_len]) {
|
|
|
|
bus_name = name + usb_len + 1;
|
|
|
|
dev_name = strchr(bus_name, ':');
|
|
|
|
if(NULL != dev_name)
|
|
|
|
*dev_name++ = '\0';
|
|
|
|
}
|
|
|
|
}
|
2007-10-29 18:03:02 +00:00
|
|
|
|
|
|
|
usb_init(); // initialize the libusb system
|
2022-01-07 10:31:16 +00:00
|
|
|
usb_find_busses(); // have libusb scan all the usb buses available
|
2007-10-29 18:03:02 +00:00
|
|
|
usb_find_devices(); // have libusb scan all the usb devices available
|
|
|
|
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
PDATA(pgm)->usb_handle = NULL;
|
2007-10-29 18:03:02 +00:00
|
|
|
|
2013-01-29 18:33:34 +00:00
|
|
|
if (pgm->usbvid)
|
|
|
|
vid = pgm->usbvid;
|
|
|
|
else
|
|
|
|
vid = USBTINY_VENDOR_DEFAULT;
|
2014-02-27 13:06:03 +00:00
|
|
|
|
|
|
|
LNODEID usbpid = lfirst(pgm->usbpid);
|
|
|
|
if (usbpid) {
|
|
|
|
pid = *(int *)(ldata(usbpid));
|
|
|
|
if (lnext(usbpid))
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, "%s: Warning: using PID 0x%04x, ignoring remaining PIDs in list\n",
|
2014-05-18 08:41:46 +00:00
|
|
|
progname, pid);
|
2014-02-27 13:06:03 +00:00
|
|
|
} else {
|
2013-01-29 18:33:34 +00:00
|
|
|
pid = USBTINY_PRODUCT_DEFAULT;
|
2014-02-27 13:06:03 +00:00
|
|
|
}
|
2013-01-29 18:33:34 +00:00
|
|
|
|
|
|
|
|
2022-01-07 10:31:16 +00:00
|
|
|
// now we iterate through all the buses and devices
|
2007-10-29 18:03:02 +00:00
|
|
|
for ( bus = usb_busses; bus; bus = bus->next ) {
|
|
|
|
for ( dev = bus->devices; dev; dev = dev->next ) {
|
2013-01-29 18:33:34 +00:00
|
|
|
if (dev->descriptor.idVendor == vid
|
|
|
|
&& dev->descriptor.idProduct == pid ) { // found match?
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_NOTICE, "%s: usbdev_open(): Found USBtinyISP, bus:device: %s:%s\n",
|
2014-05-18 08:41:46 +00:00
|
|
|
progname, bus->dirname, dev->filename);
|
2011-08-17 15:24:09 +00:00
|
|
|
// if -P was given, match device by device name and bus name
|
|
|
|
if(name != NULL &&
|
|
|
|
(NULL == dev_name ||
|
|
|
|
strcmp(bus->dirname, bus_name) ||
|
|
|
|
strcmp(dev->filename, dev_name)))
|
|
|
|
continue;
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
PDATA(pgm)->usb_handle = usb_open(dev); // attempt to connect to device
|
2007-10-29 18:03:02 +00:00
|
|
|
|
|
|
|
// wrong permissions or something?
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
if (!PDATA(pgm)->usb_handle) {
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, "%s: Warning: cannot open USB device: %s\n",
|
2007-10-29 18:03:02 +00:00
|
|
|
progname, usb_strerror());
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-08-17 15:24:09 +00:00
|
|
|
if(NULL != name && NULL == dev_name) {
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, "%s: Error: Invalid -P value: '%s'\n", progname, name);
|
|
|
|
avrdude_message(MSG_INFO, "%sUse -P usb:bus:device\n", progbuf);
|
2011-08-17 15:24:09 +00:00
|
|
|
return -1;
|
|
|
|
}
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
if (!PDATA(pgm)->usb_handle) {
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, "%s: Error: Could not find USBtiny device (0x%x/0x%x)\n",
|
2013-01-29 18:33:34 +00:00
|
|
|
progname, vid, pid );
|
2009-02-18 20:20:56 +00:00
|
|
|
return -1;
|
2007-10-29 18:03:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0; // If we got here, we must have found a good USB device
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Clean up the handle for the usbtiny */
|
|
|
|
static void usbtiny_close ( PROGRAMMER* pgm )
|
|
|
|
{
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
if (! PDATA(pgm)->usb_handle) {
|
2007-10-29 18:03:02 +00:00
|
|
|
return; // not a valid handle, bail!
|
|
|
|
}
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
usb_close(PDATA(pgm)->usb_handle); // ask libusb to clean up
|
|
|
|
PDATA(pgm)->usb_handle = NULL;
|
2007-10-29 18:03:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* A simple calculator function determines the maximum size of data we can
|
|
|
|
shove through a USB connection without getting errors */
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
static void usbtiny_set_chunk_size (const PROGRAMMER *pgm, int period) {
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
PDATA(pgm)->chunk_size = CHUNK_SIZE; // start with the maximum (default)
|
|
|
|
while (PDATA(pgm)->chunk_size > 8 && period > 16) {
|
2007-10-29 18:03:02 +00:00
|
|
|
// Reduce the chunk size for a slow SCK to reduce
|
|
|
|
// the maximum time of a single USB transfer.
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
PDATA(pgm)->chunk_size >>= 1;
|
2007-10-29 18:03:02 +00:00
|
|
|
period >>= 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Given a SCK bit-clock speed (in useconds) we verify its an OK speed and tell the
|
|
|
|
USBtiny to update itself to the new frequency */
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
static int usbtiny_set_sck_period (const PROGRAMMER *pgm, double v) {
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
PDATA(pgm)->sck_period = (int)(v * 1e6 + 0.5); // convert from us to 'int', the 0.5 is for rounding up
|
2007-10-29 18:03:02 +00:00
|
|
|
|
|
|
|
// Make sure its not 0, as that will confuse the usbtiny
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
if (PDATA(pgm)->sck_period < SCK_MIN)
|
|
|
|
PDATA(pgm)->sck_period = SCK_MIN;
|
2007-10-29 18:03:02 +00:00
|
|
|
|
|
|
|
// We can't go slower, due to the byte-size of the clock variable
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
if (PDATA(pgm)->sck_period > SCK_MAX)
|
|
|
|
PDATA(pgm)->sck_period = SCK_MAX;
|
2007-10-29 18:03:02 +00:00
|
|
|
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_NOTICE, "%s: Setting SCK period to %d usec\n", progname,
|
2009-02-18 20:10:32 +00:00
|
|
|
PDATA(pgm)->sck_period );
|
2007-10-29 18:03:02 +00:00
|
|
|
|
|
|
|
// send the command to the usbtiny device.
|
2009-02-18 20:20:56 +00:00
|
|
|
// MEME: for at90's fix resetstate?
|
|
|
|
if (usb_control(pgm, USBTINY_POWERUP, PDATA(pgm)->sck_period, RESET_LOW) < 0)
|
|
|
|
return -1;
|
2007-10-29 18:03:02 +00:00
|
|
|
|
|
|
|
// with the new speed, we'll have to update how much data we send per usb transfer
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
usbtiny_set_chunk_size(pgm, PDATA(pgm)->sck_period);
|
2007-10-29 18:03:02 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
static int usbtiny_initialize (const PROGRAMMER *pgm, const AVRPART *p ) {
|
2007-10-29 18:03:02 +00:00
|
|
|
unsigned char res[4]; // store the response from usbtinyisp
|
2018-01-12 23:31:35 +00:00
|
|
|
int tries;
|
2007-10-29 18:03:02 +00:00
|
|
|
|
|
|
|
// Check for bit-clock and tell the usbtiny to adjust itself
|
|
|
|
if (pgm->bitclock > 0.0) {
|
|
|
|
// -B option specified: convert to valid range for sck_period
|
|
|
|
usbtiny_set_sck_period(pgm, pgm->bitclock);
|
|
|
|
} else {
|
|
|
|
// -B option not specified: use default
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
PDATA(pgm)->sck_period = SCK_DEFAULT;
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_NOTICE, "%s: Using SCK period of %d usec\n",
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
progname, PDATA(pgm)->sck_period );
|
2009-02-18 20:20:56 +00:00
|
|
|
if (usb_control(pgm, USBTINY_POWERUP,
|
|
|
|
PDATA(pgm)->sck_period, RESET_LOW ) < 0)
|
|
|
|
return -1;
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
usbtiny_set_chunk_size(pgm, PDATA(pgm)->sck_period);
|
2007-10-29 18:03:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Let the device wake up.
|
|
|
|
usleep(50000);
|
|
|
|
|
2022-08-30 15:33:42 +00:00
|
|
|
if (p->prog_modes & PM_TPI) {
|
2018-01-12 23:31:35 +00:00
|
|
|
/* Since there is a single TPIDATA line, MOSI and MISO must be
|
|
|
|
linked together through a 1kOhm resistor. Verify that
|
|
|
|
everything we send on MOSI gets mirrored back on MISO. */
|
|
|
|
if (verbose >= 2)
|
|
|
|
fprintf(stderr, "doing MOSI-MISO link check\n");
|
|
|
|
|
|
|
|
memset(res, 0xaa, sizeof(res));
|
|
|
|
if (usb_in(pgm, USBTINY_SPI, LITTLE_TO_BIG_16(0x1234), LITTLE_TO_BIG_16(0x5678),
|
|
|
|
res, 4, 32 * PDATA(pgm)->sck_period) < 0) {
|
|
|
|
fprintf(stderr, "usb_in() failed\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (res[0] != 0x12 || res[1] != 0x34 || res[2] != 0x56 || res[3] != 0x78) {
|
|
|
|
fprintf(stderr,
|
|
|
|
"MOSI->MISO check failed (got 0x%02x 0x%02x 0x%02x 0x%02x)\n"
|
|
|
|
"\tPlease verify that MISO is connected directly to TPIDATA and\n"
|
|
|
|
"\tMOSI is connected to TPIDATA through a 1kOhm resistor.\n",
|
|
|
|
res[0], res[1], res[2], res[3]);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* keep TPIDATA high for >= 16 clock cycles: */
|
|
|
|
if (usb_in(pgm, USBTINY_SPI, 0xffff, 0xffff, res, 4,
|
|
|
|
32 * PDATA(pgm)->sck_period) < 0)
|
|
|
|
{
|
|
|
|
fprintf(stderr, "Unable to switch chip into TPI mode\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (tries = 0; tries < 4; ++tries) {
|
2021-11-07 15:44:18 +00:00
|
|
|
if (pgm->program_enable(pgm, p) >= 0)
|
2018-01-12 23:31:35 +00:00
|
|
|
break;
|
2007-10-29 18:03:02 +00:00
|
|
|
// no response, RESET and try again
|
2009-02-18 20:20:56 +00:00
|
|
|
if (usb_control(pgm, USBTINY_POWERUP,
|
|
|
|
PDATA(pgm)->sck_period, RESET_HIGH) < 0 ||
|
|
|
|
usb_control(pgm, USBTINY_POWERUP,
|
|
|
|
PDATA(pgm)->sck_period, RESET_LOW) < 0)
|
|
|
|
return -1;
|
2007-10-29 18:03:02 +00:00
|
|
|
usleep(50000);
|
|
|
|
}
|
2018-01-12 23:31:35 +00:00
|
|
|
if (tries >= 4)
|
|
|
|
return -1;
|
2007-10-29 18:03:02 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
static int usbtiny_setpin(const PROGRAMMER *pgm, int pinfunc, int value) {
|
2015-01-02 01:16:47 +00:00
|
|
|
/* USBtiny is not a bit bang device, but it can set RESET */
|
|
|
|
if(pinfunc == PIN_AVR_RESET) {
|
|
|
|
if (usb_control(pgm, USBTINY_POWERUP,
|
|
|
|
PDATA(pgm)->sck_period, value ? RESET_HIGH : RESET_LOW) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
usleep(50000);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2007-10-29 18:03:02 +00:00
|
|
|
/* Tell the USBtiny to release the output pins, etc */
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
static void usbtiny_powerdown(const PROGRAMMER *pgm) {
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
if (!PDATA(pgm)->usb_handle) {
|
2007-10-29 18:03:02 +00:00
|
|
|
return; // wasn't connected in the first place
|
|
|
|
}
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
usb_control(pgm, USBTINY_POWERDOWN, 0, 0); // Send USB control command to device
|
2007-10-29 18:03:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Send a 4-byte SPI command to the USBtinyISP for execution
|
|
|
|
This procedure is used by higher-level Avrdude procedures */
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
static int usbtiny_cmd(const PROGRAMMER *pgm, const unsigned char *cmd, unsigned char *res) {
|
2007-10-29 18:03:02 +00:00
|
|
|
int nbytes;
|
|
|
|
|
|
|
|
// Make sure its empty so we don't read previous calls if it fails
|
2008-11-06 09:47:37 +00:00
|
|
|
memset(res, '\0', 4 );
|
2007-10-29 18:03:02 +00:00
|
|
|
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
nbytes = usb_in( pgm, USBTINY_SPI,
|
2007-10-29 18:03:02 +00:00
|
|
|
(cmd[1] << 8) | cmd[0], // convert to 16-bit words
|
|
|
|
(cmd[3] << 8) | cmd[2], // "
|
2008-11-06 09:47:37 +00:00
|
|
|
res, 4, 8 * PDATA(pgm)->sck_period );
|
2009-02-18 20:20:56 +00:00
|
|
|
if (nbytes < 0)
|
|
|
|
return -1;
|
2009-02-18 20:10:32 +00:00
|
|
|
check_retries(pgm, "SPI command");
|
2014-06-13 20:07:40 +00:00
|
|
|
// print out the data we sent and received
|
|
|
|
avrdude_message(MSG_NOTICE2, "CMD: [%02x %02x %02x %02x] [%02x %02x %02x %02x]\n",
|
2007-10-29 18:03:02 +00:00
|
|
|
cmd[0], cmd[1], cmd[2], cmd[3],
|
|
|
|
res[0], res[1], res[2], res[3] );
|
2008-11-06 09:47:37 +00:00
|
|
|
return ((nbytes == 4) && // should have read 4 bytes
|
2007-10-29 18:03:02 +00:00
|
|
|
res[2] == cmd[1]); // AVR's do a delayed-echo thing
|
|
|
|
}
|
|
|
|
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
int usbtiny_cmd_tpi(const PROGRAMMER *pgm, const unsigned char *cmd,
|
2018-01-12 23:31:35 +00:00
|
|
|
int cmd_len, unsigned char *res, int res_len)
|
|
|
|
{
|
|
|
|
unsigned char b0, b1;
|
|
|
|
int tx, rx, r;
|
|
|
|
|
|
|
|
/* Transmits command two bytes at the time until we're down to 0 or
|
2022-01-07 10:31:16 +00:00
|
|
|
1 command byte. Then we're either done or we transmit the final
|
|
|
|
byte optionally followed by reading 1 byte. With the current TPI
|
|
|
|
protocol, we never receive more than one byte. */
|
2018-01-12 23:31:35 +00:00
|
|
|
for (tx = rx = 0; tx < cmd_len; ) {
|
|
|
|
b0 = cmd[tx++];
|
|
|
|
if (tx < cmd_len) {
|
|
|
|
b1 = cmd[tx++];
|
|
|
|
if (usbtiny_tpi_txtx(pgm, b0, b1) < 0)
|
|
|
|
return -1;
|
|
|
|
} else {
|
|
|
|
if (res_len > 0) {
|
|
|
|
if ((r = usbtiny_tpi_txrx(pgm, b0)) < 0)
|
|
|
|
return -1;
|
|
|
|
res[rx++] = r;
|
|
|
|
} else {
|
|
|
|
if (usbtiny_tpi_tx(pgm, b0) < 0)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (rx < res_len) {
|
|
|
|
fprintf(stderr, "%s: unexpected cmd_len=%d/res_len=%d\n",
|
|
|
|
__func__, cmd_len, res_len);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
static int usbtiny_spi(const PROGRAMMER *pgm, const unsigned char *cmd, unsigned char *res, int count) {
|
2015-01-02 01:16:47 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
// Clear the receive buffer so we don't read old data in case of failure
|
|
|
|
memset(res, 0, count);
|
|
|
|
|
|
|
|
if (count % 4) {
|
|
|
|
avrdude_message(MSG_INFO, "Direct SPI write must be a multiple of 4 bytes for %s\n",
|
|
|
|
pgm->type);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < count; i += 4) {
|
|
|
|
if (usbtiny_cmd(pgm, cmd + i, res + i) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-10-29 18:03:02 +00:00
|
|
|
/* Send the chip-erase command */
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
static int usbtiny_chip_erase(const PROGRAMMER *pgm, const AVRPART *p) {
|
2007-10-29 18:03:02 +00:00
|
|
|
unsigned char res[4];
|
|
|
|
|
2022-08-30 15:33:42 +00:00
|
|
|
if (p->prog_modes & PM_TPI)
|
2018-01-12 23:31:35 +00:00
|
|
|
return avr_tpi_chip_erase(pgm, p);
|
|
|
|
|
2007-10-29 18:03:02 +00:00
|
|
|
if (p->op[AVR_OP_CHIP_ERASE] == NULL) {
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, "Chip erase instruction not defined for part \"%s\"\n",
|
2007-10-29 18:03:02 +00:00
|
|
|
p->desc);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// get the command for erasing this chip and transmit to avrdude
|
|
|
|
if (! usbtiny_avr_op( pgm, p, AVR_OP_CHIP_ERASE, res )) {
|
|
|
|
return -1;
|
|
|
|
}
|
2022-08-31 17:15:35 +00:00
|
|
|
|
|
|
|
if(pgm->prog_modes & PM_SPM) { // Talking to bootloader directly
|
|
|
|
AVRMEM *fl = avr_locate_mem(p, "flash");
|
|
|
|
// Estimated time it takes to erase all pages in bootloader
|
|
|
|
usleep(p->chip_erase_delay * (fl? fl->num_pages: 999));
|
|
|
|
} else
|
|
|
|
usleep(p->chip_erase_delay);
|
2007-10-29 18:03:02 +00:00
|
|
|
|
|
|
|
// prepare for further instruction
|
|
|
|
pgm->initialize(pgm, p);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// These are required functions but don't actually do anything
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
static void usbtiny_enable(PROGRAMMER *pgm, const AVRPART *p) {
|
|
|
|
}
|
2007-10-29 18:03:02 +00:00
|
|
|
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
static void usbtiny_disable(const PROGRAMMER *pgm) {
|
|
|
|
}
|
2007-10-29 18:03:02 +00:00
|
|
|
|
|
|
|
|
|
|
|
/* To speed up programming and reading, we do a 'chunked' read.
|
|
|
|
* We request just the data itself and the USBtiny uses the SPI function
|
|
|
|
* given to read in the data. Much faster than sending a 4-byte SPI request
|
|
|
|
* per byte
|
|
|
|
*/
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
static int usbtiny_paged_load (const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM *m,
|
2011-09-14 21:49:42 +00:00
|
|
|
unsigned int page_size,
|
2012-06-07 14:07:17 +00:00
|
|
|
unsigned int addr, unsigned int n_bytes)
|
2007-10-29 18:03:02 +00:00
|
|
|
{
|
2012-06-07 14:07:17 +00:00
|
|
|
unsigned int maxaddr = addr + n_bytes;
|
2022-07-16 10:06:18 +00:00
|
|
|
int chunk, function;
|
|
|
|
OPCODE *lext, *readop;
|
|
|
|
unsigned char cmd[8];
|
2007-10-29 18:03:02 +00:00
|
|
|
|
|
|
|
// First determine what we're doing
|
2022-07-16 10:06:18 +00:00
|
|
|
function = strcmp(m->desc, "eeprom")==0?
|
|
|
|
USBTINY_EEPROM_READ: USBTINY_FLASH_READ;
|
|
|
|
|
|
|
|
// paged_load() only called for pages, so OK to set ext addr once at start
|
|
|
|
if((lext = m->op[AVR_OP_LOAD_EXT_ADDR])) {
|
|
|
|
memset(cmd, 0, sizeof(cmd));
|
|
|
|
avr_set_bits(lext, cmd);
|
|
|
|
avr_set_addr(lext, cmd, addr/2);
|
|
|
|
if(pgm->cmd(pgm, cmd, cmd+4) < 0)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Byte acces as work around to correctly read flash above 64 kiB
|
|
|
|
if(function == USBTINY_FLASH_READ && addr >= 0x10000) {
|
|
|
|
for(unsigned int i=0; i<n_bytes; i++, addr++) {
|
|
|
|
if(!(readop = m->op[addr&1? AVR_OP_READ_HI: AVR_OP_READ_LO]))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
memset(cmd, 0, sizeof(cmd));
|
|
|
|
avr_set_bits(readop, cmd);
|
|
|
|
avr_set_addr(readop, cmd, addr/2);
|
|
|
|
if(pgm->cmd(pgm, cmd, cmd+4) < 0)
|
|
|
|
return -1;
|
|
|
|
m->buf[addr] = 0;
|
|
|
|
avr_get_output(readop, cmd+4, m->buf + addr);
|
|
|
|
}
|
|
|
|
|
|
|
|
return n_bytes;
|
2007-10-29 18:03:02 +00:00
|
|
|
}
|
|
|
|
|
2012-06-07 14:07:17 +00:00
|
|
|
for (; addr < maxaddr; addr += chunk) {
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
chunk = PDATA(pgm)->chunk_size; // start with the maximum chunk size possible
|
2020-09-18 21:16:13 +00:00
|
|
|
if (addr + chunk > maxaddr) {
|
|
|
|
chunk = maxaddr - addr;
|
|
|
|
}
|
2007-10-29 18:03:02 +00:00
|
|
|
|
|
|
|
// Send the chunk of data to the USBtiny with the function we want
|
|
|
|
// to perform
|
2009-02-18 20:20:56 +00:00
|
|
|
if (usb_in(pgm,
|
|
|
|
function, // EEPROM or flash
|
|
|
|
0, // delay between SPI commands
|
2012-06-07 14:07:17 +00:00
|
|
|
addr, // address in memory
|
|
|
|
m->buf + addr, // pointer to where we store data
|
2009-02-18 20:20:56 +00:00
|
|
|
chunk, // number of bytes
|
|
|
|
32 * PDATA(pgm)->sck_period) // each byte gets turned into a 4-byte SPI cmd
|
|
|
|
< 0) {
|
2007-10-29 18:03:02 +00:00
|
|
|
// usb_in() multiplies this per byte.
|
2009-02-18 20:20:56 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2007-10-29 18:03:02 +00:00
|
|
|
}
|
|
|
|
|
2009-02-18 20:10:32 +00:00
|
|
|
check_retries(pgm, "read");
|
2007-10-29 18:03:02 +00:00
|
|
|
return n_bytes;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* To speed up programming and reading, we do a 'chunked' write.
|
|
|
|
* We send just the data itself and the USBtiny uses the SPI function
|
|
|
|
* given to write the data. Much faster than sending a 4-byte SPI request
|
|
|
|
* per byte.
|
|
|
|
*/
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
static int usbtiny_paged_write(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM *m,
|
2011-09-14 21:49:42 +00:00
|
|
|
unsigned int page_size,
|
2012-06-07 14:07:17 +00:00
|
|
|
unsigned int addr, unsigned int n_bytes)
|
2007-10-29 18:03:02 +00:00
|
|
|
{
|
2012-06-07 14:07:17 +00:00
|
|
|
unsigned int maxaddr = addr + n_bytes;
|
2007-10-29 18:03:02 +00:00
|
|
|
int chunk; // Size of data to write at once
|
|
|
|
int next;
|
|
|
|
int function; // which SPI command to use
|
|
|
|
int delay; // delay required between SPI commands
|
|
|
|
|
|
|
|
// First determine what we're doing
|
|
|
|
if (strcmp( m->desc, "flash" ) == 0) {
|
|
|
|
function = USBTINY_FLASH_WRITE;
|
|
|
|
} else {
|
|
|
|
function = USBTINY_EEPROM_WRITE;
|
|
|
|
}
|
|
|
|
|
|
|
|
delay = 0;
|
|
|
|
if (! m->paged) {
|
2012-06-07 14:07:17 +00:00
|
|
|
unsigned int poll_value;
|
2007-10-29 18:03:02 +00:00
|
|
|
// Does this chip not support paged writes?
|
2012-06-07 14:07:17 +00:00
|
|
|
poll_value = (m->readback[1] << 8) | m->readback[0];
|
|
|
|
if (usb_control(pgm, USBTINY_POLL_BYTES, poll_value, 0 ) < 0)
|
2009-02-18 20:20:56 +00:00
|
|
|
return -1;
|
2007-10-29 18:03:02 +00:00
|
|
|
delay = m->max_write_delay;
|
|
|
|
}
|
|
|
|
|
2012-06-07 14:07:17 +00:00
|
|
|
for (; addr < maxaddr; addr += chunk) {
|
2007-10-29 18:03:02 +00:00
|
|
|
// start with the max chunk size
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
chunk = PDATA(pgm)->chunk_size;
|
2020-09-18 21:16:13 +00:00
|
|
|
if (addr + chunk > maxaddr) {
|
|
|
|
chunk = maxaddr - addr;
|
|
|
|
}
|
2007-10-29 18:03:02 +00:00
|
|
|
|
|
|
|
// we can only write a page at a time anyways
|
|
|
|
if (m->paged && chunk > page_size)
|
|
|
|
chunk = page_size;
|
|
|
|
|
2009-02-18 20:20:56 +00:00
|
|
|
if (usb_out(pgm,
|
|
|
|
function, // Flash or EEPROM
|
|
|
|
delay, // How much to wait between each byte
|
2012-06-07 14:07:17 +00:00
|
|
|
addr, // Address in memory
|
|
|
|
m->buf + addr, // Pointer to data
|
2009-02-18 20:20:56 +00:00
|
|
|
chunk, // Number of bytes to write
|
|
|
|
32 * PDATA(pgm)->sck_period + delay // each byte gets turned into a
|
2022-01-07 10:31:16 +00:00
|
|
|
// 4-byte SPI cmd usb_out() multiplies
|
2007-10-29 18:03:02 +00:00
|
|
|
// this per byte. Then add the cmd-delay
|
2009-02-18 20:20:56 +00:00
|
|
|
) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
2007-10-29 18:03:02 +00:00
|
|
|
|
2012-06-07 14:07:17 +00:00
|
|
|
next = addr + chunk; // Calculate what address we're at now
|
2007-10-29 18:03:02 +00:00
|
|
|
if (m->paged
|
2012-06-07 14:07:17 +00:00
|
|
|
&& ((next % page_size) == 0 || next == maxaddr) ) {
|
2007-10-29 18:03:02 +00:00
|
|
|
// If we're at a page boundary, send the SPI command to flush it.
|
2012-06-07 14:07:17 +00:00
|
|
|
avr_write_page(pgm, p, m, (unsigned long) addr);
|
2007-10-29 18:03:02 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return n_bytes;
|
|
|
|
}
|
|
|
|
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
static int usbtiny_program_enable(const PROGRAMMER *pgm, const AVRPART *p) {
|
2018-01-12 23:31:35 +00:00
|
|
|
unsigned char buf[4];
|
|
|
|
|
2022-08-30 15:33:42 +00:00
|
|
|
if (p->prog_modes & PM_TPI)
|
2018-01-12 23:31:35 +00:00
|
|
|
return avr_tpi_program_enable(pgm, p, TPIPCR_GT_0b);
|
|
|
|
else
|
|
|
|
return usbtiny_avr_op(pgm, p, AVR_OP_PGM_ENABLE, buf);
|
|
|
|
}
|
|
|
|
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
void usbtiny_initpgm(PROGRAMMER *pgm) {
|
2007-10-29 18:03:02 +00:00
|
|
|
strcpy(pgm->type, "USBtiny");
|
|
|
|
|
|
|
|
/* Mandatory Functions */
|
|
|
|
pgm->initialize = usbtiny_initialize;
|
|
|
|
pgm->enable = usbtiny_enable;
|
|
|
|
pgm->disable = usbtiny_disable;
|
2018-01-12 23:31:35 +00:00
|
|
|
pgm->program_enable = usbtiny_program_enable;
|
2007-10-29 18:03:02 +00:00
|
|
|
pgm->chip_erase = usbtiny_chip_erase;
|
|
|
|
pgm->cmd = usbtiny_cmd;
|
2018-01-12 23:31:35 +00:00
|
|
|
pgm->cmd_tpi = usbtiny_cmd_tpi;
|
2007-10-29 18:03:02 +00:00
|
|
|
pgm->open = usbtiny_open;
|
|
|
|
pgm->close = usbtiny_close;
|
|
|
|
pgm->read_byte = avr_read_byte_default;
|
|
|
|
pgm->write_byte = avr_write_byte_default;
|
|
|
|
|
|
|
|
/* Optional Functions */
|
|
|
|
pgm->powerup = NULL;
|
|
|
|
pgm->powerdown = usbtiny_powerdown;
|
|
|
|
pgm->paged_load = usbtiny_paged_load;
|
|
|
|
pgm->paged_write = usbtiny_paged_write;
|
|
|
|
pgm->set_sck_period = usbtiny_set_sck_period;
|
main.c, pgm.c, pgm.h: Add setup and teardown hooks to the programmer
definition. If present, call the setup hook immediately after finding
the respective programmer object, and schedule the teardown hook to be
called upon exit. This allows the programmer implementation to
dynamically allocate private programmer data.
avr910.c, butterfly.c, jtagmkI.c, jtagmkII.c, stk500v2.c, usbasp.c,
usbtiny.c: Convert static programmer data into dynamically allocated
data.
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@764 81a1dc3b-b13d-400b-aceb-764788c761c2
2007-11-07 20:36:12 +00:00
|
|
|
pgm->setup = usbtiny_setup;
|
|
|
|
pgm->teardown = usbtiny_teardown;
|
2015-01-02 01:16:47 +00:00
|
|
|
pgm->setpin = usbtiny_setpin;
|
|
|
|
pgm->spi = usbtiny_spi;
|
2007-10-29 18:03:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#else /* !HAVE_LIBUSB */
|
|
|
|
|
|
|
|
// Give a proper error if we were not compiled with libusb
|
|
|
|
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
static int usbtiny_nousb_open(PROGRAMMER *pgm, const char *name) {
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, "%s: error: no usb support. Please compile again with libusb installed.\n",
|
2007-10-29 18:03:02 +00:00
|
|
|
progname);
|
|
|
|
|
2009-02-18 20:20:56 +00:00
|
|
|
return -1;
|
2007-10-29 18:03:02 +00:00
|
|
|
}
|
|
|
|
|
Use const in PROGRAMMER function arguments where appropriate
In order to get meaningful const properties for the PROGRAMMER, AVRPART and
AVRMEM arguments, some code needed to be moved around, otherwise a network of
"tainted" assignments risked rendering nothing const:
- Change void (*enable)(PROGRAMMER *pgm) to void (*enable)(PROGRAMMER *pgm,
const AVRPART *p); this allows changes in the PROGRAMMER structure after
the part is known. For example, use TPI, UPDI, PDI functions in that
programmer appropriate to the part. This used to be done later in the
process, eg, in the initialize() function, which "taints" all other
programmer functions wrt const and sometimes requires other finessing with
flags etc. Much clearer with the modified enable() interface.
- Move TPI initpgm-type code from initialize() to enable() --- note that
initpgm() does not have the info at the time when it is called whether or
not TPI is required
- buspirate.c: move pgm->flag to PDATA(pgm)->flag (so legitimate
modification of the flag does not change PROGRAMMER structure)
- Move AVRPART_INIT_SMC and AVRPART_WRITE bits from the flags field in
AVRPART to jtagmkII.c's private data flags32 fiels as FLAGS32_INIT_SMC and
FLAGS32_WRITE bits
- Move the xbeeResetPin component to private data in stk500.c as this is
needed by xbee when it saddles on the stk500 code (previously, the flags
component of the part was re-dedicated to this)
- Change the way the "chained" private data are used in jtag3.c whilst
keeping the PROGRAMMER structure read-only otherwise
- In stk500v2.c move the STK600 pgm update from stk500v2_initialize() to
stk500v2_enable() so the former keeps the PROGRAMMER structure read-only
(for const assertion).
- In usbasp change the code from changing PROGRAMMER functions late to
dispatching to TPI or regular SPI protocol functions at runtime; reason
being the decision whether to use TPI protocol is done at run-time
depending on the capability of the attached programmer
Also fixes Issue #1071, the treatment of default eecr value.
2022-08-17 15:05:28 +00:00
|
|
|
void usbtiny_initpgm(PROGRAMMER *pgm) {
|
2007-10-29 18:03:02 +00:00
|
|
|
strcpy(pgm->type, "usbtiny");
|
|
|
|
|
|
|
|
pgm->open = usbtiny_nousb_open;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* HAVE_LIBUSB */
|
2012-01-31 17:03:43 +00:00
|
|
|
|
|
|
|
const char usbtiny_desc[] = "Driver for \"usbtiny\"-type programmers";
|
|
|
|
|