Update the PCIC controller's imask with individual slot IRQ's.

Assuming that the intr_mask[] was updated by changing the maskptrs (the
existing update_intr_masks() function will not work) this code was
written so the PCIC controller insertion/removal events will not
interrupt the card IRQ handler events.

Some possible scenarios:
+ Card is removed during IRQ handler:

  - PCIC card handler is allowed to interrupt
  - card removal event is called, removing the driver and data structures
  * card interrupt handler continues w/out driver, data structures, and hardware

OR (the code just committed)

  * card IRQ handler has no hardware to read/write to, but has code and
    data to run on (XXX- Assume it completes and doesn't spin forever)
  - PCIC card handler unloads the card driver

The current situation at least leaves the card interrupt handlers the
drivers and data structures to work with although the hardware can't be
guaranteed.

Reviewed by:	bde

1 files changed, 2 insertions, 1 deletions

diff --git a/sys/pccard/slot.h b/sys/pccard/slot.h
index e0f5fa3..c58147c 100644
--- a/sys/pccard/slot.h
+++ b/sys/pccard/slot.h
@@ -58,11 +58,12 @@ struct slot_ctrl {
 	int	maxmem;		/* Number of allowed memory windows */
 	int	maxio;		/* Number of allowed I/O windows */
 	int	irqs;		/* IRQ's that are allowed */
+	u_int	*imask;		/* IRQ mask for the PCIC controller */
 	char	*name;		/* controller name */
+
 	/*
 	 *	The rest is maintained by the mainline PC-CARD code.
 	 */
-
 	struct slot_ctrl *next;	/* Allows linked list of controllers */
 	int	slots;		/* Slots available */
 };