aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGareth McMullin2015-03-22 12:21:03 -0700
committerGareth McMullin2015-03-22 12:23:03 -0700
commita497127a8d16387ce9b9b01969ca5632b95d8e07 (patch)
tree71dee19e5fd4ef0dc14b0575843947f747b860c7
parentc10862bff34e9fe39ec209a7e5c49903534a58d3 (diff)
Move MIN macro to general.h
-rw-r--r--src/adiv5.c2
-rw-r--r--src/include/general.h2
-rw-r--r--src/samd.c5
3 files changed, 3 insertions, 6 deletions
diff --git a/src/adiv5.c b/src/adiv5.c
index f2421ce..88aac31 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 cf8c1e6..c82c750 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 e12bcc9..a996610 100644
--- a/src/samd.c
+++ b/src/samd.c
@@ -159,9 +159,6 @@ static const char samd_xml_memory_map[] = "<?xml version=\"1.0\"?>"
/* 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);