Changed the type of an isa/general interrupt handler to take a

`void *' arg.  Fixed or hid most of the resulting type mismatches.
Handlers can now be updated locally (except for reworking their
global declarations in isa_device.h).

2 files changed, 7 insertions, 7 deletions

diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c
index 58c8247..7ce11de 100644
--- a/sys/pccard/pccard.c
+++ b/sys/pccard/pccard.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pccard.c,v 1.60 1998/05/05 13:21:08 kato Exp $
+ *	$Id: pccard.c,v 1.61 1998/06/07 17:12:34 dfr Exp $
  */
 
 #include "opt_devfs.h"
@@ -94,7 +94,7 @@ static void		disable_slot(struct slot *);
 static int		invalid_io_memory(unsigned long, int);
 static struct pccard_device *find_driver(char *);
 static void		remove_device(struct pccard_devinfo *);
-static void		slot_irq_handler(int);
+static inthand2_t	slot_irq_handler;
 static void		power_off_slot(void *);
 
 #if	NAPM > 0
@@ -708,7 +708,7 @@ pccard_event(struct slot *slt, enum card_event event)
  *	slot_irq_handler - Interrupt handler for shared irq devices.
  */
 static void
-slot_irq_handler(int arg)
+slot_irq_handler(void *arg)
 {
 	struct pccard_devinfo *devi;
 	struct slot *slt = (struct slot *)arg;
diff --git a/sys/pccard/pcic.c b/sys/pccard/pcic.c
index 584a375..ff02b78 100644
--- a/sys/pccard/pcic.c
+++ b/sys/pccard/pcic.c
@@ -56,7 +56,7 @@
 /*
  *	Prototypes for interrupt handler.
  */
-static void		pcicintr	__P((int unit));
+static inthand2_t	pcicintr;
 static int		pcic_ioctl __P((struct slot *, int, caddr_t));
 static int		pcic_power __P((struct slot *));
 static timeout_t 	pcic_reset;
@@ -284,7 +284,7 @@ pcic_dump_attributes(unsigned char *scratch, int maxlen)
 #endif
 
 static void
-nullfunc(int unit)
+nullfunc(void *unused)
 {
 	/* empty */
 }
@@ -1058,7 +1058,7 @@ pcic_disable(struct slot *slt)
 static void
 pcictimeout(void *chan)
 {
-	pcicintr(0);
+	pcicintr(NULL);
 	pcictimeout_ch = timeout(pcictimeout, 0, hz/2);
 }
 
@@ -1069,7 +1069,7 @@ pcictimeout(void *chan)
  *	on this card, so send an event to the main code.
  */
 static void
-pcicintr(int unit)
+pcicintr(void *unused)
 {
 	int	slot, s;
 	unsigned char chg;