Pull the thorpej-bus-dma branch into the mainline.

This commit is contained in:
thorpej 1997-06-07 01:35:07 +00:00
parent 239ce2aa34
commit 6d9b3bc058

View File

@ -1,4 +1,4 @@
/* $NetBSD: bha_pci.c,v 1.12 1997/04/13 20:14:22 cgd Exp $ */
/* $NetBSD: bha_pci.c,v 1.13 1997/06/07 01:35:07 thorpej Exp $ */
/*
* Copyright (c) 1994, 1996, 1997 Charles M. Hannum. All rights reserved.
@ -133,9 +133,12 @@ bha_pci_attach(parent, self, aux)
sc->sc_iot = iot;
sc->sc_ioh = ioh;
sc->sc_dmat = pa->pa_dmat;
if (!bha_find(iot, ioh, &bpd))
panic("bha_pci_attach: bha_find failed");
sc->sc_dmaflags = 0;
csr = pci_conf_read(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG,
csr | PCI_COMMAND_MASTER_ENABLE | PCI_COMMAND_IO_ENABLE);