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

Utilise magic memory tree interface for flip1.c

Browse Source
This commit is contained in:
Stefan Rueger
2024-04-21 17:27:12 +01:00
parent 8fe729f0a2
commit afed7bfc6c
2 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/avrdude.h
View File

@@ -44,6 +44,7 @@ extern const char *pgmid; // Programmer -c string
#define mmt_strdup(s) cfg_strdup(__func__, s)
#define mmt_malloc(n) cfg_malloc(__func__, n)
#define mmt_realloc(p, n) cfg_realloc(__func__, p, n)
#define mmt_free(p) free(p)
int avrdude_message2(FILE *fp, int lno, const char *file, const char *func, int msgmode, int msglvl, const char *format, ...);

27
src/flip1.c
View File

@@ -545,20 +545,12 @@ int flip1_read_sig_bytes(const PROGRAMMER *pgm, const AVRPART *part, const AVRME
return 0;
}
void flip1_setup(PROGRAMMER * pgm)
{
pgm->cookie = calloc(1, sizeof(struct flip1));
if (pgm->cookie == NULL) {
pmsg_error("out of memory allocating private data structure\n");
exit(1);
}
void flip1_setup(PROGRAMMER *pgm) {
pgm->cookie = mmt_malloc(sizeof(struct flip1));
}
void flip1_teardown(PROGRAMMER * pgm)
{
free(pgm->cookie);
pgm->cookie = NULL;
void flip1_teardown(PROGRAMMER *pgm) {
mmt_free(pgm->cookie);
}
/* INTERNAL FUNCTION DEFINITIONS
@@ -690,12 +682,7 @@ int flip1_write_memory(struct dfu_dev *dfu,
write_size = size;
}
if ((buf = malloc(sizeof(struct flip1_cmd_header) +
write_size +
sizeof(struct flip1_prog_footer))) == 0) {
pmsg_error("out of memory\n");
return -1;
}
buf = mmt_malloc(sizeof(struct flip1_cmd_header) + write_size + sizeof(struct flip1_prog_footer));
/*
* As this function is called once per page, no need to handle 64
@@ -707,7 +694,7 @@ int flip1_write_memory(struct dfu_dev *dfu,
if (mem_unit == FLIP1_MEM_UNIT_FLASH) {
page_addr = addr >> 16;
if (flip1_set_mem_page(dfu, page_addr) < 0) {
free(buf);
mmt_free(buf);
return -1;
}
}
@@ -735,7 +722,7 @@ int flip1_write_memory(struct dfu_dev *dfu,
aux_result = dfu_getstatus(dfu, &status);
dfu->timeout = default_timeout;
free(buf);
mmt_free(buf);
if (aux_result < 0 || cmd_result < 0)
return -1;