diff options
| author |   krw <krw@openbsd.org> | 2020-07-02 15:58:17 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2020-07-02 15:58:17 +0000 |
| commit | 712f76d030379aaf3ee44399cbb9e20aec70076e (patch) | |
| tree | 2b70d0cffc5bede74edc861db45d2e3cb2584d0f /sys/dev/ic/aic79xx_openbsd.c | |
| parent | We need the same header files on powerpc64 as we have on powerpc. (diff) | |
| download | wireguard-openbsd-712f76d030379aaf3ee44399cbb9e20aec70076e.tar.xz wireguard-openbsd-712f76d030379aaf3ee44399cbb9e20aec70076e.zip | |
Shuffle things around so that sc->sc_link initialization is
even more concentrated just before config_found().
Diffstat (limited to 'sys/dev/ic/aic79xx_openbsd.c')
| -rw-r--r-- | sys/dev/ic/aic79xx_openbsd.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sys/dev/ic/aic79xx_openbsd.c b/sys/dev/ic/aic79xx_openbsd.c index 466bf17ce62..f5240e51c44 100644 --- a/sys/dev/ic/aic79xx_openbsd.c +++ b/sys/dev/ic/aic79xx_openbsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic79xx_openbsd.c,v 1.51 2020/06/27 14:29:44 krw Exp $ */ +/* $OpenBSD: aic79xx_openbsd.c,v 1.52 2020/07/02 15:58:17 krw Exp $ */ /* * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom @@ -99,6 +99,16 @@ ahd_attach(struct ahd_softc *ahd) printf("%s\n", ahd_info); ahd_lock(ahd, &s); + if (bootverbose) { + ahd_controller_info(ahd, ahd_info, sizeof ahd_info); + printf("%s: %s\n", ahd->sc_dev.dv_xname, ahd_info); + } + + ahd_intr_enable(ahd, TRUE); + + if (ahd->flags & AHD_RESET_BUS_A) + ahd_reset_channel(ahd, 'A', TRUE); + /* * fill in the prototype scsi_links. */ @@ -110,16 +120,6 @@ ahd_attach(struct ahd_softc *ahd) ahd->sc_channel.openings = 16; /* Must ALWAYS be < 256!! */ ahd->sc_channel.pool = &ahd->sc_iopool; - if (bootverbose) { - ahd_controller_info(ahd, ahd_info, sizeof ahd_info); - printf("%s: %s\n", ahd->sc_dev.dv_xname, ahd_info); - } - - ahd_intr_enable(ahd, TRUE); - - if (ahd->flags & AHD_RESET_BUS_A) - ahd_reset_channel(ahd, 'A', TRUE); - saa.saa_sc_link = &ahd->sc_channel; ahd->sc_child = config_found((void *)&ahd->sc_dev, &saa, scsiprint); |