diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-01-05 01:09:19 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-01-05 01:09:19 +0000 |
| commit | 726cebb18378814de049deadea0b06bcd4e46a46 (patch) | |
| tree | a723cb2664ec92d606c2f94f2528dfb2c1dbad8e | |
| parent | c98457f0af8ca7370b397738ff2c441700d3a184 (diff) | |
Reduce ahc verbosity. Put chip details inside an if (bootverbose) {}
block. Put irq on first ahc line after 'rev 0xYY', rather than a
separate line.
ok deraadt@.
| -rw-r--r-- | sys/dev/ic/aic7xxx_openbsd.c | 8 | ||||
| -rw-r--r-- | sys/dev/pci/ahc_pci.c | 13 |
2 files changed, 10 insertions, 11 deletions
diff --git a/sys/dev/ic/aic7xxx_openbsd.c b/sys/dev/ic/aic7xxx_openbsd.c index 3e8a861de51..bc7fa6ca4d9 100644 --- a/sys/dev/ic/aic7xxx_openbsd.c +++ b/sys/dev/ic/aic7xxx_openbsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic7xxx_openbsd.c,v 1.16 2003/12/28 21:29:27 krw Exp $ */ +/* $OpenBSD: aic7xxx_openbsd.c,v 1.17 2004/01/05 01:09:18 krw Exp $ */ /* $NetBSD: aic7xxx_osm.c,v 1.14 2003/11/02 11:07:44 wiz Exp $ */ /* @@ -117,8 +117,10 @@ ahc_attach(struct ahc_softc *ahc) ahc->sc_channel_b.adapter_target = ahc->our_id_b; } - ahc_controller_info(ahc, ahc_info, sizeof ahc_info); - printf("%s: %s\n", ahc->sc_dev.dv_xname, ahc_info); + if (bootverbose) { + ahc_controller_info(ahc, ahc_info, sizeof ahc_info); + printf("%s: %s\n", ahc->sc_dev.dv_xname, ahc_info); + } ahc_intr_enable(ahc, TRUE); diff --git a/sys/dev/pci/ahc_pci.c b/sys/dev/pci/ahc_pci.c index b15714f84a0..b50b5a90447 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.42 2003/12/24 22:45:45 krw Exp $ */ +/* $OpenBSD: ahc_pci.c,v 1.43 2004/01/05 01:09:18 krw Exp $ */ /* * Product specific probe and attach routines for: * 3940, 2940, aic7895, aic7890, aic7880, @@ -40,7 +40,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: ahc_pci.c,v 1.42 2003/12/24 22:45:45 krw Exp $ + * $Id: ahc_pci.c,v 1.43 2004/01/05 01:09:18 krw Exp $ * * //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#57 $ * @@ -893,17 +893,14 @@ ahc_pci_attach(parent, self, aux) ahc->ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, ahc_platform_intr, ahc, ahc->sc_dev.dv_xname); if (ahc->ih == NULL) { - printf("%s: couldn't establish interrupt", - ahc->sc_dev.dv_xname); + printf(": couldn't establish interrupt"); if (intrstr != NULL) printf(" at %s", intrstr); printf("\n"); ahc_free(ahc); return; - } - printf("\n"); - if (intrstr != NULL) - printf("%s: interrupting at %s\n", ahc_name(ahc), intrstr); + } else + printf(": %s\n", intrstr ? intrstr : "?"); dscommand0 = ahc_inb(ahc, DSCOMMAND0); dscommand0 |= MPARCKEN|CACHETHEN; |