From owner-svn-src-all@FreeBSD.ORG  Thu Feb 18 19:41:38 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AFDDF1065672;
	Thu, 18 Feb 2010 19:41:38 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9FEBC8FC08;
	Thu, 18 Feb 2010 19:41:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1IJfc74059689;
	Thu, 18 Feb 2010 19:41:38 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1IJfcKN059687;
	Thu, 18 Feb 2010 19:41:38 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201002181941.o1IJfcKN059687@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 18 Feb 2010 19:41:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204056 - head/sys/mips/alchemy
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Feb 2010 19:41:38 -0000

Author: imp
Date: Thu Feb 18 19:41:38 2010
New Revision: 204056
URL: http://svn.freebsd.org/changeset/base/204056

Log:
  Hack to make ALCHEMY compile again...

Modified:
  head/sys/mips/alchemy/obio.c

Modified: head/sys/mips/alchemy/obio.c
==============================================================================
--- head/sys/mips/alchemy/obio.c	Thu Feb 18 19:27:00 2010	(r204055)
+++ head/sys/mips/alchemy/obio.c	Thu Feb 18 19:41:38 2010	(r204056)
@@ -120,6 +120,40 @@ 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(void *arg)
+{
+  /* XXX need to write */
+#if 0
+	unsigned int irq = (unsigned int)arg;
+	int ip_bit, mask, mask_register;
+
+	/* mask IRQ */
+	mask_register = ICU_IRQ_MASK_REG(irq);
+	ip_bit = ICU_IP_BIT(irq);
+
+	mask = ICU_REG_READ(mask_register);
+	ICU_REG_WRITE(mask_register, mask | ip_bit);
+#endif
+}
+
+static void 
+obio_unmask_irq(void *arg)
+{
+  /* XXX need to write */
+#if 0
+	unsigned int irq = (unsigned int)arg;
+	int ip_bit, mask, mask_register;
+
+	/* unmask IRQ */
+	mask_register = ICU_IRQ_MASK_REG(irq);
+	ip_bit = ICU_IP_BIT(irq);
+
+	mask = ICU_REG_READ(mask_register);
+	ICU_REG_WRITE(mask_register, mask & ~ip_bit);
+#endif
+}
+
 static int
 obio_probe(device_t dev)
 {
@@ -320,9 +354,10 @@ 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)mips_mask_irq, (mask_fn)mips_unmask_irq,
-		    NULL, NULL, "obio intr%d:", irq);
+		error = intr_event_create(&event, (void *)irq, 0, irq, 
+		    obio_mask_irq, obio_unmask_irq,
+		    NULL, NULL,
+		    "obio intr%d:", irq);
 
 		sc->sc_eventstab[irq] = event;
 	}