Make it clearer how the termination settings from the PCI probe are used by
the ahc_init routine.
This commit is contained in:
parent
7308147c06
commit
a346fb8d85
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user