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 stk500.c

Browse Source
This commit is contained in:
Stefan Rueger
2024-04-19 22:30:47 +01:00
parent 1a8a974882
commit 0f6d07323d
2 changed files with 5 additions and 10 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, ...);

14
src/stk500.c
View File

@@ -1567,13 +1567,8 @@ static void stk500_print_parms(const PROGRAMMER *pgm, FILE *fp) {
stk500_print_parms1(pgm, "", fp);
}
static void stk500_setup(PROGRAMMER * pgm)
{
if ((pgm->cookie = malloc(sizeof(struct pdata))) == 0) {
pmsg_error("out of memory allocating private data\n");
return;
}
memset(pgm->cookie, 0, sizeof(struct pdata));
static void stk500_setup(PROGRAMMER * pgm) {
pgm->cookie = mmt_malloc(sizeof(struct pdata));
PDATA(pgm)->ext_addr_byte = 0xff;
PDATA(pgm)->xbeeResetPin = XBEE_DEFAULT_RESET_PIN;
// nanoSTK (Arduino Nano HW) uses 16 MHz
@@ -1583,9 +1578,8 @@ static void stk500_setup(PROGRAMMER * pgm)
PDATA(pgm)->xtal = STK500_XTAL;
}
static void stk500_teardown(PROGRAMMER * pgm)
{
free(pgm->cookie);
static void stk500_teardown(PROGRAMMER * pgm) {
mmt_free(pgm->cookie);
pgm->cookie = NULL;
}