diff options
| author | Justin T. Gibbs <gibbs@FreeBSD.org> | 1997-02-25 03:06:19 +0000 |
|---|---|---|
| committer | Justin T. Gibbs <gibbs@FreeBSD.org> | 1997-02-25 03:06:19 +0000 |
| commit | 3aaa276222c8e693ce98c4f777990e18c18d1934 (patch) | |
| tree | 6ddb5c7bc8fc22c6b660eb7aa2a0e90202b276d2 /sys/pci/aic7870.c | |
| parent | 5a02006d3ef5da52f3a6298408a947ed58f029c2 (diff) | |
| download | src-3aaa276222c8e693ce98c4f777990e18c18d1934.tar.gz src-3aaa276222c8e693ce98c4f777990e18c18d1934.zip | |
Make it clearer how the termination settings from the PCI probe are used by
the ahc_init routine.
Notes
Notes:
svn path=/head/; revision=23100
Diffstat (limited to 'sys/pci/aic7870.c')
| -rw-r--r-- | sys/pci/aic7870.c | 16 |
1 files 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) |