summaryrefslogtreecommitdiff
path: root/sys/dev/ic/siop_common.c
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2001-02-20 00:32:31 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2001-02-20 00:32:31 +0000
commit9cdf7ddf03d36f5e7286298e47ef9089b0995990 (patch)
tree219a038fc871b49217e6cd89c622dd25dddf042b /sys/dev/ic/siop_common.c
parentea724588e1e4659e866f4183ba13067be00a2990 (diff)
Tone down the verbosity level on the siop driver, print negotiation
results on one line, during boot polling only. Force wide/sync negotiations for all targets during boot. Delete extraneous name field and associated strings that duplicate info provided in INQUIRY data. Actually timeout during polling rather than wait forever for ITSDONE. Remove unneeded check for SCSI_POLL before calling scsi_done(). Makes logic conform to other drivers.
Diffstat (limited to 'sys/dev/ic/siop_common.c')
-rw-r--r--sys/dev/ic/siop_common.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/sys/dev/ic/siop_common.c b/sys/dev/ic/siop_common.c
index 1300c91c117..e6d93470787 100644
--- a/sys/dev/ic/siop_common.c
+++ b/sys/dev/ic/siop_common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: siop_common.c,v 1.1 2001/02/15 04:07:58 krw Exp $ */
+/* $OpenBSD: siop_common.c,v 1.2 2001/02/20 00:32:29 krw Exp $ */
/* $NetBSD: siop_common.c,v 1.12 2001/02/11 18:04:50 bouyer Exp $ */
/*
@@ -184,15 +184,11 @@ siop_wdtr_neg(siop_cmd)
/* we initiated wide negotiation */
switch (tables->msg_in[3]) {
case MSG_EXT_WDTR_BUS_8_BIT:
- printf("%s: target %d using 8bit transfers\n",
- sc->sc_dev.dv_xname, target);
siop_target->flags &= ~TARF_ISWIDE;
sc->targets[target]->id &= ~(SCNTL3_EWS << 24);
break;
case MSG_EXT_WDTR_BUS_16_BIT:
if (siop_target->flags & TARF_WIDE) {
- printf("%s: target %d using 16bit transfers\n",
- sc->sc_dev.dv_xname, target);
siop_target->flags |= TARF_ISWIDE;
sc->targets[target]->id |= (SCNTL3_EWS << 24);
break;
@@ -229,13 +225,9 @@ siop_wdtr_neg(siop_cmd)
/* target initiated wide negotiation */
if (tables->msg_in[3] >= MSG_EXT_WDTR_BUS_16_BIT
&& (siop_target->flags & TARF_WIDE)) {
- printf("%s: target %d using 16bit transfers\n",
- sc->sc_dev.dv_xname, target);
siop_target->flags |= TARF_ISWIDE;
sc->targets[target]->id |= SCNTL3_EWS << 24;
} else {
- printf("%s: target %d using 8bit transfers\n",
- sc->sc_dev.dv_xname, target);
siop_target->flags &= ~TARF_ISWIDE;
sc->targets[target]->id &= ~(SCNTL3_EWS << 24);
}
@@ -282,9 +274,6 @@ siop_sdtr_neg(siop_cmd)
continue;
if (scf_period[i].period == sync) {
/* ok, found it. we now are sync. */
- printf("%s: target %d now synchronous at "
- "%sMhz, offset %d\n", sc->sc_dev.dv_xname,
- target, scf_period[i].rate, offset);
sc->targets[target]->id &=
~(SCNTL3_SCF_MASK << 24);
sc->targets[target]->id |= scf_period[i].scf
@@ -310,8 +299,6 @@ reject:
send_msgout = 1;
tables->t_msgout.count= htole32(1);
tables->msg_out[0] = MSG_MESSAGE_REJECT;
- printf("%s: target %d asynchronous\n", sc->sc_dev.dv_xname,
- target);
sc->targets[target]->id &= ~(SCNTL3_SCF_MASK << 24);
sc->targets[target]->id &= ~(SCNTL3_ULTRA << 24);
sc->targets[target]->id &= ~(SXFER_MO_MASK << 8);
@@ -333,9 +320,6 @@ reject:
continue;
if (scf_period[i].period == sync) {
/* ok, found it. we now are sync. */
- printf("%s: target %d now synchronous at "
- "%sMhz, offset %d\n", sc->sc_dev.dv_xname,
- target, scf_period[i].rate, offset);
sc->targets[target]->id &=
~(SCNTL3_SCF_MASK << 24);
sc->targets[target]->id |= scf_period[i].scf