Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Call pci_1000a_pickintr() like on other platforms, but for 1000a expand 

the iot, memt, and pc in the call so that pci_1000a_pickintr() (and the
other routines in that module) do not need to be aware of the core logic
type just to pass down memory and I/O space tags or to call the decompose
function.
This commit is contained in:
ross 1998-06-24 01:32:06 +00:00
parent 92aafa4a46
commit 49d5ae18ba
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/arch/alpha/pci/apecs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: apecs.c,v 1.32 1998/06/06 01:33:23 thorpej Exp $ */
/* $NetBSD: apecs.c,v 1.33 1998/06/24 01:32:06 ross Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: apecs.c,v 1.32 1998/06/06 01:33:23 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: apecs.c,v 1.33 1998/06/24 01:32:06 ross Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -57,6 +57,9 @@ __KERNEL_RCSID(0, "$NetBSD: apecs.c,v 1.32 1998/06/06 01:33:23 thorpej Exp $");
#ifdef DEC_EB64PLUS
#include <alpha/pci/pci_eb64plus.h>
#endif
#ifdef DEC_1000A
#include <alpha/pci/pci_1000a.h>
#endif
int apecsmatch __P((struct device *, struct cfdata *, void *));
void apecsattach __P((struct device *, struct device *, void *));
@ -166,6 +169,13 @@ apecsattach(parent, self, aux)
break;
#endif
#ifdef DEC_1000A
case ST_DEC_1000A:
pci_1000a_pickintr(acp, &acp->ac_iot, &acp->ac_memt,
&acp->ac_pc);
break;
#endif
default:
panic("apecsattach: shouldn't be here, really...");
}

18
sys/arch/alpha/pci/cia.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cia.c,v 1.43 1998/06/06 01:33:44 thorpej Exp $ */
/* $NetBSD: cia.c,v 1.44 1998/06/24 01:32:06 ross Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -67,10 +67,11 @@
#include "opt_dec_eb164.h"
#include "opt_dec_kn20aa.h"
#include "opt_dec_550.h"
#include "opt_dec_1000a.h"
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.43 1998/06/06 01:33:44 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.44 1998/06/24 01:32:06 ross Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -98,6 +99,9 @@ __KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.43 1998/06/06 01:33:44 thorpej Exp $");
#ifdef DEC_550
#include <alpha/pci/pci_550.h>
#endif
#ifdef DEC_1000A
#include <alpha/pci/pci_1000a.h>
#endif
int ciamatch __P((struct device *, struct cfdata *, void *));
void ciaattach __P((struct device *, struct device *, void *));
@ -329,6 +333,16 @@ ciaattach(parent, self, aux)
break;
#endif
#ifdef DEC_1000A
case ST_DEC_1000A:
pci_1000a_pickintr(ccp, &ccp->cc_iot, &ccp->cc_memt,
&ccp->cc_pc);
#ifdef EVCNT_COUNTERS
evcnt_attach(self, "intr", &dec_1000a_intr_evcnt);
#endif
break;
#endif
default:
panic("ciaattach: shouldn't be here, really...");
}