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

Utilise magic memory tree interface for teensy.c

Browse Source
This commit is contained in:
Stefan Rueger
2024-04-21 16:51:31 +01:00
parent 8fe729f0a2
commit 9d63a9aa97
2 changed files with 7 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, ...);

26
src/teensy.c
View File

@@ -177,12 +177,7 @@ static int teensy_write_page(pdata_t* pdata, uint32_t address, const uint8_t* bu
}
size_t report_size = 1 + 2 + (size_t)pdata->page_size;
uint8_t* report = (uint8_t*)malloc(report_size);
if (report == NULL)
{
pmsg_error("unable to allocate memory\n");
return -1;
}
uint8_t *report = (uint8_t *) mmt_malloc(report_size);
report[0] = 0; // report number
if (pdata->page_size <= 256 && pdata->flash_size < 0x10000)
@@ -204,7 +199,7 @@ static int teensy_write_page(pdata_t* pdata, uint32_t address, const uint8_t* bu
memset(report + 1 + 2 + size, 0xFF, report_size - (1 + 2 + size));
int result = hid_write(pdata->hid_handle, report, report_size);
free(report);
mmt_free(report);
if (result < 0)
{
if (!suppress_warning)
@@ -234,23 +229,14 @@ static int teensy_reboot(pdata_t* pdata)
//-----------------------------------------------------------------------------
static void teensy_setup(PROGRAMMER* pgm)
{
static void teensy_setup(PROGRAMMER *pgm) {
pmsg_debug("teensy_setup()\n");
if ((pgm->cookie = malloc(sizeof(pdata_t))) == NULL)
{
pmsg_error("unable to allocate memory\n");
exit(1);
}
memset(pgm->cookie, 0, sizeof(pdata_t));
pgm->cookie = mmt_malloc(sizeof(pdata_t));
}
static void teensy_teardown(PROGRAMMER* pgm)
{
static void teensy_teardown(PROGRAMMER *pgm) {
pmsg_debug("teensy_teardown()\n");
free(pgm->cookie);
mmt_free(pgm->cookie);
}
static int teensy_initialize(const PROGRAMMER *pgm, const AVRPART *p) {