1 files changed, 6 insertions, 11 deletions
diff --git a/os/various/memtest.cpp b/os/various/memtest.cpp
index b853fe7..8fb5262 100644
--- a/os/various/memtest.cpp
+++ b/os/various/memtest.cpp
@@ -227,20 +227,15 @@ static void memtest_wrapper(memtest_t *testp,
                             void (*p_u8)(memtest_t *testp),
                             void (*p_u16)(memtest_t *testp),
                             void (*p_u32)(memtest_t *testp)) {
-  switch(testp->width) {
-  case MEMTEST_WIDTH_32:
+
+  if (testp->width_mask & MEMTEST_WIDTH_8)
     p_u8(testp);
+
+  if (testp->width_mask & MEMTEST_WIDTH_16)
     p_u16(testp);
+
+  if (testp->width_mask & MEMTEST_WIDTH_32)
     p_u32(testp);
-    break;
-  case MEMTEST_WIDTH_16:
-    p_u8(testp);
-    p_u16(testp);
-    break;
-  case MEMTEST_WIDTH_8:
-    p_u8(testp);
-    break;
-  }
 }
 
 /*