diff options
| author | Steve Murphree <smurph@cvs.openbsd.org> | 2000-04-05 04:30:00 +0000 |
|---|---|---|
| committer | Steve Murphree <smurph@cvs.openbsd.org> | 2000-04-05 04:30:00 +0000 |
| commit | bd065e16cb35ebcfbc352e4d0d3c7553d2e84e89 (patch) | |
| tree | 34e7baea9426335e0849080d82522bbece9b16ba /sys/dev | |
| parent | cd0dfa3643a61340e56788db47584e6505ee88c8 (diff) | |
Changed boot messages and fixed Ultra160 boot messages.
AHA-29160 Ultra160 verified working.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/aic7xxx.c | 27 | ||||
| -rw-r--r-- | sys/dev/pci/ahc_pci.c | 5 |
2 files changed, 18 insertions, 14 deletions
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c index 5c4a961663d..cd8e2db882c 100644 --- a/sys/dev/ic/aic7xxx.c +++ b/sys/dev/ic/aic7xxx.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.40 2000/01/07 23:08:17 gibbs Exp $ - * $OpenBSD: aic7xxx.c,v 1.20 2000/04/04 03:48:47 smurph Exp $ + * $OpenBSD: aic7xxx.c,v 1.21 2000/04/05 04:29:58 smurph Exp $ */ /* * A few notes on features of the driver. @@ -1378,7 +1378,7 @@ ahc_set_syncrate(ahc, devinfo, syncrate, period, offset, type, paused, done) * Print messages if we're verbose and at the end of a negotiation * cycle. */ - if (done && bootverbose) { + if (done) { if (offset != 0) { printf("%s: target %d synchronous at %sMHz, " "offset = 0x%x\n", ahc_name(ahc), @@ -2597,9 +2597,10 @@ ahc_handle_msg_reject(ahc, devinfo) struct tmode_tstate *tstate; /* note 8bit xfers */ - printf("%s:%c:%d: refuses WIDE negotiation. Using " - "8bit transfers\n", ahc_name(ahc), - devinfo->channel, devinfo->target); + if (bootverbose) + printf("%s:%c:%d: refuses WIDE negotiation. Using " + "8bit transfers\n", ahc_name(ahc), + devinfo->channel, devinfo->target); ahc_set_width(ahc, devinfo, MSG_EXT_WDTR_BUS_8_BIT, AHC_TRANS_ACTIVE|AHC_TRANS_GOAL, @@ -2633,14 +2634,16 @@ ahc_handle_msg_reject(ahc, devinfo) AHC_TRANS_ACTIVE|AHC_TRANS_GOAL, /*paused*/TRUE, /*done*/TRUE); - printf("%s:%c:%d: refuses synchronous negotiation. " - "Using asynchronous transfers\n", - ahc_name(ahc), - devinfo->channel, devinfo->target); + if (bootverbose) + printf("%s:%c:%d: refuses synchronous negotiation. " + "Using asynchronous transfers\n", + ahc_name(ahc), + devinfo->channel, devinfo->target); } else if ((scb->hscb->control & MSG_SIMPLE_Q_TAG) != 0) { - printf("%s:%c:%d: refuses tagged commands. Performing " - "non-tagged I/O\n", ahc_name(ahc), - devinfo->channel, devinfo->target); + if (bootverbose) + printf("%s:%c:%d: refuses tagged commands. Performing " + "non-tagged I/O\n", ahc_name(ahc), + devinfo->channel, devinfo->target); ahc_set_tags(ahc, devinfo, FALSE); diff --git a/sys/dev/pci/ahc_pci.c b/sys/dev/pci/ahc_pci.c index 9158bea15d0..2097e308fcb 100644 --- a/sys/dev/pci/ahc_pci.c +++ b/sys/dev/pci/ahc_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahc_pci.c,v 1.13 2000/03/22 04:01:07 smurph Exp $ */ +/* $OpenBSD: ahc_pci.c,v 1.14 2000/04/05 04:29:59 smurph Exp $ */ /* $NetBSD: ahc_pci.c,v 1.9 1996/10/21 22:56:24 thorpej Exp $ */ /* @@ -428,7 +428,8 @@ void *aux; sfunct = ahc_inb(ahc, SFUNCT) & ~ALT_MODE; ahc_outb(ahc, SFUNCT, sfunct | ALT_MODE); optionmode = ahc_inb(ahc, OPTIONMODE); - printf("OptionMode = %x\n", optionmode); + if (bootverbose) + printf("%s: OptionMode = %x\n", ahc_name(ahc), optionmode); ahc_outb(ahc, OPTIONMODE, OPTIONMODE_DEFAULTS); /* Send CRC info in target mode every 4K */ ahc_outb(ahc, TARGCRCCNT, 0); |