summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2013-02-24 17:33:19 +0000
committerSimon Glass <sjg@chromium.org>2013-02-28 19:09:22 -0800
commitc44d4386e67ac6dd57ddd60fdde54bf7ed581b6e (patch)
treea0cc65c6f976e3c0742329357c71433d8424a237
parent7ecbd4d70842362c3a8ad9393e9d9aab7e13afbf (diff)
downloadu-boot-imx-c44d4386e67ac6dd57ddd60fdde54bf7ed581b6e.zip
u-boot-imx-c44d4386e67ac6dd57ddd60fdde54bf7ed581b6e.tar.gz
u-boot-imx-c44d4386e67ac6dd57ddd60fdde54bf7ed581b6e.tar.bz2
Bring mtest putc() into common code
If we get a Ctrl-C abort, we always print a newline. Move this repeated code out of the functions and into a single place in the caller. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--common/cmd_mem.c32
1 files changed, 9 insertions, 23 deletions
diff --git a/common/cmd_mem.c b/common/cmd_mem.c
index 5235bfe..f5dd56d 100644
--- a/common/cmd_mem.c
+++ b/common/cmd_mem.c
@@ -684,10 +684,8 @@ static ulong mem_test_alt(vu_long *start, vu_long *end)
"expected %08lx, actual %08lx\n",
val, readback);
errs++;
- if (ctrlc()) {
- putc('\n');
+ if (ctrlc())
return -1;
- }
}
*addr = ~val;
*dummy = val;
@@ -697,10 +695,8 @@ static ulong mem_test_alt(vu_long *start, vu_long *end)
"Is %08lx, should be %08lx\n",
readback, ~val);
errs++;
- if (ctrlc()) {
- putc('\n');
+ if (ctrlc())
return -1;
- }
}
}
}
@@ -765,10 +761,8 @@ static ulong mem_test_alt(vu_long *start, vu_long *end)
" expected 0x%.8lx, actual 0x%.8lx\n",
(ulong)&start[offset], pattern, temp);
errs++;
- if (ctrlc()) {
- putc('\n');
+ if (ctrlc())
return -1;
- }
}
}
start[test_offset] = pattern;
@@ -788,10 +782,8 @@ static ulong mem_test_alt(vu_long *start, vu_long *end)
" actual 0x%.8lx\n",
(ulong)&start[offset], pattern, temp);
errs++;
- if (ctrlc()) {
- putc('\n');
+ if (ctrlc())
return -1;
- }
}
}
start[test_offset] = pattern;
@@ -830,10 +822,8 @@ static ulong mem_test_alt(vu_long *start, vu_long *end)
" expected 0x%.8lx, actual 0x%.8lx)\n",
(ulong)&start[offset], pattern, temp);
errs++;
- if (ctrlc()) {
- putc('\n');
+ if (ctrlc())
return -1;
- }
}
anti_pattern = ~pattern;
@@ -852,10 +842,8 @@ static ulong mem_test_alt(vu_long *start, vu_long *end)
" expected 0x%.8lx, actual 0x%.8lx)\n",
(ulong)&start[offset], anti_pattern, temp);
errs++;
- if (ctrlc()) {
- putc('\n');
+ if (ctrlc())
return -1;
- }
}
start[offset] = 0;
}
@@ -907,10 +895,8 @@ static ulong mem_test_quick(vu_long *start, vu_long *end, vu_long pattern,
"found %08lX, expected %08lX\n",
(uint)(uintptr_t)addr, readback, val);
errs++;
- if (ctrlc()) {
- putc('\n');
+ if (ctrlc())
return -1;
- }
}
val += incr;
}
@@ -967,7 +953,6 @@ static int do_mem_mtest(cmd_tbl_t *cmdtp, int flag, int argc,
!iteration_limit || iteration < iteration_limit;
iteration++) {
if (ctrlc()) {
- putc('\n');
errs = -1UL;
break;
}
@@ -981,7 +966,8 @@ static int do_mem_mtest(cmd_tbl_t *cmdtp, int flag, int argc,
}
if (errs == -1UL) {
- /* Memory test was aborted */
+ /* Memory test was aborted - write a newline to finish off */
+ putc('\n');
ret = 1;
} else {
printf("Tested %d iteration(s) with %lu errors.\n",