2006-12-20 23:43:34 +00:00
|
|
|
/*
|
|
|
|
* avrdude - A Downloader/Uploader for AVR device programmers
|
|
|
|
* Copyright (C) 2003-2004 Theodore A. Roth <troth@openavr.org>
|
|
|
|
* Copyright (C) 2006 Joerg Wunsch <j@uriah.heep.sax.de>
|
|
|
|
* Copyright (C) 2006 Christian Starkjohann
|
|
|
|
*
|
|
|
|
* 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/>.
|
2006-12-20 23:43:34 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
/* $Id$ */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Serial Interface emulation for USB programmer "AVR-Doper" in HID mode.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "ac_cfg.h"
|
|
|
|
|
2022-02-18 19:05:52 +00:00
|
|
|
#if defined(HAVE_LIBHIDAPI)
|
2006-12-20 23:43:34 +00:00
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
2011-08-25 19:03:10 +00:00
|
|
|
#include <stdlib.h>
|
2022-02-18 19:05:52 +00:00
|
|
|
#include <hidapi/hidapi.h>
|
2006-12-20 23:43:34 +00:00
|
|
|
|
2007-01-24 21:07:54 +00:00
|
|
|
#include "avrdude.h"
|
2014-05-19 10:01:59 +00:00
|
|
|
#include "libavrdude.h"
|
2006-12-20 23:43:34 +00:00
|
|
|
|
|
|
|
/* ------------------------------------------------------------------------ */
|
|
|
|
|
|
|
|
/* Numeric constants for 'reportType' parameters */
|
|
|
|
#define USB_HID_REPORT_TYPE_INPUT 1
|
|
|
|
#define USB_HID_REPORT_TYPE_OUTPUT 2
|
|
|
|
#define USB_HID_REPORT_TYPE_FEATURE 3
|
|
|
|
|
|
|
|
/* These are the error codes which can be returned by functions of this
|
|
|
|
* module.
|
|
|
|
*/
|
|
|
|
#define USB_ERROR_NONE 0
|
|
|
|
#define USB_ERROR_ACCESS 1
|
|
|
|
#define USB_ERROR_NOTFOUND 2
|
|
|
|
#define USB_ERROR_BUSY 16
|
|
|
|
#define USB_ERROR_IO 5
|
|
|
|
|
|
|
|
#define USB_VENDOR_ID 0x16c0
|
|
|
|
#define USB_PRODUCT_ID 0x05df
|
|
|
|
|
|
|
|
static int reportDataSizes[4] = {13, 29, 61, 125};
|
|
|
|
|
|
|
|
static unsigned char avrdoperRxBuffer[280]; /* buffer for receive data */
|
|
|
|
static int avrdoperRxLength = 0; /* amount of valid bytes in rx buffer */
|
|
|
|
static int avrdoperRxPosition = 0; /* amount of bytes already consumed in rx buffer */
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------------ */
|
|
|
|
/* ------------------------------------------------------------------------ */
|
|
|
|
/* ------------------------------------------------------------------------ */
|
|
|
|
|
2022-08-07 13:05:54 +00:00
|
|
|
static int usbOpenDevice(union filedescriptor *fdp, int vendor, const char *vendorName,
|
|
|
|
int product, const char *productName, int doReportIDs)
|
2018-01-14 23:12:06 +00:00
|
|
|
{
|
|
|
|
hid_device *dev;
|
|
|
|
|
|
|
|
dev = hid_open(vendor, product, NULL);
|
|
|
|
if (dev == NULL)
|
|
|
|
{
|
|
|
|
avrdude_message(MSG_INFO, "%s: usbOpenDevice(): No device found\n",
|
|
|
|
progname);
|
|
|
|
return USB_ERROR_NOTFOUND;
|
|
|
|
}
|
|
|
|
fdp->usb.handle = dev;
|
|
|
|
return USB_ERROR_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
|
|
|
|
static void usbCloseDevice(union filedescriptor *fdp)
|
|
|
|
{
|
|
|
|
hid_device *udev = (hid_device *)fdp->usb.handle;
|
|
|
|
fdp->usb.handle = NULL;
|
|
|
|
|
|
|
|
if (udev == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
hid_close(udev);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
|
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 usbSetReport(const union filedescriptor *fdp, int reportType, char *buffer, int len) {
|
2018-01-14 23:12:06 +00:00
|
|
|
hid_device *udev = (hid_device *)fdp->usb.handle;
|
|
|
|
int bytesSent = -1;
|
|
|
|
|
|
|
|
switch(reportType){
|
|
|
|
case USB_HID_REPORT_TYPE_INPUT:
|
|
|
|
break;
|
|
|
|
case USB_HID_REPORT_TYPE_OUTPUT:
|
|
|
|
bytesSent = hid_write(udev, (unsigned char*) buffer, len);
|
|
|
|
break;
|
|
|
|
case USB_HID_REPORT_TYPE_FEATURE:
|
|
|
|
bytesSent = hid_send_feature_report(udev, (unsigned char*) buffer, len);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(bytesSent != len){
|
|
|
|
if(bytesSent < 0)
|
|
|
|
avrdude_message(MSG_INFO, "Error sending message: %s\n", hid_error(udev));
|
|
|
|
return USB_ERROR_IO;
|
|
|
|
}
|
|
|
|
return USB_ERROR_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
|
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 usbGetReport(const union filedescriptor *fdp, int reportType, int reportNumber,
|
2018-01-14 23:12:06 +00:00
|
|
|
char *buffer, int *len)
|
|
|
|
{
|
|
|
|
hid_device *udev = (hid_device *)fdp->usb.handle;
|
|
|
|
int bytesReceived = -1;
|
|
|
|
|
|
|
|
switch(reportType){
|
|
|
|
case USB_HID_REPORT_TYPE_INPUT:
|
|
|
|
bytesReceived = hid_read_timeout(udev, (unsigned char*) buffer, *len, 300);
|
|
|
|
break;
|
|
|
|
case USB_HID_REPORT_TYPE_OUTPUT:
|
|
|
|
break;
|
|
|
|
case USB_HID_REPORT_TYPE_FEATURE:
|
|
|
|
bytesReceived = hid_get_feature_report(udev, (unsigned char*) buffer, *len);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if(bytesReceived < 0){
|
|
|
|
avrdude_message(MSG_INFO, "Error sending message: %s\n", hid_error(udev));
|
|
|
|
return USB_ERROR_IO;
|
|
|
|
}
|
|
|
|
*len = bytesReceived;
|
|
|
|
return USB_ERROR_NONE;
|
|
|
|
}
|
|
|
|
/* ------------------------------------------------------------------------ */
|
|
|
|
/* ------------------------------------------------------------------------ */
|
|
|
|
/* ------------------------------------------------------------------------ */
|
|
|
|
|
2006-12-20 23:43:34 +00:00
|
|
|
|
|
|
|
/* ------------------------------------------------------------------------ */
|
|
|
|
/* ------------------------------------------------------------------------ */
|
|
|
|
/* ------------------------------------------------------------------------ */
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
|
2014-07-16 20:02:01 +00:00
|
|
|
static void dumpBlock(const char *prefix, const unsigned char *buf, int len)
|
2006-12-20 23:43:34 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if(len <= 8){ /* more compact format for short blocks */
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, "%s: %d bytes: ", prefix, len);
|
2006-12-20 23:43:34 +00:00
|
|
|
for(i = 0; i < len; i++){
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, "%02x ", buf[i]);
|
2006-12-20 23:43:34 +00:00
|
|
|
}
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, " \"");
|
2006-12-20 23:43:34 +00:00
|
|
|
for(i = 0; i < len; i++){
|
|
|
|
if(buf[i] >= 0x20 && buf[i] < 0x7f){
|
|
|
|
fputc(buf[i], stderr);
|
|
|
|
}else{
|
|
|
|
fputc('.', stderr);
|
|
|
|
}
|
|
|
|
}
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, "\"\n");
|
2006-12-20 23:43:34 +00:00
|
|
|
}else{
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, "%s: %d bytes:\n", prefix, len);
|
2006-12-20 23:43:34 +00:00
|
|
|
while(len > 0){
|
|
|
|
for(i = 0; i < 16; i++){
|
|
|
|
if(i < len){
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, "%02x ", buf[i]);
|
2006-12-20 23:43:34 +00:00
|
|
|
}else{
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, " ");
|
2006-12-20 23:43:34 +00:00
|
|
|
}
|
|
|
|
if(i == 7)
|
|
|
|
fputc(' ', stderr);
|
|
|
|
}
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, " \"");
|
2006-12-20 23:43:34 +00:00
|
|
|
for(i = 0; i < 16; i++){
|
|
|
|
if(i < len){
|
|
|
|
if(buf[i] >= 0x20 && buf[i] < 0x7f){
|
|
|
|
fputc(buf[i], stderr);
|
|
|
|
}else{
|
|
|
|
fputc('.', stderr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, "\"\n");
|
2006-12-20 23:43:34 +00:00
|
|
|
buf += 16;
|
|
|
|
len -= 16;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static char *usbErrorText(int usbErrno)
|
|
|
|
{
|
|
|
|
static char buffer[32];
|
|
|
|
|
|
|
|
switch(usbErrno){
|
|
|
|
case USB_ERROR_NONE: return "Success.";
|
|
|
|
case USB_ERROR_ACCESS: return "Access denied.";
|
|
|
|
case USB_ERROR_NOTFOUND:return "Device not found.";
|
|
|
|
case USB_ERROR_BUSY: return "Device is busy.";
|
|
|
|
case USB_ERROR_IO: return "I/O Error.";
|
|
|
|
default:
|
|
|
|
sprintf(buffer, "Unknown error %d.", usbErrno);
|
|
|
|
return buffer;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
|
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 avrdoper_open(const char *port, union pinfo pinfo, union filedescriptor *fdp)
|
2006-12-20 23:43:34 +00:00
|
|
|
{
|
|
|
|
int rval;
|
|
|
|
char *vname = "obdev.at";
|
|
|
|
char *devname = "AVR-Doper";
|
|
|
|
|
|
|
|
rval = usbOpenDevice(fdp, USB_VENDOR_ID, vname, USB_PRODUCT_ID, devname, 1);
|
|
|
|
if(rval != 0){
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, "%s: avrdoper_open(): %s\n", progname, usbErrorText(rval));
|
2014-05-16 15:52:25 +00:00
|
|
|
return -1;
|
2006-12-20 23:43:34 +00:00
|
|
|
}
|
2010-10-22 14:29:56 +00:00
|
|
|
return 0;
|
2006-12-20 23:43:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
|
|
|
|
static void avrdoper_close(union filedescriptor *fdp)
|
|
|
|
{
|
|
|
|
usbCloseDevice(fdp);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
|
|
|
|
static int chooseDataSize(int len)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for(i = 0; i < sizeof(reportDataSizes)/sizeof(reportDataSizes[0]); i++){
|
|
|
|
if(reportDataSizes[i] >= len)
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
return i - 1;
|
|
|
|
}
|
|
|
|
|
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 avrdoper_send(const union filedescriptor *fdp, const unsigned char *buf, size_t buflen)
|
2006-12-20 23:43:34 +00:00
|
|
|
{
|
|
|
|
if(verbose > 3)
|
|
|
|
dumpBlock("Send", buf, buflen);
|
|
|
|
while(buflen > 0){
|
|
|
|
unsigned char buffer[256];
|
|
|
|
int rval, lenIndex = chooseDataSize(buflen);
|
|
|
|
int thisLen = buflen > reportDataSizes[lenIndex] ?
|
|
|
|
reportDataSizes[lenIndex] : buflen;
|
|
|
|
buffer[0] = lenIndex + 1; /* report ID */
|
|
|
|
buffer[1] = thisLen;
|
|
|
|
memcpy(buffer + 2, buf, thisLen);
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_TRACE, "Sending %d bytes data chunk\n", thisLen);
|
2006-12-20 23:43:34 +00:00
|
|
|
rval = usbSetReport(fdp, USB_HID_REPORT_TYPE_FEATURE, (char *)buffer,
|
|
|
|
reportDataSizes[lenIndex] + 2);
|
|
|
|
if(rval != 0){
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, "%s: avrdoper_send(): %s\n", progname, usbErrorText(rval));
|
2014-05-16 15:52:25 +00:00
|
|
|
return -1;
|
2006-12-20 23:43:34 +00:00
|
|
|
}
|
|
|
|
buflen -= thisLen;
|
|
|
|
buf += thisLen;
|
|
|
|
}
|
|
|
|
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 avrdoperFillBuffer(const union filedescriptor *fdp) {
|
2006-12-20 23:43:34 +00:00
|
|
|
int bytesPending = reportDataSizes[1]; /* guess how much data is buffered in device */
|
|
|
|
|
|
|
|
avrdoperRxPosition = avrdoperRxLength = 0;
|
|
|
|
while(bytesPending > 0){
|
|
|
|
int len, usbErr, lenIndex = chooseDataSize(bytesPending);
|
|
|
|
unsigned char buffer[128];
|
|
|
|
len = sizeof(avrdoperRxBuffer) - avrdoperRxLength; /* bytes remaining */
|
|
|
|
if(reportDataSizes[lenIndex] + 2 > len) /* requested data would not fit into buffer */
|
|
|
|
break;
|
|
|
|
len = reportDataSizes[lenIndex] + 2;
|
|
|
|
usbErr = usbGetReport(fdp, USB_HID_REPORT_TYPE_FEATURE, lenIndex + 1,
|
|
|
|
(char *)buffer, &len);
|
|
|
|
if(usbErr != 0){
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, "%s: avrdoperFillBuffer(): %s\n", progname, usbErrorText(usbErr));
|
2014-05-16 15:52:25 +00:00
|
|
|
return -1;
|
2006-12-20 23:43:34 +00:00
|
|
|
}
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_TRACE, "Received %d bytes data chunk of total %d\n", len - 2, buffer[1]);
|
2006-12-20 23:43:34 +00:00
|
|
|
len -= 2; /* compensate for report ID and length byte */
|
|
|
|
bytesPending = buffer[1] - len; /* amount still buffered */
|
|
|
|
if(len > buffer[1]) /* cut away padding */
|
|
|
|
len = buffer[1];
|
|
|
|
if(avrdoperRxLength + len > sizeof(avrdoperRxBuffer)){
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, "%s: avrdoperFillBuffer(): internal error: buffer overflow\n",
|
2014-05-18 08:41:46 +00:00
|
|
|
progname);
|
2014-05-16 15:52:25 +00:00
|
|
|
return -1;
|
2006-12-20 23:43:34 +00:00
|
|
|
}
|
|
|
|
memcpy(avrdoperRxBuffer + avrdoperRxLength, buffer + 2, len);
|
|
|
|
avrdoperRxLength += len;
|
|
|
|
}
|
2014-05-16 15:52:25 +00:00
|
|
|
return 0;
|
2006-12-20 23:43:34 +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 int avrdoper_recv(const union filedescriptor *fdp, unsigned char *buf, size_t buflen)
|
2006-12-20 23:43:34 +00:00
|
|
|
{
|
|
|
|
unsigned char *p = buf;
|
|
|
|
int remaining = buflen;
|
|
|
|
|
|
|
|
while(remaining > 0){
|
|
|
|
int len, available = avrdoperRxLength - avrdoperRxPosition;
|
|
|
|
if(available <= 0){ /* buffer is empty */
|
2014-05-16 15:52:25 +00:00
|
|
|
if (avrdoperFillBuffer(fdp) < 0)
|
|
|
|
return -1;
|
2006-12-20 23:43:34 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
len = remaining < available ? remaining : available;
|
|
|
|
memcpy(p, avrdoperRxBuffer + avrdoperRxPosition, len);
|
|
|
|
p += len;
|
|
|
|
remaining -= len;
|
|
|
|
avrdoperRxPosition += len;
|
|
|
|
}
|
|
|
|
if(verbose > 3)
|
|
|
|
dumpBlock("Receive", buf, buflen);
|
|
|
|
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 avrdoper_drain(const union filedescriptor *fdp, int display)
|
2006-12-20 23:43:34 +00:00
|
|
|
{
|
|
|
|
do{
|
2014-05-16 15:52:25 +00:00
|
|
|
if (avrdoperFillBuffer(fdp) < 0)
|
|
|
|
return -1;
|
2006-12-20 23:43:34 +00:00
|
|
|
}while(avrdoperRxLength > 0);
|
|
|
|
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 avrdoper_set_dtr_rts(const union filedescriptor *fdp, int is_on)
|
2009-10-10 01:41:40 +00:00
|
|
|
{
|
2014-06-13 20:07:40 +00:00
|
|
|
avrdude_message(MSG_INFO, "%s: AVR-Doper doesn't support DTR/RTS setting\n", progname);
|
2009-10-10 01:41:40 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
|
2006-12-20 23:43:34 +00:00
|
|
|
struct serial_device avrdoper_serdev =
|
|
|
|
{
|
|
|
|
.open = avrdoper_open,
|
|
|
|
.close = avrdoper_close,
|
|
|
|
.send = avrdoper_send,
|
|
|
|
.recv = avrdoper_recv,
|
|
|
|
.drain = avrdoper_drain,
|
2009-10-10 01:41:40 +00:00
|
|
|
.set_dtr_rts = avrdoper_set_dtr_rts,
|
2006-12-20 23:43:34 +00:00
|
|
|
.flags = SERDEV_FL_NONE,
|
|
|
|
};
|
|
|
|
|
2022-02-18 19:05:52 +00:00
|
|
|
#endif /* defined(HAVE_LIBHIDAPI) */
|