pretty pretty pointless support

diff --git a/sys/dev/isa/wd.c b/sys/dev/isa/wd.c
index b7ade2c..91c0855 100644 (file)
--- a/sys/dev/isa/wd.c
+++ b/sys/dev/isa/wd.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: wd.c,v 1.17 1996/08/07 01:53:01 downsj Exp $  */
+/*     $OpenBSD: wd.c,v 1.18 1996/09/16 02:36:10 downsj Exp $  */
 /*     $NetBSD: wd.c,v 1.150 1996/05/12 23:54:03 mycroft Exp $ */
 
 /*
@@ -174,15 +174,17 @@ wdattach(parent, self, aux)
        *q++ = '\0';
 
        printf(": <%s>\n", buf);
-       printf("%s: %dMB, %d cyl, %d head, %d sec, %d bytes/sec\n",
-           self->dv_xname,
-           d_link->sc_params.wdp_cylinders *
-           (d_link->sc_params.wdp_heads * d_link->sc_params.wdp_sectors) /
-           (1048576 / DEV_BSIZE),
-           d_link->sc_params.wdp_cylinders,
-           d_link->sc_params.wdp_heads,
-           d_link->sc_params.wdp_sectors,
-           DEV_BSIZE);
+       if (d_link->sc_lp->d_type != DTYPE_ST506) {
+               printf("%s: %dMB, %d cyl, %d head, %d sec, %d bytes/sec\n",
+                   self->dv_xname,
+                   d_link->sc_params.wdp_cylinders *
+                   (d_link->sc_params.wdp_heads *
+                    d_link->sc_params.wdp_sectors) / (1048576 / DEV_BSIZE),
+                   d_link->sc_params.wdp_cylinders,
+                   d_link->sc_params.wdp_heads,
+                   d_link->sc_params.wdp_sectors,
+                   DEV_BSIZE);
+       }
 
 #if NISADMA > 0
        if ((d_link->sc_params.wdp_capabilities & WD_CAP_DMA) != 0 &&

diff --git a/sys/dev/isa/wdc.c b/sys/dev/isa/wdc.c
index f60869d..38b82dc 100644 (file)
--- a/sys/dev/isa/wdc.c
+++ b/sys/dev/isa/wdc.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: wdc.c,v 1.8 1996/09/11 07:27:03 downsj Exp $  */
+/*     $OpenBSD: wdc.c,v 1.9 1996/09/16 02:36:08 downsj Exp $  */
 /*     $NetBSD: wd.c,v 1.150 1996/05/12 23:54:03 mycroft Exp $ */
 
 /*
@@ -1309,7 +1309,8 @@ wdc_get_parms(d_link)
 
        while ((wdc->sc_flags & WDCF_ACTIVE) != 0) {
                wdc->sc_flags |= WDCF_WANTED;
-               if ((error = tsleep(wdc, PRIBIO | PCATCH, "wdprm", 0)) != 0) {
+               error = tsleep(wdc, PRIBIO | PCATCH, "wdprm", 0);
+               if (error != 0) {
                        splx(s);
                        return error;
                }
@@ -1328,7 +1329,7 @@ wdc_get_parms(d_link)
                    sizeof d_link->sc_lp->d_typename);
                d_link->sc_lp->d_type = DTYPE_ST506;
 
-               strncpy(d_link->sc_params.wdp_model, "unknown",
+               strncpy(d_link->sc_params.wdp_model, "ST506/MFM",
                    sizeof d_link->sc_params.wdp_model);
                d_link->sc_params.wdp_config = WD_CFG_FIXED;
                d_link->sc_params.wdp_cylinders = 1024;