3 files changed, 6 insertions, 28 deletions
diff --git a/firmware/lib/utility.c b/firmware/lib/utility.c
index 7a2370b0..5e506f33 100644
--- a/firmware/lib/utility.c
+++ b/firmware/lib/utility.c
@@ -8,14 +8,6 @@
 #include "sysincludes.h"
 #include "utility.h"
 
-void* Memset(void* d, const uint8_t c, uint64_t n) {
-  uint8_t* dest = d; /* the only way to keep both cl and gcc happy */
-  while (n--) {
-    *dest++ = c;
-  }
-  return d;
-}
-
 int SafeMemcmp(const void* s1, const void* s2, size_t n) {
   const unsigned char* us1 = s1;
   const unsigned char* us2 = s2;
diff --git a/firmware/stub/utility_stub.c b/firmware/stub/utility_stub.c
index 489b0f72..e3ec19be 100644
--- a/firmware/stub/utility_stub.c
+++ b/firmware/stub/utility_stub.c
@@ -24,3 +24,9 @@ int Memcmp(const void* src1, const void* src2, size_t n) {
 void* Memcpy(void* dest, const void* src, uint64_t n) {
   return memcpy(dest, src, (size_t)n);
 }
+
+void* Memset(void* d, const uint8_t c, uint64_t n) {
+  return memset(d, c, n);
+}
+
+
diff --git a/tests/utility_tests.c b/tests/utility_tests.c
index 03ba5f9e..5ecb0b06 100644
--- a/tests/utility_tests.c
+++ b/tests/utility_tests.c
@@ -47,25 +47,6 @@ static void MacrosTest(void) {
 }
 
 
-/* Test Memset */
-static void MemsetTest(void) {
-  char dest[128];
-  char want[128];
-
-  memset(want, 0, 128);
-  memset(dest, 0, 128);
-
-  /* Simple fill */
-  memset(want, 123, 5);
-  TEST_PTR_EQ(dest, Memset(dest, 123, 5), "Memset() returns dest");
-  TEST_EQ(0, memcmp(dest, want, 128), "Memset()");
-
-  /* Filling length 0 does nothing */
-  Memset(dest, 42, 0);
-  TEST_EQ(0, memcmp(dest, want, 128), "Memset() size=0");
-}
-
-
 /* Test SafeMemcmp */
 static void SafeMemcmpTest(void) {
   /* Zero-length strings are equal */
@@ -88,7 +69,6 @@ int main(int argc, char* argv[]) {
   int error_code = 0;
 
   MacrosTest();
-  MemsetTest();
   SafeMemcmpTest();
 
   if (!gTestSuccess)