avr
/
avrdude
mirror of https://github.com/mariusgreuel/avrdude.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Silence compiler warnings

This commit is contained in:
Stefan Rueger 2022-11-22 21:49:26 +00:00
parent 25ca91371d
commit b925b5113d
No known key found for this signature in database
GPG Key ID: B0B4F1FD86B1EC55
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/avr.c
View File

@ -340,6 +340,10 @@ int avr_read_mem(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM *mem, con
if (v != NULL) if (v != NULL)
vmem = avr_locate_mem(v, mem->desc); vmem = avr_locate_mem(v, mem->desc);
if(mem->size < 0) // Sanity check
return -1;
/* /*
* start with all 0xff * start with all 0xff
*/ */
@ -355,7 +359,7 @@ int avr_read_mem(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM *mem, con
avr_tpi_setup_rw(pgm, mem, 0, TPI_NVMCMD_NO_OPERATION); avr_tpi_setup_rw(pgm, mem, 0, TPI_NVMCMD_NO_OPERATION);
/* load bytes */ /* load bytes */
for (lastaddr = i = 0; i < mem->size; i++) { for (lastaddr = i = 0; i < (unsigned long) mem->size; i++) {
if (vmem == NULL || if (vmem == NULL ||
(vmem->tags[i] & TAG_ALLOCATED) != 0) (vmem->tags[i] & TAG_ALLOCATED) != 0)
{ {
@ -389,7 +393,7 @@ int avr_read_mem(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM *mem, con
/* quickly scan number of pages to be written to first */ /* quickly scan number of pages to be written to first */
for (pageaddr = 0, npages = 0; for (pageaddr = 0, npages = 0;
pageaddr < mem->size; pageaddr < (unsigned int) mem->size;
pageaddr += mem->page_size) { pageaddr += mem->page_size) {
/* check whether this page must be read */ /* check whether this page must be read */
for (i = pageaddr; for (i = pageaddr;
@ -406,7 +410,7 @@ int avr_read_mem(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM *mem, con
} }
for (pageaddr = 0, failure = 0, nread = 0; for (pageaddr = 0, failure = 0, nread = 0;
!failure && pageaddr < mem->size; !failure && pageaddr < (unsigned int) mem->size;
pageaddr += mem->page_size) { pageaddr += mem->page_size) {
/* check whether this page must be read */ /* check whether this page must be read */
for (i = pageaddr, need_read = 0; for (i = pageaddr, need_read = 0;
@ -443,7 +447,7 @@ int avr_read_mem(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM *mem, con
} }
} }
for (i=0; i < mem->size; i++) { for (i=0; i < (unsigned long) mem->size; i++) {
if (vmem == NULL || if (vmem == NULL ||
(vmem->tags[i] & TAG_ALLOCATED) != 0) (vmem->tags[i] & TAG_ALLOCATED) != 0)
{ {
@ -469,9 +473,9 @@ int avr_read_mem(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM *mem, con
/* /*
* write a page data at the specified address * write a page data at the specified address
*/ */
int avr_write_page(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM *mem, int avr_write_page(const PROGRAMMER *pgm, const AVRPART *p_unused, const AVRMEM *mem,
unsigned long addr) unsigned long addr) {
{
unsigned char cmd[4]; unsigned char cmd[4];
unsigned char res[4]; unsigned char res[4];
OPCODE * wp, * lext; OPCODE * wp, * lext;
@ -718,8 +722,8 @@ int avr_write_byte_default(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM
} }
gettimeofday (&tv, NULL); gettimeofday (&tv, NULL);
prog_time = (tv.tv_sec * 1000000) + tv.tv_usec; prog_time = (tv.tv_sec * 1000000) + tv.tv_usec;
} while ((r != data) && } while (r != data && mem->max_write_delay >= 0 &&
((prog_time-start_time) < mem->max_write_delay)); prog_time - start_time < (unsigned long) mem->max_write_delay);
} }
/* /*
@ -865,7 +869,7 @@ int avr_write_mem(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM *m, int
wsize = (wsize+chunk-1) / chunk * chunk; wsize = (wsize+chunk-1) / chunk * chunk;
/* write words in chunks, low byte first */ /* write words in chunks, low byte first */
for (lastaddr = i = 0; i < wsize; i += chunk) { for (lastaddr = i = 0; i < (unsigned int) wsize; i += chunk) {
/* check that at least one byte in this chunk is allocated */ /* check that at least one byte in this chunk is allocated */
for (writeable_chunk = j = 0; !writeable_chunk && j < chunk; j++) { for (writeable_chunk = j = 0; !writeable_chunk && j < chunk; j++) {
writeable_chunk = m->tags[i+j] & TAG_ALLOCATED; writeable_chunk = m->tags[i+j] & TAG_ALLOCATED;
@ -1023,7 +1027,7 @@ int avr_write_mem(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM *m, int
page_tainted = 0; page_tainted = 0;
flush_page = 0; flush_page = 0;
for (i=0; i<wsize; i++) { for (i = 0; i < (unsigned int) wsize; i++) {
data = m->buf[i]; data = m->buf[i];
report_progress(i, wsize, NULL); report_progress(i, wsize, NULL);
@ -1047,8 +1051,8 @@ int avr_write_mem(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM *m, int
} else { } else {
page_tainted |= do_write; page_tainted |= do_write;
} }
if (i % m->page_size == m->page_size - 1 || if (i % m->page_size == (unsigned int) m->page_size - 1 ||
i == wsize - 1) { i == (unsigned int) wsize - 1) {
/* last byte this page */ /* last byte this page */
flush_page = page_tainted; flush_page = page_tainted;
newpage = 1; newpage = 1;