2011-08-25 16:12:30 +00:00
|
|
|
/*
|
|
|
|
* avrftdi - extension for avrdude, Wolfgang Moser, Ville Voipio
|
|
|
|
* Copyright (C) 2011 Hannes Weisbach, Doug Springer
|
|
|
|
*
|
|
|
|
* 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/>.
|
2011-08-25 16:12:30 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
/* $Id$ */
|
|
|
|
/*
|
|
|
|
* Interface to the MPSSE Engine of FTDI Chips using libftdi.
|
|
|
|
*/
|
|
|
|
#include "ac_cfg.h"
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <sys/time.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <stdint.h>
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
#include <stdarg.h>
|
2011-08-25 16:12:30 +00:00
|
|
|
|
|
|
|
#include "avrdude.h"
|
2014-05-19 10:01:59 +00:00
|
|
|
#include "libavrdude.h"
|
|
|
|
|
2011-08-25 16:12:30 +00:00
|
|
|
#include "avrftdi.h"
|
2013-05-02 11:06:15 +00:00
|
|
|
#include "avrftdi_tpi.h"
|
|
|
|
#include "avrftdi_private.h"
|
2014-02-27 13:06:03 +00:00
|
|
|
#include "usbdevs.h"
|
2011-08-25 16:12:30 +00:00
|
|
|
|
2013-09-03 20:33:52 +00:00
|
|
|
#ifndef MAX
|
|
|
|
#define MAX(a,b) ((a)>(b)?(a):(b))
|
|
|
|
#endif
|
|
|
|
#ifndef MIN
|
|
|
|
#define MIN(a,b) ((a)<(b)?(a):(b))
|
|
|
|
#endif
|
|
|
|
|
2013-05-16 17:11:35 +00:00
|
|
|
#ifdef DO_NOT_BUILD_AVRFTDI
|
|
|
|
|
|
|
|
static int avrftdi_noftdi_open (struct programmer_t *pgm, char * name)
|
|
|
|
{
|
2014-05-18 08:41:46 +00:00
|
|
|
avrdude_message("%s: Error: no libftdi or libusb support. Install libftdi1/libusb-1.0 or libftdi/libusb and run configure/make again.\n",
|
|
|
|
progname);
|
2013-05-16 17:11:35 +00:00
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
void avrftdi_initpgm(PROGRAMMER * pgm)
|
|
|
|
{
|
|
|
|
strcpy(pgm->type, "avrftdi");
|
|
|
|
pgm->open = avrftdi_noftdi_open;
|
|
|
|
}
|
|
|
|
|
|
|
|
#else
|
2011-08-25 16:12:30 +00:00
|
|
|
|
2013-05-06 11:48:15 +00:00
|
|
|
enum { FTDI_SCK = 0, FTDI_MOSI, FTDI_MISO, FTDI_RESET };
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
|
|
|
|
static int write_flush(avrftdi_t *);
|
2012-02-11 19:55:22 +00:00
|
|
|
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
/*
|
|
|
|
* returns a human-readable name for a pin number. the name should match with
|
|
|
|
* the pin names used in FTDI datasheets.
|
2011-08-25 16:12:30 +00:00
|
|
|
*/
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
static char*
|
2013-05-06 11:48:15 +00:00
|
|
|
ftdi_pin_name(avrftdi_t* pdata, struct pindef_t pin)
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
{
|
2013-05-06 11:48:15 +00:00
|
|
|
static char str[128];
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
|
|
|
|
char interface = '@';
|
2011-08-25 16:12:30 +00:00
|
|
|
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
/* INTERFACE_ANY is zero, so @ is used
|
|
|
|
* INTERFACE_A is one, so '@' + 1 = 'A'
|
|
|
|
* and so forth ...
|
|
|
|
* be aware, there is an 'interface' member in ftdi_context,
|
|
|
|
* however, we really want the 'index' member here.
|
|
|
|
*/
|
|
|
|
interface += pdata->ftdic->index;
|
|
|
|
|
2013-05-06 11:48:15 +00:00
|
|
|
int pinno;
|
|
|
|
int n = 0;
|
|
|
|
int mask = pin.mask[0];
|
|
|
|
|
|
|
|
const char * fmt;
|
|
|
|
|
|
|
|
str[0] = 0;
|
|
|
|
|
|
|
|
for(pinno = 0; mask; mask >>= 1, pinno++) {
|
|
|
|
if(!(mask & 1))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
int chars = 0;
|
|
|
|
|
|
|
|
char port;
|
|
|
|
/* This is FTDI's naming scheme.
|
|
|
|
* probably 'D' is for data and 'C' for control
|
|
|
|
*/
|
|
|
|
if(pinno < 8)
|
|
|
|
port = 'D';
|
|
|
|
else
|
|
|
|
port = 'C';
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
|
2013-05-06 11:48:15 +00:00
|
|
|
if(str[0] == 0)
|
|
|
|
fmt = "%c%cBUS%d%n";
|
|
|
|
else
|
|
|
|
fmt = ", %c%cBUS%d%n";
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
|
2013-05-06 11:48:15 +00:00
|
|
|
snprintf(&str[n], sizeof(str) - n, fmt, interface, port, pinno, &chars);
|
|
|
|
n += chars;
|
|
|
|
}
|
|
|
|
|
|
|
|
return str;
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* output function, to save if(vebose>level)-constructs. also prefixes output
|
2013-04-28 19:35:26 +00:00
|
|
|
* with "avrftdi function-name(line-number):" to identify were messages came
|
|
|
|
* from.
|
|
|
|
* This function is the backend of the log_*-macros, but it can be used
|
|
|
|
* directly.
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
*/
|
2013-05-02 11:07:37 +00:00
|
|
|
void avrftdi_log(int level, const char * func, int line,
|
2013-04-28 19:35:26 +00:00
|
|
|
const char * fmt, ...) {
|
|
|
|
static int skip_prefix = 0;
|
|
|
|
const char *p = fmt;
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
va_list ap;
|
2013-04-28 19:35:26 +00:00
|
|
|
|
2013-04-27 20:52:01 +00:00
|
|
|
if(verbose >= level)
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
{
|
2013-04-28 19:35:26 +00:00
|
|
|
if(!skip_prefix)
|
|
|
|
{
|
|
|
|
switch(level) {
|
2014-05-18 08:41:46 +00:00
|
|
|
case ERR: avrdude_message("E "); break;
|
|
|
|
case WARN: avrdude_message("W "); break;
|
|
|
|
case INFO: avrdude_message("I "); break;
|
|
|
|
case DEBUG: avrdude_message("D "); break;
|
|
|
|
case TRACE: avrdude_message("T "); break;
|
|
|
|
default: avrdude_message(" ");
|
2013-04-28 19:35:26 +00:00
|
|
|
}
|
2014-05-18 08:41:46 +00:00
|
|
|
avrdude_message("%s(%d): ", func, line);
|
2013-04-28 19:35:26 +00:00
|
|
|
}
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
va_start(ap, fmt);
|
2014-05-18 10:58:40 +00:00
|
|
|
avrdude_message(fmt, ap);
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
va_end(ap);
|
|
|
|
}
|
2013-04-28 19:35:26 +00:00
|
|
|
|
|
|
|
skip_prefix = 1;
|
|
|
|
while(*p++)
|
|
|
|
if(*p == '\n' && !(*(p+1)))
|
|
|
|
skip_prefix = 0;
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* helper function to print a binary buffer *buf of size len. begin and end of
|
|
|
|
* the dump are enclosed in the string contained in *desc. offset denotes the
|
|
|
|
* number of bytes which are printed on the first line (may be 0). after that
|
|
|
|
* width bytes are printed on each line
|
|
|
|
*/
|
2013-09-02 20:22:53 +00:00
|
|
|
static void buf_dump(const unsigned char *buf, int len, char *desc,
|
2011-08-25 16:12:30 +00:00
|
|
|
int offset, int width)
|
|
|
|
{
|
|
|
|
int i;
|
2014-05-18 08:41:46 +00:00
|
|
|
avrdude_message("%s begin:\n", desc);
|
2011-08-25 16:12:30 +00:00
|
|
|
for (i = 0; i < offset; i++)
|
2014-05-18 08:41:46 +00:00
|
|
|
avrdude_message("%02x ", buf[i]);
|
|
|
|
avrdude_message("\n");
|
2011-08-25 16:12:30 +00:00
|
|
|
for (i++; i <= len; i++) {
|
2014-05-18 08:41:46 +00:00
|
|
|
avrdude_message("%02x ", buf[i-1]);
|
2011-08-25 16:12:30 +00:00
|
|
|
if((i-offset) != 0 && (i-offset)%width == 0)
|
2014-05-18 08:41:46 +00:00
|
|
|
avrdude_message("\n");
|
2011-08-25 16:12:30 +00:00
|
|
|
}
|
2014-05-18 08:41:46 +00:00
|
|
|
avrdude_message("%s end\n", desc);
|
2011-08-25 16:12:30 +00:00
|
|
|
}
|
|
|
|
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
/*
|
|
|
|
* calculates the so-called 'divisor'-value from a given frequency.
|
|
|
|
* the divisor is sent to the chip.
|
|
|
|
*/
|
2012-02-11 19:55:22 +00:00
|
|
|
static int set_frequency(avrftdi_t* ftdi, uint32_t freq)
|
2011-08-25 16:12:30 +00:00
|
|
|
{
|
|
|
|
uint32_t divisor;
|
|
|
|
uint8_t buf[3];
|
|
|
|
|
|
|
|
/* divisor on 6000000 / freq - 1 */
|
|
|
|
divisor = (6000000 / freq) - 1;
|
|
|
|
if (divisor < 0) {
|
2013-04-28 19:35:26 +00:00
|
|
|
log_warn("Frequency too high (%u > 6 MHz)\n", freq);
|
|
|
|
log_warn("Resetting Frequency to 6MHz\n");
|
2011-08-25 16:12:30 +00:00
|
|
|
divisor = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (divisor > 65535) {
|
2013-04-28 19:35:26 +00:00
|
|
|
log_warn("Frequency too low (%u < 91.553 Hz)\n", freq);
|
|
|
|
log_warn("Resetting Frequency to 91.553Hz\n");
|
2011-08-25 16:12:30 +00:00
|
|
|
divisor = 65535;
|
|
|
|
}
|
|
|
|
|
2013-04-28 19:35:26 +00:00
|
|
|
log_info("Using frequency: %d\n", 6000000/(divisor+1));
|
|
|
|
log_info("Clock divisor: 0x%04x\n", divisor);
|
2011-08-25 16:12:30 +00:00
|
|
|
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
buf[0] = TCK_DIVISOR;
|
2011-08-25 16:12:30 +00:00
|
|
|
buf[1] = (uint8_t)(divisor & 0xff);
|
|
|
|
buf[2] = (uint8_t)((divisor >> 8) & 0xff);
|
|
|
|
|
2012-02-11 19:55:22 +00:00
|
|
|
E(ftdi_write_data(ftdi->ftdic, buf, 3) < 0, ftdi->ftdic);
|
2011-08-25 16:12:30 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
/*
|
|
|
|
* This function sets or clears any pin, except SCK, MISO and MOSI. Depending
|
|
|
|
* on the pin configuration, a non-zero value sets the pin in the 'active'
|
|
|
|
* state (high active, low active) and a zero value sets the pin in the
|
|
|
|
* inactive state.
|
|
|
|
* Because we configured the pin direction mask earlier, nothing bad can happen
|
|
|
|
* here.
|
|
|
|
*/
|
|
|
|
static int set_pin(PROGRAMMER * pgm, int pinfunc, int value)
|
2011-08-25 16:12:30 +00:00
|
|
|
{
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
avrftdi_t* pdata = to_pdata(pgm);
|
2013-05-06 11:48:15 +00:00
|
|
|
struct pindef_t pin = pgm->pin[pinfunc];
|
2013-05-02 11:06:15 +00:00
|
|
|
|
2013-05-07 08:50:06 +00:00
|
|
|
if (pin.mask[0] == 0) {
|
|
|
|
// ignore not defined pins (might be the led or vcc or buff if not needed)
|
|
|
|
return 0;
|
2011-08-25 16:12:30 +00:00
|
|
|
}
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
|
2013-05-06 11:48:15 +00:00
|
|
|
log_debug("Setting pin %s (%s) as %s: %s (%s active)\n",
|
|
|
|
pinmask_to_str(pin.mask), ftdi_pin_name(pdata, pin),
|
|
|
|
avr_pin_name(pinfunc),
|
|
|
|
(value) ? "high" : "low", (pin.inverse[0]) ? "low" : "high");
|
2011-08-25 16:12:30 +00:00
|
|
|
|
2013-05-06 11:48:15 +00:00
|
|
|
pdata->pin_value = SET_BITS_0(pdata->pin_value, pgm, pinfunc, value);
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
|
2012-02-11 19:55:22 +00:00
|
|
|
return write_flush(pdata);
|
2011-08-25 16:12:30 +00:00
|
|
|
}
|
|
|
|
|
2013-05-07 08:50:13 +00:00
|
|
|
/*
|
|
|
|
* Mandatory callbacks which boil down to GPIO.
|
2011-08-25 16:12:30 +00:00
|
|
|
*/
|
|
|
|
static int set_led_pgm(struct programmer_t * pgm, int value)
|
|
|
|
{
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
return set_pin(pgm, PIN_LED_PGM, value);
|
2011-08-25 16:12:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int set_led_rdy(struct programmer_t * pgm, int value)
|
|
|
|
{
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
return set_pin(pgm, PIN_LED_RDY, value);
|
2011-08-25 16:12:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int set_led_err(struct programmer_t * pgm, int value)
|
|
|
|
{
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
return set_pin(pgm, PIN_LED_ERR, value);
|
2011-08-25 16:12:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int set_led_vfy(struct programmer_t * pgm, int value)
|
|
|
|
{
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
return set_pin(pgm, PIN_LED_VFY, value);
|
2011-08-25 16:12:30 +00:00
|
|
|
}
|
|
|
|
|
2013-05-07 08:50:13 +00:00
|
|
|
static void avrftdi_enable(PROGRAMMER * pgm)
|
|
|
|
{
|
|
|
|
set_pin(pgm, PPI_AVR_BUFF, ON);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void avrftdi_disable(PROGRAMMER * pgm)
|
|
|
|
{
|
|
|
|
set_pin(pgm, PPI_AVR_BUFF, OFF);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void avrftdi_powerup(PROGRAMMER * pgm)
|
|
|
|
{
|
|
|
|
set_pin(pgm, PPI_AVR_VCC, ON);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void avrftdi_powerdown(PROGRAMMER * pgm)
|
|
|
|
{
|
|
|
|
set_pin(pgm, PPI_AVR_VCC, OFF);
|
|
|
|
}
|
|
|
|
|
2013-06-19 17:40:32 +00:00
|
|
|
static inline int set_data(PROGRAMMER * pgm, unsigned char *buf, unsigned char data, bool read_data) {
|
|
|
|
int j;
|
|
|
|
int buf_pos = 0;
|
|
|
|
unsigned char bit = 0x80;
|
|
|
|
avrftdi_t* pdata = to_pdata(pgm);
|
|
|
|
|
|
|
|
for (j=0; j<8; j++) {
|
|
|
|
pdata->pin_value = SET_BITS_0(pdata->pin_value,pgm,PIN_AVR_MOSI,data & bit);
|
|
|
|
pdata->pin_value = SET_BITS_0(pdata->pin_value,pgm,PIN_AVR_SCK,0);
|
|
|
|
buf[buf_pos++] = SET_BITS_LOW;
|
|
|
|
buf[buf_pos++] = (pdata->pin_value) & 0xff;
|
|
|
|
buf[buf_pos++] = (pdata->pin_direction) & 0xff;
|
|
|
|
buf[buf_pos++] = SET_BITS_HIGH;
|
|
|
|
buf[buf_pos++] = ((pdata->pin_value) >> 8) & 0xff;
|
|
|
|
buf[buf_pos++] = ((pdata->pin_direction) >> 8) & 0xff;
|
|
|
|
|
|
|
|
pdata->pin_value = SET_BITS_0(pdata->pin_value,pgm,PIN_AVR_SCK,1);
|
|
|
|
buf[buf_pos++] = SET_BITS_LOW;
|
|
|
|
buf[buf_pos++] = (pdata->pin_value) & 0xff;
|
|
|
|
buf[buf_pos++] = (pdata->pin_direction) & 0xff;
|
|
|
|
buf[buf_pos++] = SET_BITS_HIGH;
|
|
|
|
buf[buf_pos++] = ((pdata->pin_value) >> 8) & 0xff;
|
|
|
|
buf[buf_pos++] = ((pdata->pin_direction) >> 8) & 0xff;
|
|
|
|
|
|
|
|
if (read_data) {
|
|
|
|
buf[buf_pos++] = GET_BITS_LOW;
|
|
|
|
buf[buf_pos++] = GET_BITS_HIGH;
|
|
|
|
}
|
|
|
|
|
|
|
|
bit >>= 1;
|
|
|
|
}
|
|
|
|
return buf_pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline unsigned char extract_data(PROGRAMMER * pgm, unsigned char *buf, int offset) {
|
|
|
|
int j;
|
|
|
|
unsigned char bit = 0x80;
|
|
|
|
unsigned char r = 0;
|
|
|
|
|
|
|
|
buf += offset * 16; // 2 bytes per bit, 8 bits
|
|
|
|
for (j=0; j<8; j++) {
|
|
|
|
uint16_t in = buf[0] | (buf[1] << 8);
|
|
|
|
if (GET_BITS_0(in,pgm,PIN_AVR_MISO)) {
|
|
|
|
r |= bit;
|
|
|
|
}
|
|
|
|
buf += 2; // 2 bytes per input
|
|
|
|
bit >>= 1;
|
|
|
|
}
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-09-02 20:22:53 +00:00
|
|
|
static int avrftdi_transmit_bb(PROGRAMMER * pgm, unsigned char mode, const unsigned char *buf,
|
2013-06-19 17:40:32 +00:00
|
|
|
unsigned char *data, int buf_size)
|
|
|
|
{
|
|
|
|
size_t remaining = buf_size;
|
|
|
|
size_t written = 0;
|
|
|
|
avrftdi_t* pdata = to_pdata(pgm);
|
2013-09-03 20:33:52 +00:00
|
|
|
size_t blocksize = pdata->rx_buffer_size/2; // we are reading 2 bytes per data byte
|
2013-06-19 17:40:32 +00:00
|
|
|
|
2013-09-03 20:33:52 +00:00
|
|
|
// determine a maximum size of data block
|
|
|
|
size_t max_size = MIN(pdata->ftdic->max_packet_size,pdata->tx_buffer_size);
|
|
|
|
// select block size so that resulting commands does not exceed max_size if possible
|
|
|
|
blocksize = MAX(1,(max_size-7)/((8*2*6)+(8*1*2)));
|
2014-05-18 08:41:46 +00:00
|
|
|
//avrdude_message("blocksize %d \n",blocksize);
|
2013-06-19 17:40:32 +00:00
|
|
|
|
|
|
|
while(remaining)
|
|
|
|
{
|
|
|
|
|
|
|
|
size_t transfer_size = (remaining > blocksize) ? blocksize : remaining;
|
|
|
|
|
|
|
|
// (8*2) outputs per data byte, 6 transmit bytes per output (SET_BITS_LOW/HIGH),
|
|
|
|
// (8*1) inputs per data byte, 2 transmit bytes per input (GET_BITS_LOW/HIGH),
|
|
|
|
// 1x SEND_IMMEDIATE
|
|
|
|
unsigned char send_buffer[(8*2*6)*transfer_size+(8*1*2)*transfer_size+7];
|
|
|
|
int len = 0;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for(i = 0 ; i< transfer_size; i++) {
|
|
|
|
len += set_data(pgm, send_buffer + len, buf[written+i], (mode & MPSSE_DO_READ) != 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
pdata->pin_value = SET_BITS_0(pdata->pin_value,pgm,PIN_AVR_SCK,0);
|
|
|
|
send_buffer[len++] = SET_BITS_LOW;
|
|
|
|
send_buffer[len++] = (pdata->pin_value) & 0xff;
|
|
|
|
send_buffer[len++] = (pdata->pin_direction) & 0xff;
|
|
|
|
send_buffer[len++] = SET_BITS_HIGH;
|
|
|
|
send_buffer[len++] = ((pdata->pin_value) >> 8) & 0xff;
|
|
|
|
send_buffer[len++] = ((pdata->pin_direction) >> 8) & 0xff;
|
|
|
|
|
|
|
|
send_buffer[len++] = SEND_IMMEDIATE;
|
|
|
|
|
|
|
|
E(ftdi_write_data(pdata->ftdic, send_buffer, len) != len, pdata->ftdic);
|
|
|
|
if (mode & MPSSE_DO_READ) {
|
|
|
|
unsigned char recv_buffer[2*16*transfer_size];
|
|
|
|
int n;
|
|
|
|
int k = 0;
|
|
|
|
do {
|
|
|
|
n = ftdi_read_data(pdata->ftdic, &recv_buffer[k], 2*16*transfer_size - k);
|
|
|
|
E(n < 0, pdata->ftdic);
|
|
|
|
k += n;
|
|
|
|
} while (k < transfer_size);
|
|
|
|
|
|
|
|
for(i = 0 ; i< transfer_size; i++) {
|
|
|
|
data[written + i] = extract_data(pgm, recv_buffer, i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
written += transfer_size;
|
|
|
|
remaining -= transfer_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
return written;
|
|
|
|
}
|
|
|
|
|
2012-11-13 21:34:02 +00:00
|
|
|
/* Send 'buf_size' bytes from 'cmd' to device and return data from device in
|
|
|
|
* buffer 'data'.
|
|
|
|
* Write is only performed when mode contains MPSSE_DO_WRITE.
|
2013-04-27 21:49:27 +00:00
|
|
|
* Read is only performed when mode contains MPSSE_DO_WRITE and MPSSE_DO_READ.
|
2012-11-13 21:34:02 +00:00
|
|
|
*/
|
2013-09-02 20:22:53 +00:00
|
|
|
static int avrftdi_transmit_mpsse(avrftdi_t* pdata, unsigned char mode, const unsigned char *buf,
|
2011-08-25 16:12:30 +00:00
|
|
|
unsigned char *data, int buf_size)
|
|
|
|
{
|
2013-04-27 21:49:27 +00:00
|
|
|
size_t blocksize;
|
|
|
|
size_t remaining = buf_size;
|
|
|
|
size_t written = 0;
|
|
|
|
|
|
|
|
unsigned char cmd[3];
|
|
|
|
// unsigned char si = SEND_IMMEDIATE;
|
2011-08-25 16:12:30 +00:00
|
|
|
|
2013-04-27 21:49:27 +00:00
|
|
|
cmd[0] = mode | MPSSE_WRITE_NEG;
|
|
|
|
cmd[1] = ((buf_size - 1) & 0xff);
|
|
|
|
cmd[2] = (((buf_size - 1) >> 8) & 0xff);
|
2011-08-25 16:12:30 +00:00
|
|
|
|
2013-04-27 21:49:27 +00:00
|
|
|
//if we are not reading back, we can just write the data out
|
|
|
|
if(!(mode & MPSSE_DO_READ))
|
|
|
|
blocksize = buf_size;
|
|
|
|
else
|
|
|
|
blocksize = pdata->rx_buffer_size;
|
2011-08-25 16:12:30 +00:00
|
|
|
|
2013-04-27 21:49:27 +00:00
|
|
|
E(ftdi_write_data(pdata->ftdic, cmd, sizeof(cmd)) != sizeof(cmd), pdata->ftdic);
|
2011-08-25 16:12:30 +00:00
|
|
|
|
2013-04-27 21:49:27 +00:00
|
|
|
while(remaining)
|
|
|
|
{
|
|
|
|
size_t transfer_size = (remaining > blocksize) ? blocksize : remaining;
|
|
|
|
|
|
|
|
E(ftdi_write_data(pdata->ftdic, &buf[written], transfer_size) != transfer_size, pdata->ftdic);
|
|
|
|
#if 0
|
|
|
|
if(remaining < blocksize)
|
|
|
|
E(ftdi_write_data(pdata->ftdic, &si, sizeof(si)) != sizeof(si), pdata->ftdic);
|
2011-08-25 16:12:30 +00:00
|
|
|
#endif
|
|
|
|
|
2013-04-27 21:49:27 +00:00
|
|
|
if (mode & MPSSE_DO_READ) {
|
|
|
|
int n;
|
|
|
|
int k = 0;
|
|
|
|
do {
|
|
|
|
n = ftdi_read_data(pdata->ftdic, &data[written + k], transfer_size - k);
|
|
|
|
E(n < 0, pdata->ftdic);
|
|
|
|
k += n;
|
|
|
|
} while (k < transfer_size);
|
2011-08-25 16:12:30 +00:00
|
|
|
|
2013-04-27 21:49:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
written += transfer_size;
|
|
|
|
remaining -= transfer_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
return written;
|
2011-08-25 16:12:30 +00:00
|
|
|
}
|
|
|
|
|
2013-09-02 20:22:53 +00:00
|
|
|
static inline int avrftdi_transmit(PROGRAMMER * pgm, unsigned char mode, const unsigned char *buf,
|
2013-06-19 17:40:32 +00:00
|
|
|
unsigned char *data, int buf_size)
|
|
|
|
{
|
|
|
|
avrftdi_t* pdata = to_pdata(pgm);
|
|
|
|
if (pdata->use_bitbanging)
|
|
|
|
return avrftdi_transmit_bb(pgm, mode, buf, data, buf_size);
|
|
|
|
else
|
|
|
|
return avrftdi_transmit_mpsse(pdata, mode, buf, data, buf_size);
|
|
|
|
}
|
2013-09-02 20:22:53 +00:00
|
|
|
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
static int write_flush(avrftdi_t* pdata)
|
|
|
|
{
|
|
|
|
unsigned char buf[6];
|
|
|
|
|
2013-04-28 19:35:26 +00:00
|
|
|
log_debug("Setting pin direction (0x%04x) and value (0x%04x)\n",
|
|
|
|
pdata->pin_direction, pdata->pin_value);
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
|
|
|
|
buf[0] = SET_BITS_LOW;
|
|
|
|
buf[1] = (pdata->pin_value) & 0xff;
|
|
|
|
buf[2] = (pdata->pin_direction) & 0xff;
|
|
|
|
buf[3] = SET_BITS_HIGH;
|
|
|
|
buf[4] = ((pdata->pin_value) >> 8) & 0xff;
|
|
|
|
buf[5] = ((pdata->pin_direction) >> 8) & 0xff;
|
|
|
|
|
|
|
|
E(ftdi_write_data(pdata->ftdic, buf, 6) != 6, pdata->ftdic);
|
|
|
|
|
2013-04-28 19:35:26 +00:00
|
|
|
log_trace("Set pins command: %02x %02x %02x %02x %02x %02x\n",
|
|
|
|
buf[0], buf[1], buf[2], buf[3], buf[4], buf[5]);
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
|
|
|
|
/* we need to flush here, because set_pin is used as reset.
|
|
|
|
* if we want to sleep reset periods, we must be certain the
|
|
|
|
* avr has got the reset signal when we start sleeping.
|
|
|
|
* (it may be stuck in the USB stack or some USB hub)
|
|
|
|
*
|
2014-06-11 07:17:54 +00:00
|
|
|
* Add.: purge does NOT flush. It clears. Also, it is unknown, when the purge
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
* command actually arrives at the chip.
|
2013-05-02 11:06:15 +00:00
|
|
|
* Use read pin status command as sync.
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
*/
|
|
|
|
//E(ftdi_usb_purge_buffers(pdata->ftdic), pdata->ftdic);
|
|
|
|
|
|
|
|
unsigned char cmd[] = { GET_BITS_LOW, SEND_IMMEDIATE };
|
|
|
|
E(ftdi_write_data(pdata->ftdic, cmd, sizeof(cmd)) != sizeof(cmd), pdata->ftdic);
|
2013-05-02 11:07:07 +00:00
|
|
|
|
|
|
|
int num = 0;
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
do
|
|
|
|
{
|
2013-05-02 11:07:07 +00:00
|
|
|
int n = ftdi_read_data(pdata->ftdic, buf, sizeof(buf));
|
2013-05-02 11:06:15 +00:00
|
|
|
if(n > 0)
|
|
|
|
num += n;
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
E(n < 0, pdata->ftdic);
|
2013-05-02 11:07:07 +00:00
|
|
|
} while(num < 1);
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
|
2013-05-02 11:07:07 +00:00
|
|
|
if(num > 1)
|
|
|
|
log_warn("Read %d extra bytes\n", num-1);
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
|
|
|
|
return 0;
|
2013-05-02 11:06:15 +00:00
|
|
|
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
}
|
|
|
|
|
2013-06-19 17:40:32 +00:00
|
|
|
static int avrftdi_check_pins_bb(PROGRAMMER * pgm, bool output)
|
2013-05-06 11:48:15 +00:00
|
|
|
{
|
2013-06-19 17:40:32 +00:00
|
|
|
int pin;
|
|
|
|
|
|
|
|
/* pin checklist. */
|
|
|
|
struct pin_checklist_t pin_checklist[N_PINS];
|
|
|
|
|
|
|
|
avrftdi_t* pdata = to_pdata(pgm);
|
|
|
|
|
|
|
|
/* value for 8/12/16 bit wide interface */
|
|
|
|
int valid_mask = ((1 << pdata->pin_limit) - 1);
|
|
|
|
|
|
|
|
log_debug("Using valid mask bibanging: 0x%08x\n", valid_mask);
|
|
|
|
static struct pindef_t valid_pins;
|
|
|
|
valid_pins.mask[0] = valid_mask;
|
|
|
|
valid_pins.inverse[0] = valid_mask ;
|
|
|
|
|
|
|
|
/* build pin checklist */
|
|
|
|
for(pin = 0; pin < N_PINS; ++pin) {
|
|
|
|
pin_checklist[pin].pinname = pin;
|
|
|
|
pin_checklist[pin].mandatory = 0;
|
|
|
|
pin_checklist[pin].valid_pins = &valid_pins;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* assumes all checklists above have same number of entries */
|
|
|
|
return pins_check(pgm, pin_checklist, N_PINS, output);
|
|
|
|
}
|
2013-05-06 11:48:15 +00:00
|
|
|
|
2013-06-19 17:40:32 +00:00
|
|
|
static int avrftdi_check_pins_mpsse(PROGRAMMER * pgm, bool output)
|
|
|
|
{
|
2013-05-06 11:48:15 +00:00
|
|
|
int pin;
|
|
|
|
|
2013-06-19 17:40:32 +00:00
|
|
|
/* pin checklist. */
|
|
|
|
struct pin_checklist_t pin_checklist[N_PINS];
|
|
|
|
|
2013-05-06 11:48:15 +00:00
|
|
|
avrftdi_t* pdata = to_pdata(pgm);
|
|
|
|
|
|
|
|
/* SCK/MOSI/MISO are fixed and not invertable?*/
|
|
|
|
/* TODO: inverted SCK/MISO/MOSI */
|
|
|
|
static const struct pindef_t valid_pins_SCK = {{0x01},{0x00}} ;
|
|
|
|
static const struct pindef_t valid_pins_MOSI = {{0x02},{0x00}} ;
|
|
|
|
static const struct pindef_t valid_pins_MISO = {{0x04},{0x00}} ;
|
|
|
|
|
|
|
|
/* value for 8/12/16 bit wide interface for other pins */
|
|
|
|
int valid_mask = ((1 << pdata->pin_limit) - 1);
|
|
|
|
/* mask out SCK/MISO/MOSI */
|
|
|
|
valid_mask &= ~((1 << FTDI_SCK) | (1 << FTDI_MOSI) | (1 << FTDI_MISO));
|
|
|
|
|
2013-06-19 17:40:32 +00:00
|
|
|
log_debug("Using valid mask mpsse: 0x%08x\n", valid_mask);
|
2013-05-06 11:48:15 +00:00
|
|
|
static struct pindef_t valid_pins_others;
|
|
|
|
valid_pins_others.mask[0] = valid_mask;
|
|
|
|
valid_pins_others.inverse[0] = valid_mask ;
|
|
|
|
|
|
|
|
/* build pin checklist */
|
2013-05-07 08:50:06 +00:00
|
|
|
for(pin = 0; pin < N_PINS; ++pin) {
|
2013-06-19 17:40:32 +00:00
|
|
|
pin_checklist[pin].pinname = pin;
|
|
|
|
pin_checklist[pin].mandatory = 0;
|
|
|
|
pin_checklist[pin].valid_pins = &valid_pins_others;
|
2013-05-06 11:48:15 +00:00
|
|
|
}
|
|
|
|
|
2013-06-19 17:40:32 +00:00
|
|
|
/* now set mpsse specific pins */
|
|
|
|
pin_checklist[PIN_AVR_SCK].mandatory = 1;
|
|
|
|
pin_checklist[PIN_AVR_SCK].valid_pins = &valid_pins_SCK;
|
|
|
|
pin_checklist[PIN_AVR_MOSI].mandatory = 1;
|
|
|
|
pin_checklist[PIN_AVR_MOSI].valid_pins = &valid_pins_MOSI;
|
|
|
|
pin_checklist[PIN_AVR_MISO].mandatory = 1;
|
|
|
|
pin_checklist[PIN_AVR_MISO].valid_pins = &valid_pins_MISO;
|
|
|
|
pin_checklist[PIN_AVR_RESET].mandatory = 1;
|
2013-05-06 11:48:15 +00:00
|
|
|
|
|
|
|
/* assumes all checklists above have same number of entries */
|
2013-06-19 17:40:32 +00:00
|
|
|
return pins_check(pgm, pin_checklist, N_PINS, output);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int avrftdi_pin_setup(PROGRAMMER * pgm)
|
|
|
|
{
|
|
|
|
int pin;
|
|
|
|
|
|
|
|
/*************
|
|
|
|
* pin setup *
|
|
|
|
*************/
|
|
|
|
|
|
|
|
avrftdi_t* pdata = to_pdata(pgm);
|
|
|
|
|
|
|
|
bool pin_check_mpsse = (0 == avrftdi_check_pins_mpsse(pgm, verbose>3));
|
|
|
|
|
|
|
|
bool pin_check_bitbanging = (0 == avrftdi_check_pins_bb(pgm, verbose>3));
|
|
|
|
|
|
|
|
if (!pin_check_mpsse && !pin_check_bitbanging) {
|
|
|
|
log_err("No valid pin configuration found.\n");
|
|
|
|
avrftdi_check_pins_bb(pgm, true);
|
2013-05-06 11:48:15 +00:00
|
|
|
log_err("Pin configuration for FTDI MPSSE must be:\n");
|
|
|
|
log_err("%s: 0, %s: 1, %s: 2 (is: %s, %s, %s)\n", avr_pin_name(PIN_AVR_SCK),
|
|
|
|
avr_pin_name(PIN_AVR_MOSI), avr_pin_name(PIN_AVR_MISO),
|
|
|
|
pins_to_str(&pgm->pin[PIN_AVR_SCK]),
|
|
|
|
pins_to_str(&pgm->pin[PIN_AVR_MOSI]),
|
|
|
|
pins_to_str(&pgm->pin[PIN_AVR_MISO]));
|
2013-06-19 17:40:32 +00:00
|
|
|
log_err("If other pin configuration is used, fallback to slower bitbanging mode is used.\n");
|
2013-05-06 11:48:15 +00:00
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2013-06-20 20:45:12 +00:00
|
|
|
pdata->use_bitbanging = !pin_check_mpsse;
|
2013-06-19 17:40:32 +00:00
|
|
|
if (pdata->use_bitbanging) log_info("Because of pin configuration fallback to bitbanging mode.\n");
|
|
|
|
|
2013-05-06 11:48:15 +00:00
|
|
|
/*
|
|
|
|
* TODO: No need to fail for a wrongly configured led or something.
|
|
|
|
* Maybe we should only fail for SCK; MISO, MOSI, RST (and probably
|
|
|
|
* VCC and BUFF).
|
|
|
|
*/
|
|
|
|
|
2013-06-19 17:40:32 +00:00
|
|
|
/* everything is an output, except MISO */
|
|
|
|
for(pin = 0; pin < N_PINS; ++pin) {
|
|
|
|
pdata->pin_direction |= pgm->pin[pin].mask[0];
|
|
|
|
pdata->pin_value = SET_BITS_0(pdata->pin_value, pgm, pin, OFF);
|
|
|
|
}
|
|
|
|
pdata->pin_direction &= ~pgm->pin[PIN_AVR_MISO].mask[0];
|
|
|
|
|
|
|
|
for(pin = PIN_LED_ERR; pin < N_PINS; ++pin) {
|
|
|
|
pdata->led_mask |= pgm->pin[pin].mask[0];
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-05-06 11:48:15 +00:00
|
|
|
log_info("Pin direction mask: %04x\n", pdata->pin_direction);
|
|
|
|
log_info("Pin value mask: %04x\n", pdata->pin_value);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
|
2011-08-25 16:12:30 +00:00
|
|
|
static int avrftdi_open(PROGRAMMER * pgm, char *port)
|
|
|
|
{
|
2013-04-27 20:52:01 +00:00
|
|
|
int vid, pid, interface, index, err;
|
|
|
|
char * serial, *desc;
|
2012-02-11 19:55:22 +00:00
|
|
|
|
|
|
|
avrftdi_t* pdata = to_pdata(pgm);
|
|
|
|
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
/************************
|
|
|
|
* parameter validation *
|
|
|
|
************************/
|
|
|
|
|
2011-08-25 16:12:30 +00:00
|
|
|
/* use vid/pid in following priority: config,
|
|
|
|
* defaults. cmd-line is currently not supported */
|
2013-04-27 20:52:01 +00:00
|
|
|
|
2011-08-25 16:12:30 +00:00
|
|
|
if (pgm->usbvid)
|
|
|
|
vid = pgm->usbvid;
|
|
|
|
else
|
2014-02-27 13:06:03 +00:00
|
|
|
vid = USB_VENDOR_FTDI;
|
|
|
|
|
|
|
|
LNODEID usbpid = lfirst(pgm->usbpid);
|
|
|
|
if (usbpid) {
|
|
|
|
pid = *(int *)(ldata(usbpid));
|
|
|
|
if (lnext(usbpid))
|
2014-05-18 08:41:46 +00:00
|
|
|
avrdude_message("%s: Warning: using PID 0x%04x, ignoring remaining PIDs in list\n",
|
|
|
|
progname, pid);
|
2014-02-27 13:06:03 +00:00
|
|
|
} else
|
|
|
|
pid = USB_DEVICE_FT2232;
|
2011-08-25 16:12:30 +00:00
|
|
|
|
|
|
|
if (0 == pgm->usbsn[0]) /* we don't care about SN. Use first avail. */
|
2013-04-27 20:52:01 +00:00
|
|
|
serial = NULL;
|
|
|
|
else
|
|
|
|
serial = pgm->usbsn;
|
|
|
|
|
|
|
|
/* not used yet, but i put them here, just in case someone does needs or
|
|
|
|
* wants to implement this.
|
|
|
|
*/
|
|
|
|
desc = NULL;
|
|
|
|
index = 0;
|
2011-08-25 16:12:30 +00:00
|
|
|
|
|
|
|
if (pgm->usbdev[0] == 'a' || pgm->usbdev[0] == 'A')
|
|
|
|
interface = INTERFACE_A;
|
|
|
|
else if (pgm->usbdev[0] == 'b' || pgm->usbdev[0] == 'B')
|
|
|
|
interface = INTERFACE_B;
|
|
|
|
else {
|
2013-04-28 19:35:26 +00:00
|
|
|
log_warn("Invalid interface '%s'. Setting to Interface A\n", pgm->usbdev);
|
2011-08-25 16:12:30 +00:00
|
|
|
interface = INTERFACE_A;
|
|
|
|
}
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
|
|
|
|
/****************
|
|
|
|
* Device setup *
|
|
|
|
****************/
|
|
|
|
|
2012-02-11 19:55:22 +00:00
|
|
|
E(ftdi_set_interface(pdata->ftdic, interface) < 0, pdata->ftdic);
|
2013-04-27 20:52:01 +00:00
|
|
|
|
|
|
|
err = ftdi_usb_open_desc_index(pdata->ftdic, vid, pid, desc, serial, index);
|
|
|
|
if(err) {
|
2013-04-28 19:35:26 +00:00
|
|
|
log_err("Error %d occured: %s\n", err, ftdi_get_error_string(pdata->ftdic));
|
2013-04-27 20:52:01 +00:00
|
|
|
//stupid hack, because avrdude calls pgm->close() even when pgm->open() fails
|
|
|
|
//and usb_dev is intialized to the last usb device from probing
|
|
|
|
pdata->ftdic->usb_dev = NULL;
|
|
|
|
return err;
|
|
|
|
} else {
|
2013-04-28 19:35:26 +00:00
|
|
|
log_info("Using device VID:PID %04x:%04x and SN '%s' on interface %c.\n",
|
|
|
|
vid, pid, serial, INTERFACE_A == interface? 'A': 'B');
|
2013-04-27 20:52:01 +00:00
|
|
|
}
|
|
|
|
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
ftdi_set_latency_timer(pdata->ftdic, 1);
|
2013-05-02 11:06:15 +00:00
|
|
|
//ftdi_write_data_set_chunksize(pdata->ftdic, 16);
|
|
|
|
//ftdi_read_data_set_chunksize(pdata->ftdic, 16);
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
|
|
|
|
/* set SPI mode */
|
|
|
|
E(ftdi_set_bitmode(pdata->ftdic, 0, BITMODE_RESET) < 0, pdata->ftdic);
|
|
|
|
E(ftdi_set_bitmode(pdata->ftdic, pdata->pin_direction & 0xff, BITMODE_MPSSE) < 0, pdata->ftdic);
|
|
|
|
E(ftdi_usb_purge_buffers(pdata->ftdic), pdata->ftdic);
|
|
|
|
|
2013-05-02 11:06:15 +00:00
|
|
|
write_flush(pdata);
|
|
|
|
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
if (pgm->baudrate) {
|
|
|
|
set_frequency(pdata, pgm->baudrate);
|
|
|
|
} else if(pgm->bitclock) {
|
|
|
|
set_frequency(pdata, (uint32_t)(1.0f/pgm->bitclock));
|
|
|
|
} else {
|
|
|
|
set_frequency(pdata, pgm->baudrate ? pgm->baudrate : 150000);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* set pin limit depending on chip type */
|
|
|
|
switch(pdata->ftdic->type) {
|
2012-08-13 19:03:41 +00:00
|
|
|
case TYPE_AM:
|
|
|
|
case TYPE_BM:
|
|
|
|
case TYPE_R:
|
2013-04-28 19:35:26 +00:00
|
|
|
log_err("Found unsupported device type AM, BM or R. avrftdi ");
|
|
|
|
log_err("cannot work with your chip. Try the 'synbb' programmer.\n");
|
|
|
|
return -1;
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
case TYPE_2232C:
|
2013-05-06 11:48:15 +00:00
|
|
|
pdata->pin_limit = 12;
|
2013-04-27 21:49:27 +00:00
|
|
|
pdata->rx_buffer_size = 384;
|
2013-09-03 20:33:52 +00:00
|
|
|
pdata->tx_buffer_size = 128;
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
break;
|
|
|
|
case TYPE_2232H:
|
2013-05-06 11:48:15 +00:00
|
|
|
pdata->pin_limit = 16;
|
2013-04-27 21:49:27 +00:00
|
|
|
pdata->rx_buffer_size = 4096;
|
2013-09-03 20:33:52 +00:00
|
|
|
pdata->tx_buffer_size = 4096;
|
2013-04-27 21:49:27 +00:00
|
|
|
break;
|
2013-05-16 17:11:35 +00:00
|
|
|
#ifdef HAVE_LIBFTDI_TYPE_232H
|
2012-08-13 19:03:41 +00:00
|
|
|
case TYPE_232H:
|
2013-05-06 11:48:15 +00:00
|
|
|
pdata->pin_limit = 16;
|
2013-04-27 21:49:27 +00:00
|
|
|
pdata->rx_buffer_size = 1024;
|
2013-09-03 20:33:52 +00:00
|
|
|
pdata->tx_buffer_size = 1024;
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
break;
|
2013-05-16 17:11:35 +00:00
|
|
|
#else
|
|
|
|
#warning No support for 232H, use a newer libftdi, version >= 0.20
|
|
|
|
#endif
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
case TYPE_4232H:
|
2013-05-06 11:48:15 +00:00
|
|
|
pdata->pin_limit = 8;
|
2013-04-27 21:49:27 +00:00
|
|
|
pdata->rx_buffer_size = 2048;
|
2013-09-03 20:33:52 +00:00
|
|
|
pdata->tx_buffer_size = 2048;
|
2012-08-13 19:03:41 +00:00
|
|
|
break;
|
|
|
|
default:
|
2014-06-11 07:17:54 +00:00
|
|
|
log_warn("Found unknown device %x. I will do my ", pdata->ftdic->type);
|
2013-04-28 19:35:26 +00:00
|
|
|
log_warn("best to work with it, but no guarantees ...\n");
|
2013-05-06 11:48:15 +00:00
|
|
|
pdata->pin_limit = 8;
|
2013-04-27 21:49:27 +00:00
|
|
|
pdata->rx_buffer_size = pdata->ftdic->max_packet_size;
|
2013-09-03 20:33:52 +00:00
|
|
|
pdata->tx_buffer_size = pdata->ftdic->max_packet_size;
|
2012-08-13 19:31:38 +00:00
|
|
|
break;
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
}
|
2013-05-07 08:50:13 +00:00
|
|
|
|
2013-05-06 12:05:27 +00:00
|
|
|
if(avrftdi_pin_setup(pgm))
|
|
|
|
return -1;
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
|
|
|
|
/**********************************************
|
|
|
|
* set the ready LED and set our direction up *
|
|
|
|
**********************************************/
|
|
|
|
|
2011-08-25 16:12:30 +00:00
|
|
|
set_led_rdy(pgm,0);
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
set_led_pgm(pgm,1);
|
|
|
|
|
2011-08-25 16:12:30 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void avrftdi_close(PROGRAMMER * pgm)
|
|
|
|
{
|
2012-02-11 19:55:22 +00:00
|
|
|
avrftdi_t* pdata = to_pdata(pgm);
|
|
|
|
|
|
|
|
if(pdata->ftdic->usb_dev) {
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
set_pin(pgm, PIN_AVR_RESET, ON);
|
2013-04-28 19:35:26 +00:00
|
|
|
|
|
|
|
/* Stop driving the pins - except for the LEDs */
|
|
|
|
log_info("LED Mask=0x%04x value =0x%04x &=0x%04x\n",
|
2012-02-11 19:55:22 +00:00
|
|
|
pdata->led_mask, pdata->pin_value, pdata->led_mask & pdata->pin_value);
|
2013-05-06 11:48:15 +00:00
|
|
|
|
2012-02-11 19:55:22 +00:00
|
|
|
pdata->pin_direction = pdata->led_mask;
|
|
|
|
pdata->pin_value &= pdata->led_mask;
|
|
|
|
write_flush(pdata);
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
/* reset state recommended by FTDI */
|
|
|
|
ftdi_set_bitmode(pdata->ftdic, 0, BITMODE_RESET);
|
2012-02-11 19:55:22 +00:00
|
|
|
E_VOID(ftdi_usb_close(pdata->ftdic), pdata->ftdic);
|
2011-08-25 16:12:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int avrftdi_initialize(PROGRAMMER * pgm, AVRPART * p)
|
|
|
|
{
|
2013-05-15 20:05:02 +00:00
|
|
|
avrftdi_powerup(pgm);
|
|
|
|
|
2013-05-02 11:06:15 +00:00
|
|
|
if(p->flags & AVRPART_HAS_TPI)
|
|
|
|
{
|
|
|
|
/* see avrftdi_tpi.c */
|
|
|
|
avrftdi_tpi_initialize(pgm, p);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
set_pin(pgm, PIN_AVR_RESET, OFF);
|
|
|
|
set_pin(pgm, PIN_AVR_SCK, OFF);
|
|
|
|
/*use speed optimization with CAUTION*/
|
|
|
|
usleep(20 * 1000);
|
|
|
|
|
|
|
|
/* giving rst-pulse of at least 2 avr-clock-cycles, for
|
|
|
|
* security (2us @ 1MHz) */
|
|
|
|
set_pin(pgm, PIN_AVR_RESET, ON);
|
|
|
|
usleep(20 * 1000);
|
|
|
|
|
|
|
|
/*setting rst back to 0 */
|
|
|
|
set_pin(pgm, PIN_AVR_RESET, OFF);
|
|
|
|
/*wait at least 20ms bevor issuing spi commands to avr */
|
|
|
|
usleep(20 * 1000);
|
|
|
|
}
|
2011-08-25 16:12:30 +00:00
|
|
|
|
|
|
|
return pgm->program_enable(pgm, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void avrftdi_display(PROGRAMMER * pgm, const char *p)
|
|
|
|
{
|
2013-05-07 08:50:13 +00:00
|
|
|
// print the full pin definitiions as in ft245r ?
|
2011-08-25 16:12:30 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-09-02 20:22:53 +00:00
|
|
|
static int avrftdi_cmd(PROGRAMMER * pgm, const unsigned char *cmd, unsigned char *res)
|
2011-08-25 16:12:30 +00:00
|
|
|
{
|
2013-06-19 17:40:32 +00:00
|
|
|
return avrftdi_transmit(pgm, MPSSE_DO_READ | MPSSE_DO_WRITE, cmd, res, 4);
|
2011-08-25 16:12:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int avrftdi_program_enable(PROGRAMMER * pgm, AVRPART * p)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
unsigned char buf[4];
|
|
|
|
|
|
|
|
memset(buf, 0, sizeof(buf));
|
|
|
|
|
|
|
|
if (p->op[AVR_OP_PGM_ENABLE] == NULL) {
|
2013-04-28 19:35:26 +00:00
|
|
|
log_err("AVR_OP_PGM_ENABLE command not defined for %s\n", p->desc);
|
2011-08-25 16:12:30 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
avr_set_bits(p->op[AVR_OP_PGM_ENABLE], buf);
|
|
|
|
|
|
|
|
for(i = 0; i < 4; i++) {
|
|
|
|
pgm->cmd(pgm, buf, buf);
|
|
|
|
if (buf[p->pollindex-1] != p->pollvalue) {
|
2013-04-28 19:35:26 +00:00
|
|
|
log_warn("Program enable command not successful. Retrying.\n");
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
set_pin(pgm, PIN_AVR_RESET, ON);
|
2011-08-25 16:12:30 +00:00
|
|
|
usleep(20);
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
set_pin(pgm, PIN_AVR_RESET, OFF);
|
2011-08-25 16:12:30 +00:00
|
|
|
avr_set_bits(p->op[AVR_OP_PGM_ENABLE], buf);
|
|
|
|
} else
|
|
|
|
return 0;
|
|
|
|
}
|
2013-04-28 19:35:26 +00:00
|
|
|
|
|
|
|
log_err("Device is not responding to program enable. Check connection.\n");
|
2013-09-19 16:28:11 +00:00
|
|
|
|
2011-08-25 16:12:30 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int avrftdi_chip_erase(PROGRAMMER * pgm, AVRPART * p)
|
|
|
|
{
|
|
|
|
unsigned char cmd[4];
|
|
|
|
unsigned char res[4];
|
|
|
|
|
|
|
|
if (p->op[AVR_OP_CHIP_ERASE] == NULL) {
|
2013-04-28 19:35:26 +00:00
|
|
|
log_err("AVR_OP_CHIP_ERASE command not defined for %s\n", p->desc);
|
2011-08-25 16:12:30 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
memset(cmd, 0, sizeof(cmd));
|
|
|
|
|
|
|
|
avr_set_bits(p->op[AVR_OP_CHIP_ERASE], cmd);
|
|
|
|
pgm->cmd(pgm, cmd, res);
|
|
|
|
usleep(p->chip_erase_delay);
|
|
|
|
pgm->initialize(pgm, p);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Load extended address byte command */
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
static int
|
2013-06-20 20:11:49 +00:00
|
|
|
avrftdi_lext(PROGRAMMER *pgm, AVRPART *p, AVRMEM *m, unsigned int address)
|
2011-08-25 16:12:30 +00:00
|
|
|
{
|
2013-06-20 20:11:49 +00:00
|
|
|
unsigned char buf[] = { 0x00, 0x00, 0x00, 0x00 };
|
2011-08-25 16:12:30 +00:00
|
|
|
|
2013-06-20 20:11:49 +00:00
|
|
|
avr_set_bits(m->op[AVR_OP_LOAD_EXT_ADDR], buf);
|
|
|
|
avr_set_addr(m->op[AVR_OP_LOAD_EXT_ADDR], buf, address);
|
2011-08-25 16:12:30 +00:00
|
|
|
|
2013-04-28 19:35:26 +00:00
|
|
|
if(verbose > TRACE)
|
2011-08-25 16:12:30 +00:00
|
|
|
buf_dump(buf, sizeof(buf),
|
|
|
|
"load extended address command", 0, 16 * 3);
|
|
|
|
|
2013-06-20 20:11:49 +00:00
|
|
|
if (0 > avrftdi_transmit(pgm, MPSSE_DO_WRITE, buf, buf, 4))
|
|
|
|
return -1;
|
2013-09-19 16:28:11 +00:00
|
|
|
|
2011-08-25 16:12:30 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int avrftdi_eeprom_write(PROGRAMMER *pgm, AVRPART *p, AVRMEM *m,
|
2012-01-10 18:19:40 +00:00
|
|
|
unsigned int page_size, unsigned int addr, unsigned int len)
|
2011-08-25 16:12:30 +00:00
|
|
|
{
|
2013-06-19 17:40:32 +00:00
|
|
|
unsigned char cmd[] = { 0x00, 0x00, 0x00, 0x00 };
|
2012-02-06 19:41:36 +00:00
|
|
|
unsigned char *data = &m->buf[addr];
|
2012-01-10 18:19:40 +00:00
|
|
|
unsigned int add;
|
2011-08-25 16:12:30 +00:00
|
|
|
|
2013-06-20 20:11:49 +00:00
|
|
|
avr_set_bits(m->op[AVR_OP_WRITE], cmd);
|
2011-08-25 16:12:30 +00:00
|
|
|
|
2012-01-10 18:19:40 +00:00
|
|
|
for (add = addr; add < addr + len; add++)
|
2011-08-25 16:12:30 +00:00
|
|
|
{
|
2013-06-19 17:40:32 +00:00
|
|
|
avr_set_addr(m->op[AVR_OP_WRITE], cmd, add);
|
|
|
|
avr_set_input(m->op[AVR_OP_WRITE], cmd, *data++);
|
2011-08-25 16:12:30 +00:00
|
|
|
|
2013-06-20 20:11:49 +00:00
|
|
|
if (0 > avrftdi_transmit(pgm, MPSSE_DO_WRITE, cmd, cmd, 4))
|
|
|
|
return -1;
|
2011-08-25 16:12:30 +00:00
|
|
|
usleep((m->max_write_delay));
|
2013-06-19 17:40:32 +00:00
|
|
|
|
2011-08-25 16:12:30 +00:00
|
|
|
}
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int avrftdi_eeprom_read(PROGRAMMER *pgm, AVRPART *p, AVRMEM *m,
|
2012-01-10 18:19:40 +00:00
|
|
|
unsigned int page_size, unsigned int addr, unsigned int len)
|
2011-08-25 16:12:30 +00:00
|
|
|
{
|
|
|
|
unsigned char cmd[4];
|
|
|
|
unsigned char buffer[len], *bufptr = buffer;
|
2012-01-10 18:19:40 +00:00
|
|
|
unsigned int add;
|
2011-08-25 16:12:30 +00:00
|
|
|
|
|
|
|
memset(buffer, 0, sizeof(buffer));
|
2012-01-10 18:19:40 +00:00
|
|
|
for (add = addr; add < addr + len; add++)
|
2011-08-25 16:12:30 +00:00
|
|
|
{
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
memset(cmd, 0, sizeof(cmd));
|
2011-08-25 16:12:30 +00:00
|
|
|
avr_set_bits(m->op[AVR_OP_READ], cmd);
|
|
|
|
avr_set_addr(m->op[AVR_OP_READ], cmd, add);
|
|
|
|
|
2013-06-20 20:11:49 +00:00
|
|
|
if (0 > avrftdi_transmit(pgm, MPSSE_DO_READ | MPSSE_DO_WRITE, cmd, cmd, 4))
|
|
|
|
return -1;
|
2011-08-25 16:12:30 +00:00
|
|
|
|
|
|
|
avr_get_output(m->op[AVR_OP_READ], cmd, bufptr++);
|
|
|
|
}
|
|
|
|
|
2012-01-10 18:19:40 +00:00
|
|
|
memcpy(m->buf + addr, buffer, len);
|
2011-08-25 16:12:30 +00:00
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int avrftdi_flash_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
|
2012-01-10 18:19:40 +00:00
|
|
|
unsigned int page_size, unsigned int addr, unsigned int len)
|
2011-08-25 16:12:30 +00:00
|
|
|
{
|
|
|
|
int use_lext_address = m->op[AVR_OP_LOAD_EXT_ADDR] != NULL;
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
|
|
|
|
unsigned int word;
|
|
|
|
unsigned int poll_index;
|
|
|
|
unsigned int buf_size;
|
|
|
|
|
|
|
|
unsigned char poll_byte;
|
2012-02-04 16:43:37 +00:00
|
|
|
unsigned char *buffer = &m->buf[addr];
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
unsigned char buf[4*len+4], *bufptr = buf;
|
|
|
|
|
|
|
|
memset(buf, 0, sizeof(buf));
|
2011-08-25 16:12:30 +00:00
|
|
|
|
|
|
|
/* pre-check opcodes */
|
|
|
|
if (m->op[AVR_OP_LOADPAGE_LO] == NULL) {
|
2013-04-28 19:35:26 +00:00
|
|
|
log_err("AVR_OP_LOADPAGE_LO command not defined for %s\n", p->desc);
|
2011-08-25 16:12:30 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (m->op[AVR_OP_LOADPAGE_HI] == NULL) {
|
2013-04-28 19:35:26 +00:00
|
|
|
log_err("AVR_OP_LOADPAGE_HI command not defined for %s\n", p->desc);
|
2011-08-25 16:12:30 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
if(page_size != m->page_size) {
|
2013-04-28 19:35:26 +00:00
|
|
|
log_warn("Parameter page_size is %d, ", page_size);
|
|
|
|
log_warn("but m->page_size is %d. Using the latter.\n", m->page_size);
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
}
|
|
|
|
|
2011-08-25 16:12:30 +00:00
|
|
|
page_size = m->page_size;
|
|
|
|
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
/* if we do cross a 64k word boundary (or write the
|
|
|
|
* first page), we need to issue a 'load extended
|
|
|
|
* address byte' command, which is defined as 0x4d
|
|
|
|
* 0x00 <address byte> 0x00. As far as i know, this
|
|
|
|
* is only available on 256k parts. 64k word is 128k
|
|
|
|
* bytes.
|
|
|
|
* write the command only once.
|
|
|
|
*/
|
|
|
|
if(use_lext_address && (((addr/2) & 0xffff0000))) {
|
2013-06-20 20:11:49 +00:00
|
|
|
if (0 > avrftdi_lext(pgm, p, m, addr/2))
|
|
|
|
return -1;
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* prepare the command stream for the whole page */
|
|
|
|
/* addr is in bytes, but we program in words. addr/2 should be something
|
|
|
|
* like addr >> WORD_SHIFT, though */
|
|
|
|
for(word = addr/2; word < (len + addr)/2; word++)
|
|
|
|
{
|
2013-04-28 19:35:26 +00:00
|
|
|
log_debug("-< bytes = %d of %d\n", word * 2, len + addr);
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
|
|
|
|
/*setting word*/
|
|
|
|
avr_set_bits(m->op[AVR_OP_LOADPAGE_LO], bufptr);
|
|
|
|
/* here is the second byte increment, just if you're wondering */
|
|
|
|
avr_set_addr(m->op[AVR_OP_LOADPAGE_LO], bufptr, word);
|
|
|
|
avr_set_input(m->op[AVR_OP_LOADPAGE_LO], bufptr, *buffer++);
|
|
|
|
bufptr += 4;
|
|
|
|
avr_set_bits(m->op[AVR_OP_LOADPAGE_HI], bufptr);
|
|
|
|
avr_set_addr(m->op[AVR_OP_LOADPAGE_HI], bufptr, word);
|
|
|
|
avr_set_input(m->op[AVR_OP_LOADPAGE_HI], bufptr, *buffer++);
|
|
|
|
bufptr += 4;
|
|
|
|
}
|
2011-08-25 16:12:30 +00:00
|
|
|
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
/* issue write page command, if available */
|
|
|
|
if (m->op[AVR_OP_WRITEPAGE] == NULL) {
|
2013-04-28 19:35:26 +00:00
|
|
|
log_err("AVR_OP_WRITEPAGE command not defined for %s\n", p->desc);
|
|
|
|
return -1;
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
} else {
|
|
|
|
avr_set_bits(m->op[AVR_OP_WRITEPAGE], bufptr);
|
|
|
|
/* setting page address highbyte */
|
|
|
|
avr_set_addr(m->op[AVR_OP_WRITEPAGE],
|
|
|
|
bufptr, addr/2);
|
|
|
|
bufptr += 4;
|
|
|
|
}
|
2011-08-25 16:12:30 +00:00
|
|
|
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
buf_size = bufptr - buf;
|
2011-08-25 16:12:30 +00:00
|
|
|
|
2013-04-28 19:35:26 +00:00
|
|
|
if(verbose > TRACE)
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
buf_dump(buf, buf_size, "command buffer", 0, 16*2);
|
2011-08-25 16:12:30 +00:00
|
|
|
|
2013-04-28 19:35:26 +00:00
|
|
|
log_info("Transmitting buffer of size: %d\n", buf_size);
|
2013-06-20 20:11:49 +00:00
|
|
|
if (0 > avrftdi_transmit(pgm, MPSSE_DO_WRITE, buf, buf, buf_size))
|
|
|
|
return -1;
|
2011-08-25 16:12:30 +00:00
|
|
|
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
bufptr = buf;
|
|
|
|
/* find a poll byte. we cannot poll a value of 0xff, so look
|
|
|
|
* for a value != 0xff
|
|
|
|
*/
|
|
|
|
for(poll_index = addr+len-1; poll_index > addr-1; poll_index--)
|
|
|
|
if(m->buf[poll_index] != 0xff)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if((poll_index < addr + len) && m->buf[poll_index] != 0xff)
|
|
|
|
{
|
2013-04-28 19:35:26 +00:00
|
|
|
log_info("Using m->buf[%d] = 0x%02x as polling value ", poll_index,
|
|
|
|
m->buf[poll_index]);
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
/* poll page write ready */
|
|
|
|
do {
|
2013-04-28 19:35:26 +00:00
|
|
|
log_info(".");
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
|
|
|
|
pgm->read_byte(pgm, p, m, poll_index, &poll_byte);
|
|
|
|
} while (m->buf[poll_index] != poll_byte);
|
2011-08-25 16:12:30 +00:00
|
|
|
|
2013-04-28 19:35:26 +00:00
|
|
|
log_info("\n");
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-04-28 19:35:26 +00:00
|
|
|
log_warn("No suitable byte (!=0xff) for polling found.\n");
|
|
|
|
log_warn("Trying to sleep instead, but programming errors may occur.\n");
|
|
|
|
log_warn("Be sure to verify programmed memory (no -V option)\n");
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
/* TODO sync write */
|
|
|
|
/* sleep */
|
|
|
|
usleep((m->max_write_delay));
|
2011-08-25 16:12:30 +00:00
|
|
|
}
|
2013-06-20 20:11:49 +00:00
|
|
|
|
2011-08-25 16:12:30 +00:00
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
/*
|
|
|
|
*Reading from flash
|
|
|
|
*/
|
2011-08-25 16:12:30 +00:00
|
|
|
static int avrftdi_flash_read(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
|
2012-01-10 18:19:40 +00:00
|
|
|
unsigned int page_size, unsigned int addr, unsigned int len)
|
2011-08-25 16:12:30 +00:00
|
|
|
{
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
OPCODE * readop;
|
|
|
|
int byte, word;
|
2011-08-25 16:12:30 +00:00
|
|
|
int use_lext_address = m->op[AVR_OP_LOAD_EXT_ADDR] != NULL;
|
2012-01-10 18:19:40 +00:00
|
|
|
unsigned int address = addr/2;
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
|
|
|
|
unsigned char o_buf[4*len+4];
|
|
|
|
unsigned char i_buf[4*len+4];
|
|
|
|
unsigned int index;
|
2011-08-25 16:12:30 +00:00
|
|
|
|
2013-06-20 20:11:49 +00:00
|
|
|
|
2011-08-25 16:12:30 +00:00
|
|
|
memset(o_buf, 0, sizeof(o_buf));
|
|
|
|
memset(i_buf, 0, sizeof(i_buf));
|
|
|
|
|
|
|
|
/* pre-check opcodes */
|
|
|
|
if (m->op[AVR_OP_READ_LO] == NULL) {
|
2013-04-28 19:35:26 +00:00
|
|
|
log_err("AVR_OP_READ_LO command not defined for %s\n", p->desc);
|
2011-08-25 16:12:30 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (m->op[AVR_OP_READ_HI] == NULL) {
|
2013-04-28 19:35:26 +00:00
|
|
|
log_err("AVR_OP_READ_HI command not defined for %s\n", p->desc);
|
2011-08-25 16:12:30 +00:00
|
|
|
return -1;
|
|
|
|
}
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
|
|
|
|
if(use_lext_address && ((address & 0xffff0000))) {
|
2013-06-20 20:11:49 +00:00
|
|
|
if (0 > avrftdi_lext(pgm, p, m, address))
|
|
|
|
return -1;
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* word addressing! */
|
|
|
|
for(word = addr/2, index = 0; word < (addr + len)/2; word++)
|
|
|
|
{
|
|
|
|
/* one byte is transferred via a 4-byte opcode.
|
|
|
|
* TODO: reduce magic numbers
|
|
|
|
*/
|
|
|
|
avr_set_bits(m->op[AVR_OP_READ_LO], &o_buf[index*4]);
|
|
|
|
avr_set_addr(m->op[AVR_OP_READ_LO], &o_buf[index*4], word);
|
|
|
|
index++;
|
|
|
|
avr_set_bits(m->op[AVR_OP_READ_HI], &o_buf[index*4]);
|
|
|
|
avr_set_addr(m->op[AVR_OP_READ_HI], &o_buf[index*4], word);
|
|
|
|
index++;
|
|
|
|
}
|
2011-08-25 16:12:30 +00:00
|
|
|
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
/* transmit,
|
|
|
|
* if there was an error, we did not see, memory validation will
|
|
|
|
* subsequently fail.
|
|
|
|
*/
|
2013-04-28 19:35:26 +00:00
|
|
|
if(verbose > TRACE) {
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
buf_dump(o_buf, sizeof(o_buf), "o_buf", 0, 32);
|
|
|
|
}
|
2011-08-25 16:12:30 +00:00
|
|
|
|
2013-06-20 20:11:49 +00:00
|
|
|
if (0 > avrftdi_transmit(pgm, MPSSE_DO_READ | MPSSE_DO_WRITE, o_buf, i_buf, len * 4))
|
|
|
|
return -1;
|
|
|
|
|
2013-04-28 19:35:26 +00:00
|
|
|
if(verbose > TRACE) {
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
buf_dump(i_buf, sizeof(i_buf), "i_buf", 0, 32);
|
|
|
|
}
|
2011-08-25 16:12:30 +00:00
|
|
|
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
memset(&m->buf[addr], 0, page_size);
|
|
|
|
|
|
|
|
/* every (read) op is 4 bytes in size and yields one byte of memory data */
|
|
|
|
for(byte = 0; byte < page_size; byte++) {
|
|
|
|
if(byte & 1)
|
|
|
|
readop = m->op[AVR_OP_READ_HI];
|
|
|
|
else
|
|
|
|
readop = m->op[AVR_OP_READ_LO];
|
2013-06-20 20:11:49 +00:00
|
|
|
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
/* take 4 bytes and put the memory byte in the buffer at
|
|
|
|
* offset addr + offset of the current byte
|
|
|
|
*/
|
|
|
|
avr_get_output(readop, &i_buf[byte*4], &m->buf[addr+byte]);
|
2011-08-25 16:12:30 +00:00
|
|
|
}
|
2013-06-20 20:11:49 +00:00
|
|
|
|
2013-04-28 19:35:26 +00:00
|
|
|
if(verbose > TRACE)
|
Adds bugfixes and maintenance for avrftdi
Bugfixes:
-remove ftdi_usb_purge_buffers(), since it does not flush, but clear buffers
-fix bad polling in avrftdi_flash_write() where it was possible to poll a 0xff
value.
Maintenance:
-use #defines from libftdi for MPSSE commands where applicable
-reformat E() and E_VOID() macros
-remove TYPE_* macros
-clean up private structure (remove pin_inversion, type and ftype)
-adds ftdi_pin_name() to turn a (FTDI) pin number to a human readable string
-adds avrftdi_print to encapsulate "if(verbose > c) fprintf()"-idiom
-nicer / better understandable (I hope) output
-removes pin_limit() and adds a member in the private data structure.
TYPE_* macros can be removed; decision is made from (struct ftdi_context).type
-add_pin(s)() functions reworked. parameters are validated first, if everything
is alright, pin_value is modified. pin_inversion mask is not needed; use
PIN_INVERTED instead
-change set_pin(s)(), so that it gets the pin value used by avrdude (and not a
bit mask). This way, PIN_INVERTED is usable and pin_inversion is not needed.
Plus, the interface is consistent with the add_pin() signature. Also move
parameter validation to the start of the function. I also commented out the
warning, that a pin is not defined, because it is annoying.
-clean up avrftdi_open(): first parameter validation, then USB lookup, interface
initialization then pin setup
-avrftdi_eeprom_read/write() and avrftdi_flash_read/write(): convert to new
calling scheme, where every paged_* function is called once for every page
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1098 81a1dc3b-b13d-400b-aceb-764788c761c2
2012-07-29 12:29:39 +00:00
|
|
|
buf_dump(&m->buf[addr], page_size, "page:", 0, 32);
|
2011-08-25 16:12:30 +00:00
|
|
|
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int avrftdi_paged_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
|
2012-01-10 18:19:40 +00:00
|
|
|
unsigned int page_size, unsigned int addr, unsigned int n_bytes)
|
2011-08-25 16:12:30 +00:00
|
|
|
{
|
|
|
|
if (strcmp(m->desc, "flash") == 0)
|
2012-01-10 18:19:40 +00:00
|
|
|
return avrftdi_flash_write(pgm, p, m, page_size, addr, n_bytes);
|
2011-08-25 16:12:30 +00:00
|
|
|
else if (strcmp(m->desc, "eeprom") == 0)
|
2012-01-10 18:19:40 +00:00
|
|
|
return avrftdi_eeprom_write(pgm, p, m, page_size, addr, n_bytes);
|
2011-08-25 16:12:30 +00:00
|
|
|
else
|
|
|
|
return -2;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int avrftdi_paged_load(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
|
2012-01-10 18:19:40 +00:00
|
|
|
unsigned int page_size, unsigned int addr, unsigned int n_bytes)
|
2011-08-25 16:12:30 +00:00
|
|
|
{
|
|
|
|
if (strcmp(m->desc, "flash") == 0)
|
2012-01-10 18:19:40 +00:00
|
|
|
return avrftdi_flash_read(pgm, p, m, page_size, addr, n_bytes);
|
2011-08-25 16:12:30 +00:00
|
|
|
else if(strcmp(m->desc, "eeprom") == 0)
|
2012-01-10 18:19:40 +00:00
|
|
|
return avrftdi_eeprom_read(pgm, p, m, page_size, addr, n_bytes);
|
2011-08-25 16:12:30 +00:00
|
|
|
else
|
|
|
|
return -2;
|
|
|
|
}
|
|
|
|
|
2012-02-11 19:55:22 +00:00
|
|
|
static void
|
|
|
|
avrftdi_setup(PROGRAMMER * pgm)
|
|
|
|
{
|
|
|
|
avrftdi_t* pdata;
|
|
|
|
|
|
|
|
pgm->cookie = malloc(sizeof(avrftdi_t));
|
|
|
|
pdata = to_pdata(pgm);
|
|
|
|
|
|
|
|
pdata->ftdic = ftdi_new();
|
|
|
|
if(!pdata->ftdic)
|
|
|
|
{
|
2013-04-28 19:35:26 +00:00
|
|
|
log_err("Error allocating memory.\n");
|
2014-05-16 15:52:25 +00:00
|
|
|
exit(1);
|
2012-02-11 19:55:22 +00:00
|
|
|
}
|
|
|
|
E_VOID(ftdi_init(pdata->ftdic), pdata->ftdic);
|
|
|
|
|
|
|
|
pdata->pin_value = 0;
|
|
|
|
pdata->pin_direction = 0;
|
|
|
|
pdata->led_mask = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
avrftdi_teardown(PROGRAMMER * pgm)
|
|
|
|
{
|
|
|
|
avrftdi_t* pdata = to_pdata(pgm);
|
|
|
|
|
2013-04-28 19:35:26 +00:00
|
|
|
if(pdata) {
|
|
|
|
ftdi_deinit(pdata->ftdic);
|
|
|
|
ftdi_free(pdata->ftdic);
|
|
|
|
free(pdata);
|
|
|
|
}
|
2012-02-11 19:55:22 +00:00
|
|
|
}
|
|
|
|
|
2011-08-25 16:12:30 +00:00
|
|
|
void avrftdi_initpgm(PROGRAMMER * pgm)
|
|
|
|
{
|
2012-02-11 19:55:22 +00:00
|
|
|
|
2011-08-25 16:12:30 +00:00
|
|
|
strcpy(pgm->type, "avrftdi");
|
|
|
|
|
|
|
|
/*
|
|
|
|
* mandatory functions
|
|
|
|
*/
|
|
|
|
|
|
|
|
pgm->initialize = avrftdi_initialize;
|
|
|
|
pgm->display = avrftdi_display;
|
|
|
|
pgm->enable = avrftdi_enable;
|
|
|
|
pgm->disable = avrftdi_disable;
|
2013-05-07 08:50:13 +00:00
|
|
|
pgm->powerup = avrftdi_powerup;
|
|
|
|
pgm->powerdown = avrftdi_powerdown;
|
2011-08-25 16:12:30 +00:00
|
|
|
pgm->program_enable = avrftdi_program_enable;
|
|
|
|
pgm->chip_erase = avrftdi_chip_erase;
|
|
|
|
pgm->cmd = avrftdi_cmd;
|
|
|
|
pgm->open = avrftdi_open;
|
|
|
|
pgm->close = avrftdi_close;
|
|
|
|
pgm->read_byte = avr_read_byte_default;
|
|
|
|
pgm->write_byte = avr_write_byte_default;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* optional functions
|
|
|
|
*/
|
|
|
|
|
|
|
|
pgm->paged_write = avrftdi_paged_write;
|
|
|
|
pgm->paged_load = avrftdi_paged_load;
|
|
|
|
|
2013-05-06 11:48:08 +00:00
|
|
|
pgm->setpin = set_pin;
|
|
|
|
|
2012-02-11 19:55:22 +00:00
|
|
|
pgm->setup = avrftdi_setup;
|
|
|
|
pgm->teardown = avrftdi_teardown;
|
|
|
|
|
2011-08-25 16:12:30 +00:00
|
|
|
pgm->rdy_led = set_led_rdy;
|
|
|
|
pgm->err_led = set_led_err;
|
|
|
|
pgm->pgm_led = set_led_pgm;
|
|
|
|
pgm->vfy_led = set_led_vfy;
|
|
|
|
}
|
|
|
|
|
2013-05-16 17:11:35 +00:00
|
|
|
#endif /* DO_NOT_BUILD_AVRFTDI */
|
2011-08-25 16:12:30 +00:00
|
|
|
|
|
|
|
|
2012-01-31 17:03:43 +00:00
|
|
|
const char avrftdi_desc[] = "Interface to the MPSSE Engine of FTDI Chips using libftdi.";
|
|
|
|
|