From 9d63a9aa9765d01851085a085f72bf44c3c4ed4c Mon Sep 17 00:00:00 2001
From: Stefan Rueger <stefan.rueger@urclocks.com>
Date: Sun, 21 Apr 2024 16:51:31 +0100
Subject: [PATCH] Utilise magic memory tree interface for teensy.c

---
 src/avrdude.h |  1 +
 src/teensy.c  | 26 ++++++--------------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/avrdude.h b/src/avrdude.h
index c679a654..6b777d30 100644
--- a/src/avrdude.h
+++ b/src/avrdude.h
@@ -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, ...);
 
diff --git a/src/teensy.c b/src/teensy.c
index 7da47366..ac1cdb6e 100644
--- a/src/teensy.c
+++ b/src/teensy.c
@@ -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) {