Move the pcic interrupt from pcic.c to pcic_isa.c. The ISA handling

for card change interrupts is different than the pci stuff that's
coming soon.  Set the management irq in different ways.  If
pci_parallel interrutp routing, then use the PCI way of getting
interrupts.  Move polling mode into pcic_isa since when we're routing
via pci polling doesn't work because many bridges (systems hang solid).

If we're routing interrupts via pci, they can be shared, so flag them
as such.

Note, this doesn't actually change anything since the pci attachment
isn't quite ready to be committed.

1 files changed, 3 insertions, 1 deletions

diff --git a/sys/pccard/pcicvar.h b/sys/pccard/pcicvar.h
index b853a57..9ffabe4 100644
--- a/sys/pccard/pcicvar.h
+++ b/sys/pccard/pcicvar.h
@@ -35,7 +35,6 @@ struct pcic_slot {
 	struct pcic_softc *sc;		/* Back pointer to softc */
 	u_char (*getb)(struct pcic_slot *, int);
 	void   (*putb)(struct pcic_slot *, int, u_char);
-	void   (*intrack)(struct pcic_slot *);
 	bus_space_tag_t bst;
 	bus_space_handle_t bsh;
 };
@@ -61,11 +60,14 @@ struct pcic_softc
 	int			irqrid;	/* Irq rid */
 	struct resource		*irqres;/* Irq resource */
 	void			*ih;	/* Our interrupt handler. */
+	int			irq;
 	device_t		dev;	/* Our device */
 	bus_space_tag_t		bst;	/* Bus tag for our regs */
 	bus_space_handle_t	bsh;	/* Bus handle for our regs */
+	void (*slot_poll)(void *);
 	struct callout_handle	timeout_ch;
 	struct pcic_slot	slots[PCIC_MAX_SLOTS];
+	int			cd_pending;
 };
 
 extern devclass_t	pcic_devclass;