diff options
| -rw-r--r-- | firmware/lib/include/utility.h | 7 | ||||
| -rw-r--r-- | tests/utility_tests.c | 8 |
2 files changed, 0 insertions, 15 deletions
diff --git a/firmware/lib/include/utility.h b/firmware/lib/include/utility.h index e8872492..e5539751 100644 --- a/firmware/lib/include/utility.h +++ b/firmware/lib/include/utility.h @@ -22,13 +22,6 @@ #define VbAssert(expr) #endif -/* - * Combine [msw] and [lsw] uint16s to a uint32_t with its [msw] and [lsw] - * forming the most and least signficant 16-bit words. - */ -#define CombineUint16Pair(msw,lsw) (((uint32_t)(msw) << 16) | \ - (((lsw)) & 0xFFFF)) - /* Return the minimum of (a) or (b). */ #define Min(a, b) (((a) < (b)) ? (a) : (b)) diff --git a/tests/utility_tests.c b/tests/utility_tests.c index 88fe1194..5e22339f 100644 --- a/tests/utility_tests.c +++ b/tests/utility_tests.c @@ -21,14 +21,6 @@ static void MacrosTest(void) uint64_t u = (0xABCD00000000ULL); uint64_t v = (0xABCD000000ULL); - TEST_EQ(CombineUint16Pair(1, 2), 0x00010002, "CombineUint16Pair"); - TEST_EQ(CombineUint16Pair(0xFFFE, 0xFFFF), 0xFFFEFFFF, - "CombineUint16Pair 2"); - TEST_EQ(CombineUint16Pair(-4, -16), 0xFFFCFFF0, - "CombineUint16Pair big negative"); - TEST_EQ(CombineUint16Pair(0x10003, 0x10004), 0x00030004, - "CombineUint16Pair overflow"); - TEST_EQ(Min(1, 2), 1, "Min 1"); TEST_EQ(Min(4, 3), 3, "Min 2"); TEST_EQ(Min(5, 5), 5, "Min 5"); |