Mirrors/avrdude
1
0
Fork 0
mirror of https://github.com/avrdudes/avrdude.git synced 2026-09-21 08:36:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1993 from stefanrueger/urclock-timeouts

Browse Source 
Extend -c urclock to work with lower baud rates
This commit is contained in:
Stefan Rueger
2025-05-21 08:07:11 +02:00
committed by GitHub
parent d2fdfb0fb4 3dcc775c49
commit b7fc0af026
1 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/urclock.c
View File

@@ -1679,7 +1679,7 @@ static int urclock_paged_rdwr(const PROGRAMMER *pgm, const AVRPART *part, char r
// STK500v1 only: tell the bootloader which address should be used by next paged command
if(!ur.urprotocol && urclock_load_baddr(pgm, part, mchr, badd) < 0)
return -1;
return -1;
if(mchr == 'F' && rwop == Cmnd_STK_PROG_PAGE) {
if(len != ur.uP.pagesize)
@@ -1790,15 +1790,26 @@ static int ur_readEF(const PROGRAMMER *pgm, const AVRPART *p, uint8_t *buf, uint
int odd = !ur.urprotocol && classic && (badd&1);
if(odd) { // Need to read one extra byte
len++;
badd &= ~1;
badd--;
if(len > urmax(ur.uP.pagesize, 256))
Return("len+1 = %d odd address exceeds range [1, %d]", len, urmax(ur.uP.pagesize, 256));
}
if(urclock_paged_rdwr(pgm, p, Cmnd_STK_READ_PAGE, badd, len, mchr, NULL) < 0)
return -1;
// Read in chunks that the bootloader can send within 800 ms lest it triggers WDT
int bd = pgm->baudrate <= 0? 115200: pgm->baudrate, rdchunk = urmax(4*bd/5/10 - 2, 2) & ~1;
while(len > 0) {
int thislen = len < rdchunk? len: rdchunk;
return urclock_res_check(pgm, __func__, odd, buf, len-odd);
if(urclock_paged_rdwr(pgm, p, Cmnd_STK_READ_PAGE, badd, thislen, mchr, NULL) < 0)
return -1;
if(urclock_res_check(pgm, __func__, odd, buf, thislen-odd) < 0)
return -1;
buf += thislen-odd;
badd += thislen;
len -= thislen;
odd = 0; // At most ignore first byte
}
return 0;
}
@@ -1935,7 +1946,8 @@ static int urclock_getsync(const PROGRAMMER *pgm) {
AVRPART *part;
// Reduce timeout for establishing comms
serial_recv_timeout = 25; // ms
double kbd = pgm->baudrate <= 0? 115.2: pgm->baudrate/1000.0;
serial_recv_timeout = 25 + (kbd < 115? 160/kbd: 0); // ms: longer for low baud rates
part = partdesc? locate_part(part_list, partdesc): NULL;
/*
* The urboot autosync detection uses a loop
@@ -1954,7 +1966,7 @@ static int urclock_getsync(const PROGRAMMER *pgm) {
autobaud_sync = part && part->autobaud_sync? part->autobaud_sync: Cmnd_STK_GET_SYNC;
ur.sync_silence = 2;
serial_drain_timeout = 20; // ms
serial_drain_timeout = 20 + (kbd < 115? 80/kbd: 0); // ms: longer for low baud rates
for(attempt = 0; attempt < MAX_SYNC_ATTEMPTS; attempt++) {
/*
@@ -2003,7 +2015,7 @@ static int urclock_getsync(const PROGRAMMER *pgm) {
urclock_send(pgm, iob, 1); // So, send the concluding byte
}
}
serial_drain(&pgm->fd, 0); // And either way drain the reply
serial_drain(&pgm->fd, 0); // And either way drain the reply
ur.sync_silence = 0;
@@ -2044,6 +2056,9 @@ static int urclock_getsync(const PROGRAMMER *pgm) {
}
}
if(kbd < 115) // Increase timeout for low baud rates
serial_recv_timeout += (ur.uP.pagesize + 5)*10/kbd;
return 0;
}
@@ -2204,6 +2219,9 @@ static int urclock_initialize(const PROGRAMMER *pgm, const AVRPART *p) {
static void urclock_disable(const PROGRAMMER *pgm) {
unsigned char buf[16];
if(pgm->baudrate && pgm->baudrate < 115000 && ur.urprotocol)
return;
buf[0] = Cmnd_STK_LEAVE_PROGMODE;
buf[1] = Sync_CRC_EOP;
@@ -2308,6 +2326,11 @@ static int urclock_paged_load(const PROGRAMMER *pgm, const AVRPART *p, const AVR
int mchr, chunk;
unsigned int n;
// Read in chunks that the bootloader can send within 800 ms lest it triggers WDT
int bd = pgm->baudrate <= 0? 115200: pgm->baudrate, rdchunk = urmax(4*bd/5/10 - 2, 2) & ~1;
if((unsigned) rdchunk < page_size)
page_size = rdchunk;
if(n_bytes) {
// Paged reads only valid for flash and eeprom
mchr = mem_is_in_flash(m)? 'F': 'E';
@@ -2330,9 +2353,9 @@ static int urclock_paged_load(const PROGRAMMER *pgm, const AVRPART *p, const AVR
if(urclock_res_check(pgm, __func__, 0, &m->buf[addr], chunk) < 0)
return -4;
if(addr == 0 && mchr == 'F') { // Ensure reset vector points to bl
if(addr == 0 && mchr == 'F') { // Point reset vector to bootloader if needed and possible
int vecsz = ur.uP.flashsize <= 8192? 2: 4;
if(chunk >= vecsz && ur.boothigh && ur.blstart && ur.vbllevel == 1) {
if(chunk == ur.uP.pagesize && ur.boothigh && ur.blstart && ur.vbllevel == 1) {
unsigned char jmptoboot[4];
int resetsize = set_reset(pgm, jmptoboot, vecsz);
int resetdest;