shorten dmesg output

2 files changed, 7 insertions, 15 deletions

diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 4235ec4b325..0c845926f22 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wd.c,v 1.3 1999/07/22 04:00:42 csapuntz Exp $ */
+/*	$OpenBSD: wd.c,v 1.4 1999/07/22 04:36:47 deraadt Exp $ */
 /*	$NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */
 
 /*
@@ -321,8 +321,7 @@ wdattach(parent, self, aux)
 		wd->sc_multi = 1;
 	}
 
-	printf("%s: drive supports %d-sector pio transfers,",
-	    wd->sc_dev.dv_xname, wd->sc_multi);
+	printf("%s: %d-sector PIO,", wd->sc_dev.dv_xname, wd->sc_multi);
 
 	/* Prior to ATA-4, LBA was optional. */
 	if ((wd->sc_params.atap_capabilities1 & WDC_CAP_LBA) != 0)
@@ -335,32 +334,25 @@ wdattach(parent, self, aux)
 #endif
 
 	if ((wd->sc_flags & WDF_LBA) != 0) {
-		printf(" lba addressing\n");
 		wd->sc_capacity =
 		    (wd->sc_params.atap_capacity[1] << 16) |
 		    wd->sc_params.atap_capacity[0];
-		printf("%s: %dMB, %d cyl, %d head, %d sec, "
-		    "%d bytes/sect x %d sectors\n",
-		    self->dv_xname,
+		printf(" LBA, %dMB, %d cyl, %d head, %d sec, %d sectors\n",
 		    wd->sc_capacity / (1048576 / DEV_BSIZE),
 		    wd->sc_params.atap_cylinders,
 		    wd->sc_params.atap_heads,
 		    wd->sc_params.atap_sectors,
-		    DEV_BSIZE,
 		    wd->sc_capacity);
 	} else {
-		printf(" chs addressing\n");
 		wd->sc_capacity =
 		    wd->sc_params.atap_cylinders *
 		    wd->sc_params.atap_heads *
 		    wd->sc_params.atap_sectors;
-		printf("%s: %dMB, %d cyl, %d head, %d sec, %d bytes/sect x %d "
-		    "sectors\n", self->dv_xname,
+		printf(" CHS, %dMB, %d cyl, %d head, %d sec, %d sectors\n",
 		    wd->sc_capacity / (1048576 / DEV_BSIZE),
 		    wd->sc_params.atap_cylinders,
 		    wd->sc_params.atap_heads,
 		    wd->sc_params.atap_sectors,
-		    DEV_BSIZE,
 		    wd->sc_capacity);
 	}
 	WDCDEBUG_PRINT(("%s: atap_dmatiming_mimi=%d, atap_dmatiming_recom=%d\n",
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c
index 3cb28ad1d6c..a3efc17d52e 100644
--- a/sys/dev/ic/wdc.c
+++ b/sys/dev/ic/wdc.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: wdc.c,v 1.3 1999/07/22 02:54:06 csapuntz Exp $     */
+/*      $OpenBSD: wdc.c,v 1.4 1999/07/22 04:36:33 deraadt Exp $     */
 /*	$NetBSD: wdc.c,v 1.68 1999/06/23 19:00:17 bouyer Exp $ */
 
 
@@ -825,7 +825,7 @@ wdc_probe_caps(drvp)
 			/* Not good. fall back to 16bits */
 			drvp->drive_flags &= ~DRIVE_CAP32;
 		} else {
-			printf("%s: 32-bits data port", drv_dev->dv_xname);
+			printf("%s: 32-bit data port", drv_dev->dv_xname);
 		}
 	}
 #if 0 /* Some ultra-DMA drives claims to only support ATA-3. sigh */
@@ -880,7 +880,7 @@ wdc_probe_caps(drvp)
 				   AT_POLL) != CMD_OK)
 					continue;
 			if (!printed) { 
-				printf("%s: drive supports PIO mode %d",
+				printf("%s: supports PIO mode %d",
 				    drv_dev->dv_xname, i + 3);
 				sep = ",";
 				printed = 1;