diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 2001-02-16 08:23:40 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 2001-02-16 08:23:40 +0000 |
| commit | d1b231021b924977ea6cd98be4022502e94fafd4 (patch) | |
| tree | 2eeb0536f4a5ff9b141badf862dee842a15f430c /sys/arch/alpha/pci/apecs_pci.c | |
| parent | 3be51d33837be456a5d4f393ba3fa4a60c33eaa4 (diff) | |
Bring apecs closer to current netbsd work (updated copyrights, plus
a few bug fixes I missed earlier).
Diffstat (limited to 'sys/arch/alpha/pci/apecs_pci.c')
| -rw-r--r-- | sys/arch/alpha/pci/apecs_pci.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/arch/alpha/pci/apecs_pci.c b/sys/arch/alpha/pci/apecs_pci.c index 6fd68da1cdd..c181d34d6fa 100644 --- a/sys/arch/alpha/pci/apecs_pci.c +++ b/sys/arch/alpha/pci/apecs_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apecs_pci.c,v 1.6 1997/01/24 19:57:34 niklas Exp $ */ +/* $OpenBSD: apecs_pci.c,v 1.7 2001/02/16 08:23:39 jason Exp $ */ /* $NetBSD: apecs_pci.c,v 1.10 1996/11/13 21:13:25 cgd Exp $ */ /* @@ -32,6 +32,7 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/device.h> + #include <vm/vm.h> #include <machine/autoconf.h> /* badaddr() proto */ @@ -116,13 +117,11 @@ apecs_conf_read(cpv, tag, offset) int s, secondary, ba; int32_t old_haxr2; /* XXX */ -#ifdef DIAGNOSTIC s = 0; /* XXX gcc -Wuninitialized */ old_haxr2 = 0; /* XXX gcc -Wuninitialized */ -#endif /* secondary if bus # != 0 */ - pci_decompose_tag(&acp->ac_pc, tag, &secondary, 0, 0); + alpha_pci_decompose_tag(&acp->ac_pc, tag, &secondary, 0, 0); if (secondary) { s = splhigh(); old_haxr2 = REGVAL(EPIC_HAXR2); @@ -167,13 +166,11 @@ apecs_conf_write(cpv, tag, offset, data) int s, secondary; int32_t old_haxr2; /* XXX */ -#ifdef DIAGNOSTIC s = 0; /* XXX gcc -Wuninitialized */ old_haxr2 = 0; /* XXX gcc -Wuninitialized */ -#endif /* secondary if bus # != 0 */ - pci_decompose_tag(&acp->ac_pc, tag, &secondary, 0, 0); + alpha_pci_decompose_tag(&acp->ac_pc, tag, &secondary, 0, 0); if (secondary) { s = splhigh(); old_haxr2 = REGVAL(EPIC_HAXR2); @@ -187,7 +184,11 @@ apecs_conf_write(cpv, tag, offset, data) (offset & ~0x03) << 5 | /* XXX */ 0 << 5 | /* XXX */ 0x3 << 3); /* XXX */ + + alpha_mb(); *datap = data; + alpha_mb(); + alpha_mb(); if (secondary) { alpha_mb(); |