diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1997-07-30 11:12:29 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1997-07-30 11:12:29 +0000 |
| commit | ebf09a5432e7b2f7330349a287ea06557130d024 (patch) | |
| tree | 4b31be4473c64d35c413d75be8765ad785c33e53 /sys/dev/pci | |
| parent | 4c8a97d907a4ec836ce801ead5d8529e1699b553 (diff) | |
Sync to NetBSD. Adapt to use bus_space_multi_raw* interface of OpenBSD.
Some KNF too.
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/if_ep_pci.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/sys/dev/pci/if_ep_pci.c b/sys/dev/pci/if_ep_pci.c index 6a205592233..6fec8862f49 100644 --- a/sys/dev/pci/if_ep_pci.c +++ b/sys/dev/pci/if_ep_pci.c @@ -123,7 +123,6 @@ ep_pci_attach(parent, self, aux) bus_addr_t iobase; bus_size_t iosize; pci_intr_handle_t ih; - u_short conn = 0; pcireg_t i; char *model; const char *intrstr = NULL; @@ -143,17 +142,6 @@ ep_pci_attach(parent, self, aux) i = pci_conf_read(pc, pa->pa_tag, PCI_CONN); - /* - * Bits 13,12,9 of the isa adapter are the same as bits - * 5,4,3 of the pci adapter - */ - if (i & IS_PCI_AUI) - conn |= IS_AUI; - if (i & IS_PCI_BNC) - conn |= IS_BNC; - if (i & IS_PCI_UTP) - conn |= IS_UTP; - GO_WINDOW(0); switch (PCI_PRODUCT(pa->pa_id)) { @@ -180,7 +168,7 @@ ep_pci_attach(parent, self, aux) printf(": <%s> ", model); - epconfig(sc, conn); + epconfig(sc, EP_CHIPSET_VORTEX); /* Enable the card. */ pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, |