diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2005-07-02 21:51:06 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2005-07-02 21:51:06 +0000 |
| commit | eb8f274932c791388bd6f5c932cfd5384a8c2420 (patch) | |
| tree | 64ab8feccc156a7f3b1b847df398cf1faf30e4c7 | |
| parent | 13d52c778b24fa183902150bd442991303750bf2 (diff) | |
de-static and we don't need to enable bus mastering here
| -rw-r--r-- | sys/dev/pci/if_epic_pci.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/sys/dev/pci/if_epic_pci.c b/sys/dev/pci/if_epic_pci.c index 6ae9bf29ebc..9c4ce9082fd 100644 --- a/sys/dev/pci/if_epic_pci.c +++ b/sys/dev/pci/if_epic_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_epic_pci.c,v 1.2 2005/05/10 02:37:46 brad Exp $ */ +/* $OpenBSD: if_epic_pci.c,v 1.3 2005/07/02 21:51:05 brad Exp $ */ /* $NetBSD: if_epic_pci.c,v 1.28 2005/02/27 00:27:32 perry Exp $ */ /*- @@ -97,8 +97,8 @@ struct epic_pci_softc { void *sc_ih; /* interrupt handle */ }; -static int epic_pci_match(struct device *, void *, void *); -static void epic_pci_attach(struct device *, struct device *, void *); +int epic_pci_match(struct device *, void *, void *); +void epic_pci_attach(struct device *, struct device *, void *); struct cfattach epic_pci_ca = { sizeof(struct epic_pci_softc), epic_pci_match, epic_pci_attach @@ -139,14 +139,14 @@ epic_pci_subsys_lookup(const struct pci_attach_args *pa) return (NULL); } -static int +int epic_pci_match(struct device *parent, void *match, void *aux) { return (pci_matchbyid((struct pci_attach_args *)aux, epic_pci_devices, sizeof(epic_pci_devices)/sizeof(epic_pci_devices[0]))); } -static void +void epic_pci_attach(struct device *parent, struct device *self, void *aux) { struct epic_pci_softc *psc = (struct epic_pci_softc *)self; @@ -211,11 +211,6 @@ epic_pci_attach(struct device *parent, struct device *self, void *aux) sc->sc_dmat = pa->pa_dmat; - /* Make sure bus mastering is enabled. */ - pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, - pci_conf_read(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG) | - PCI_COMMAND_MASTER_ENABLE); - /* * Map and establish our interrupt. */ |