diff options
author | Paul Saab <ps@FreeBSD.org> | 2001-03-28 01:37:29 +0000 |
---|---|---|
committer | Paul Saab <ps@FreeBSD.org> | 2001-03-28 01:37:29 +0000 |
commit | 6b8b8c7fdc750322acdeccb71f1e7bd707e01e15 (patch) | |
tree | f6db56e675a6f82ae77054c4a4fc5fbeb9fe180d /sys/dev/twe | |
parent | 919eea6db9fcac16c41f1255ad370d02bba52585 (diff) | |
download | src-6b8b8c7fdc750322acdeccb71f1e7bd707e01e15.tar.gz src-6b8b8c7fdc750322acdeccb71f1e7bd707e01e15.zip |
Last commit was broken.. It always prints '[CTRL-C to abort]'.
Move duplicate code for printing the status of the dump and checking
for abort into a separate function.
Pointy hat to: me
Notes
Notes:
svn path=/head/; revision=74890
Diffstat (limited to 'sys/dev/twe')
-rw-r--r-- | sys/dev/twe/twe_freebsd.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sys/dev/twe/twe_freebsd.c b/sys/dev/twe/twe_freebsd.c index d5acfda0d9a5..15c55744be21 100644 --- a/sys/dev/twe/twe_freebsd.c +++ b/sys/dev/twe/twe_freebsd.c @@ -729,22 +729,12 @@ twed_dump(dev_t dev) return(error); - if (addr % (1024 * 1024) == 0) { -#ifdef HW_WDOG - if (wdog_tickler) - (*wdog_tickler)(); -#endif - printf("%ld ", (long)(count * DEV_BSIZE) / (1024 * 1024)); - } + if (dumpstatus(addr, (long)(count * DEV_BSIZE)) < 0) + return(EINTR); blkno += blkcnt * dumppages; count -= blkcnt * dumppages; addr += PAGE_SIZE * dumppages; - - if (cncheckc() == 0x03) - return(EINTR); - else - printf("[CTRL-C to abort] "); } return(0); } |