diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-12-08 00:21:01 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-12-08 00:21:01 +0000 |
| commit | a92da5c62c369c891657c866ae655e835e619b1b (patch) | |
| tree | dc969867b8b6715fb4be99f7ce144cfaec2f5d7c /sys/arch/alpha/pci/pci_machdep.c | |
| parent | a67276bead2aa835bc93c17180c2109635ba693c (diff) | |
Merge to NetBSD 961107, i.e. mostly new bus.h
Diffstat (limited to 'sys/arch/alpha/pci/pci_machdep.c')
| -rw-r--r-- | sys/arch/alpha/pci/pci_machdep.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/arch/alpha/pci/pci_machdep.c b/sys/arch/alpha/pci/pci_machdep.c index 7e6573e0fbb..128fcc2676e 100644 --- a/sys/arch/alpha/pci/pci_machdep.c +++ b/sys/arch/alpha/pci/pci_machdep.c @@ -1,5 +1,5 @@ -/* $OpenBSD: pci_machdep.c,v 1.5 1996/10/30 22:40:08 niklas Exp $ */ -/* $NetBSD: pci_machdep.c,v 1.5 1996/04/12 06:08:49 cgd Exp $ */ +/* $OpenBSD: pci_machdep.c,v 1.6 1996/12/08 00:20:42 niklas Exp $ */ +/* $NetBSD: pci_machdep.c,v 1.6 1996/10/23 04:12:29 cgd Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -56,15 +56,16 @@ #endif void -pci_display_console(bc, pc, bus, device, function) - bus_chipset_tag_t bc; +pci_display_console(iot, memt, pc, bus, device, function) + bus_space_tag_t iot, memt; pci_chipset_tag_t pc; int bus, device, function; { pcitag_t tag; pcireg_t id, class; int match, nmatch; - void (*fn) __P((bus_chipset_tag_t, pci_chipset_tag_t, int, int, int)); + void (*fn) __P((bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t, + int, int, int)); tag = pci_make_tag(pc, bus, device, function); id = pci_conf_read(pc, tag, PCI_ID_REG); @@ -92,7 +93,7 @@ pci_display_console(bc, pc, bus, device, function) #endif if (fn != NULL) - (*fn)(bc, pc, bus, device, function); + (*fn)(iot, memt, pc, bus, device, function); else panic("pci_display_console: unconfigured device at %d/%d/%d", bus, device, function); |