Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 14 Jun 2009 21:16:04 +0000 (UTC)
From:      Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r194215 - projects/mips/sys/mips/idt
Message-ID:  <200906142116.n5ELG4uT060655@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gonzo
Date: Sun Jun 14 21:16:04 2009
New Revision: 194215
URL: http://svn.freebsd.org/changeset/base/194215

Log:
  - Get rid of mask_fn and fix pre_filter/post_filter functions' prototypes

Modified:
  projects/mips/sys/mips/idt/obio.c

Modified: projects/mips/sys/mips/idt/obio.c
==============================================================================
--- projects/mips/sys/mips/idt/obio.c	Sun Jun 14 21:11:39 2009	(r194214)
+++ projects/mips/sys/mips/idt/obio.c	Sun Jun 14 21:16:04 2009	(r194215)
@@ -76,8 +76,10 @@ static int	obio_setup_intr(device_t, dev
 static int	obio_teardown_intr(device_t, device_t, struct resource *,
 		    void *);
 
-static void obio_mask_irq(unsigned int irq)
+static void 
+obio_mask_irq(void *arg)
 {
+	unsigned int irq = (unsigned int)arg;
 	int ip_bit, mask, mask_register;
 
 	/* mask IRQ */
@@ -88,8 +90,10 @@ static void obio_mask_irq(unsigned int i
 	ICU_REG_WRITE(mask_register, mask | ip_bit);
 }
 
-static void obio_unmask_irq(unsigned int irq)
+static void 
+obio_unmask_irq(void *arg)
 {
+	unsigned int irq = (unsigned int)arg;
 	int ip_bit, mask, mask_register;
 
 	/* unmask IRQ */
@@ -274,7 +278,7 @@ obio_setup_intr(device_t dev, device_t c
 	event = sc->sc_eventstab[irq];
 	if (event == NULL) {
 		error = intr_event_create(&event, (void *)irq, 0, irq, 
-		    (mask_fn)obio_mask_irq, (mask_fn)obio_unmask_irq,
+		    obio_mask_irq, obio_unmask_irq,
 		    NULL, NULL,
 		    "obio intr%d:", irq);
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906142116.n5ELG4uT060655>