3 files changed, 6 insertions, 35 deletions

diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c
index 8a4377f943cf3..3531cd718879b 100644
--- a/sys/dev/ata/ata-disk.c
+++ b/sys/dev/ata/ata-disk.c
@@ -341,21 +341,12 @@ addump(dev_t dev)
 	    DELAY(20);
 	}
 
-	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] ");
     }
 
     if (ata_wait(adp->controller, adp->unit, ATA_S_READY | ATA_S_DSC) < 0)
diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c
index d2d99f50cd4a7..0aaeadc403708 100644
--- a/sys/dev/ida/ida_disk.c
+++ b/sys/dev/ida/ida_disk.c
@@ -232,22 +232,12 @@ idad_dump(dev_t dev)
 		if (error)
 			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);
 }
diff --git a/sys/dev/twe/twe_freebsd.c b/sys/dev/twe/twe_freebsd.c
index d5acfda0d9a50..15c55744be213 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);
 }