Contributed by Alan Horstmann:

Fix handling of devices > 128 KiB in stk500v1 protocol
* stk500.c: Implement extended address byte handling.
* avrdude.conf.in (ATmega2560): enable stk500_devcode so
STK500v1 protocol actually starts at all.



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1270 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
joerg_wunsch 2014-01-22 07:42:18 +00:00
parent b6fd404109
commit 404ded3db6
4 changed files with 60 additions and 5 deletions

View File

@ -1,3 +1,11 @@
2014-01-22 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
Contributed by Alan Horstmann:
Fix handling of devices > 128 KiB in stk500v1 protocol
* stk500.c: Implement extended address byte handling.
* avrdude.conf.in (ATmega2560): enable stk500_devcode so
STK500v1 protocol actually starts at all.
2014-01-17 Joerg Wunsch <j.gnu@uriah.heep.sax.de> 2014-01-17 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
* flip1.c: Implement the meat of FLIP version 1 protocol. * flip1.c: Implement the meat of FLIP version 1 protocol.

1
NEWS
View File

@ -21,6 +21,7 @@ Current:
- bug #40055: AVRDUDE segfaults when writing eeprom - bug #40055: AVRDUDE segfaults when writing eeprom
- bug #40085: Typo fix in fuses report (for 6.1-svn-20130917) - bug #40085: Typo fix in fuses report (for 6.1-svn-20130917)
- bug #40817: Elf file support (possibly) not working on 6.0.1 windows build - bug #40817: Elf file support (possibly) not working on 6.0.1 windows build
- [no-id]: Fix handling of devices > 128 KiB in stk500v1 protocol
- patch #7896: DFU FLIPv2 programming support - patch #7896: DFU FLIPv2 programming support
- patch #XXXX: xxx - patch #XXXX: xxx

View File

@ -10058,7 +10058,7 @@ part
desc = "ATmega2560"; desc = "ATmega2560";
signature = 0x1e 0x98 0x01; signature = 0x1e 0x98 0x01;
has_jtag = yes; has_jtag = yes;
# stk500_devcode = 0xB2; stk500_devcode = 0xB2;
# avr910_devcode = 0x43; # avr910_devcode = 0x43;
chip_erase_delay = 9000; chip_erase_delay = 9000;
pagel = 0xD7; pagel = 0xD7;

View File

@ -1,7 +1,7 @@
/* /*
* avrdude - A Downloader/Uploader for AVR device programmers * avrdude - A Downloader/Uploader for AVR device programmers
* Copyright (C) 2002-2004 Brian S. Dean <bsd@bsdhome.com> * Copyright (C) 2002-2004 Brian S. Dean <bsd@bsdhome.com>
* Copyright (C) 2008 Joerg Wunsch * Copyright (C) 2008,2014 Joerg Wunsch
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -46,6 +46,15 @@
#define STK500_XTAL 7372800U #define STK500_XTAL 7372800U
#define MAX_SYNC_ATTEMPTS 10 #define MAX_SYNC_ATTEMPTS 10
struct pdata
{
unsigned char ext_addr_byte; /* Record ext-addr byte set in the
* target device (if used) */
};
#define PDATA(pgm) ((struct pdata *)(pgm->cookie))
static int stk500_getparm(PROGRAMMER * pgm, unsigned parm, unsigned * value); static int stk500_getparm(PROGRAMMER * pgm, unsigned parm, unsigned * value);
static int stk500_setparm(PROGRAMMER * pgm, unsigned parm, unsigned value); static int stk500_setparm(PROGRAMMER * pgm, unsigned parm, unsigned value);
static void stk500_print_parms1(PROGRAMMER * pgm, const char * p); static void stk500_print_parms1(PROGRAMMER * pgm, const char * p);
@ -696,14 +705,31 @@ static void stk500_close(PROGRAMMER * pgm)
} }
static int stk500_loadaddr(PROGRAMMER * pgm, unsigned int addr) static int stk500_loadaddr(PROGRAMMER * pgm, AVRMEM * mem, unsigned int addr)
{ {
unsigned char buf[16]; unsigned char buf[16];
int tries; int tries;
unsigned char ext_byte;
OPCODE * lext;
tries = 0; tries = 0;
retry: retry:
tries++; tries++;
/* To support flash > 64K words the correct Extended Address Byte is needed */
lext = mem->op[AVR_OP_LOAD_EXT_ADDR];
if (lext != NULL) {
ext_byte = (addr >> 16) & 0xff;
if (ext_byte != PDATA(pgm)->ext_addr_byte) {
/* Either this is the first addr load, or a 64K word boundary is
* crossed, so set the ext addr byte */
avr_set_bits(lext, buf);
avr_set_addr(lext, buf, addr);
stk500_cmd(pgm, buf, buf);
PDATA(pgm)->ext_addr_byte = ext_byte;
}
}
buf[0] = Cmnd_STK_LOAD_ADDRESS; buf[0] = Cmnd_STK_LOAD_ADDRESS;
buf[1] = addr & 0xff; buf[1] = addr & 0xff;
buf[2] = (addr >> 8) & 0xff; buf[2] = (addr >> 8) & 0xff;
@ -796,7 +822,7 @@ static int stk500_paged_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
tries = 0; tries = 0;
retry: retry:
tries++; tries++;
stk500_loadaddr(pgm, addr/a_div); stk500_loadaddr(pgm, m, addr/a_div);
/* build command block and avoid multiple send commands as it leads to a crash /* build command block and avoid multiple send commands as it leads to a crash
of the silabs usb serial driver on mac os x */ of the silabs usb serial driver on mac os x */
@ -885,7 +911,7 @@ static int stk500_paged_load(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
tries = 0; tries = 0;
retry: retry:
tries++; tries++;
stk500_loadaddr(pgm, addr/a_div); stk500_loadaddr(pgm, m, addr/a_div);
buf[0] = Cmnd_STK_READ_PAGE; buf[0] = Cmnd_STK_READ_PAGE;
buf[1] = (block_size >> 8) & 0xff; buf[1] = (block_size >> 8) & 0xff;
buf[2] = block_size & 0xff; buf[2] = block_size & 0xff;
@ -1276,6 +1302,24 @@ static void stk500_print_parms(PROGRAMMER * pgm)
stk500_print_parms1(pgm, ""); stk500_print_parms1(pgm, "");
} }
static void stk500_setup(PROGRAMMER * pgm)
{
if ((pgm->cookie = malloc(sizeof(struct pdata))) == 0) {
fprintf(stderr,
"%s: stk500_setup(): Out of memory allocating private data\n",
progname);
exit(1);
}
memset(pgm->cookie, 0, sizeof(struct pdata));
PDATA(pgm)->ext_addr_byte = 0xff; /* Ensures it is programmed before
* first memory address */
}
static void stk500_teardown(PROGRAMMER * pgm)
{
free(pgm->cookie);
}
const char stk500_desc[] = "Atmel STK500 Version 1.x firmware"; const char stk500_desc[] = "Atmel STK500 Version 1.x firmware";
void stk500_initpgm(PROGRAMMER * pgm) void stk500_initpgm(PROGRAMMER * pgm)
@ -1307,5 +1351,7 @@ void stk500_initpgm(PROGRAMMER * pgm)
pgm->set_varef = stk500_set_varef; pgm->set_varef = stk500_set_varef;
pgm->set_fosc = stk500_set_fosc; pgm->set_fosc = stk500_set_fosc;
pgm->set_sck_period = stk500_set_sck_period; pgm->set_sck_period = stk500_set_sck_period;
pgm->setup = stk500_setup;
pgm->teardown = stk500_teardown;
pgm->page_size = 256; pgm->page_size = 256;
} }