From a346fb8d85916361007f8bbf2dc9e561aa9e8969 Mon Sep 17 00:00:00 2001 From: gibbs Date: Tue, 25 Feb 1997 03:06:19 +0000 Subject: [PATCH] Make it clearer how the termination settings from the PCI probe are used by the ahc_init routine. --- sys/pci/aic7870.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/pci/aic7870.c b/sys/pci/aic7870.c index 74240b50f03d..ffddb52263db 100644 --- a/sys/pci/aic7870.c +++ b/sys/pci/aic7870.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: aic7870.c,v 1.50 1997/02/22 09:43:59 peter Exp $ */ #if defined(__FreeBSD__) @@ -637,19 +637,19 @@ ahc_pci_attach(parent, self, aux) printf("%s: %s", ahc_name(ahc), id_string); } + /* + * Put our termination setting into sxfrctl1 now so that the + * generic initialization can see it. + */ + sxfrctl1 |= ahc_inb(ahc, SXFRCTL1); + ahc_outb(ahc, SXFRCTL1, sxfrctl1); + if (ahc_init(ahc)){ ahc_free(ahc); splx(opri); return; /* XXX PCI code should take return status */ } - /* - * Put our termination setting into sxfrctl1 now that the - * generic initialization is complete. - */ - sxfrctl1 |= ahc_inb(ahc, SXFRCTL1); - ahc_outb(ahc, SXFRCTL1, sxfrctl1); - if ((ahc->type & AHC_398) == AHC_398) { /* Only set this once we've successfully probed */ if (shared_scb_data == NULL)