From a497127a8d16387ce9b9b01969ca5632b95d8e07 Mon Sep 17 00:00:00 2001 From: Gareth McMullin Date: Sun, 22 Mar 2015 12:21:03 -0700 Subject: Move MIN macro to general.h --- src/samd.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/samd.c') diff --git a/src/samd.c b/src/samd.c index e12bcc9..a996610 100644 --- a/src/samd.c +++ b/src/samd.c @@ -159,9 +159,6 @@ static const char samd_xml_memory_map[] = "" /* Component ID */ #define SAMD_CID_VALUE 0xB105100D -/* Utility */ -#define MINIMUM(a,b) ((a < b) ? a : b) - /** * Reads the SAM D20 Peripheral ID */ @@ -529,7 +526,7 @@ static int samd_flash_write(struct target_s *target, uint32_t dest, for (uint32_t page = first_page; page <= last_page; page += SAMD_PAGE_SIZE) { next_page = page + SAMD_PAGE_SIZE; - length = MINIMUM(end + 4, next_page) - addr; + length = MIN(end + 4, next_page) - addr; /* Write within a single page. This may be part or all of the page */ target_mem_write(target, addr, &data[i], length); -- cgit v1.2.3