From a497127a8d16387ce9b9b01969ca5632b95d8e07 Mon Sep 17 00:00:00 2001 From: Gareth McMullin Date: Sun, 22 Mar 2015 12:21:03 -0700 Subject: [PATCH] Move MIN macro to general.h --- src/adiv5.c | 2 -- src/include/general.h | 2 ++ src/samd.c | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/adiv5.c b/src/adiv5.c index f2421ce9..88aac311 100644 --- a/src/adiv5.c +++ b/src/adiv5.c @@ -173,8 +173,6 @@ enum align { }; #define ALIGNOF(x) (((x) & 3) == 0 ? ALIGN_WORD : \ (((x) & 1) == 0 ? ALIGN_HALFWORD : ALIGN_BYTE)) -#undef MIN -#define MIN(x, y) (((x) < (y)) ? (x) : (y)) /* Program the CSW and TAR for sequencial access at a given width */ static void ap_mem_access_setup(ADIv5_AP_t *ap, uint32_t addr, enum align align) diff --git a/src/include/general.h b/src/include/general.h index cf8c1e67..c82c750b 100644 --- a/src/include/general.h +++ b/src/include/general.h @@ -39,6 +39,8 @@ #endif #define ALIGN(x, n) (((x) + (n) - 1) & ~((n) - 1)) +#undef MIN +#define MIN(x, y) (((x) < (y)) ? (x) : (y)) #endif diff --git a/src/samd.c b/src/samd.c index e12bcc97..a996610d 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);