d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move pcic_override_irq from pcic_isa, to pcic.

Browse Source
This commit is contained in:
Warner Losh 2001-07-31 06:32:02 +00:00
parent 9f3112df2d
commit 4ee0b26518
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/pccard/pcic.c
View File

@ -81,6 +81,13 @@ static struct slot_ctrl pcic_cinfo = {
/* sysctl vars */
SYSCTL_NODE(_hw, OID_AUTO, pcic, CTLFLAG_RD, 0, "PCIC parameters");
int pcic_override_irq = 0;
TUNABLE_INT("machdep.pccard.pcic_irq", &pcic_override_irq);
TUNABLE_INT("hw.pcic.irq", &pcic_override_irq);
SYSCTL_INT(_hw_pcic, OID_AUTO, override_irq, CTLFLAG_RD,
&pcic_override_irq, 0,
"Override the IRQ configured by the config system for all pcic devices");
/*
* Read a register from the PCIC.
*/

9
sys/pccard/pcic_isa.c
View File

@ -79,15 +79,6 @@ static driver_intr_t pcicintr;
static int pcicintr1(void *);
static timeout_t pcictimeout;
static int pcic_override_irq = 0;
TUNABLE_INT("machdep.pccard.pcic_irq", &pcic_override_irq);
TUNABLE_INT("hw.pcic.irq", &pcic_override_irq);
SYSCTL_DECL(_hw_pcic);
SYSCTL_INT(_hw_pcic, OID_AUTO, override_irq, CTLFLAG_RD,
&pcic_override_irq, 0,
"Override the IRQ configured by the config system for all pcic devices");
/*
* Look for an Intel PCIC (or compatible).
* For each available slot, allocate a PC-CARD slot.

1
sys/pccard/pcicvar.h
View File

@ -73,6 +73,7 @@ struct pcic_softc
};
extern devclass_t pcic_devclass;
extern int pcic_override_irq;
int pcic_activate_resource(device_t dev, device_t child, int type, int rid,
struct resource *r);