From owner-svn-src-user@FreeBSD.ORG  Sun Aug 19 20:24:47 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 348E6106564A;
	Sun, 19 Aug 2012 20:24:46 +0000 (UTC)
	(envelope-from jceel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D99AC8FC08;
	Sun, 19 Aug 2012 20:24:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7JKOk97031713;
	Sun, 19 Aug 2012 20:24:46 GMT (envelope-from jceel@svn.freebsd.org)
Received: (from jceel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7JKOk4i031711;
	Sun, 19 Aug 2012 20:24:46 GMT (envelope-from jceel@svn.freebsd.org)
Message-Id: <201208192024.q7JKOk4i031711@svn.freebsd.org>
From: Jakub Wojciech Klama <jceel@FreeBSD.org>
Date: Sun, 19 Aug 2012 20:24:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239403 - user/jceel/soc2012_armv6/sys/arm/lpc
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Aug 2012 20:24:47 -0000

Author: jceel
Date: Sun Aug 19 20:24:46 2012
New Revision: 239403
URL: http://svn.freebsd.org/changeset/base/239403

Log:
  Fix lpc_intc trapframe passing to reflect changes in INTRNG API.

Modified:
  user/jceel/soc2012_armv6/sys/arm/lpc/lpc_intc.c

Modified: user/jceel/soc2012_armv6/sys/arm/lpc/lpc_intc.c
==============================================================================
--- user/jceel/soc2012_armv6/sys/arm/lpc/lpc_intc.c	Sun Aug 19 19:44:13 2012	(r239402)
+++ user/jceel/soc2012_armv6/sys/arm/lpc/lpc_intc.c	Sun Aug 19 20:24:46 2012	(r239403)
@@ -124,15 +124,14 @@ lpc_intc_attach(device_t dev)
 static int
 lpc_intc_intr(void *arg)
 {
-	struct arm_intr_data *id = (struct arm_intr_data *)arg;
-	struct lpc_intc_softc *sc = (struct lpc_intc_softc *)id->arg;
+	struct lpc_intc_softc *sc = (struct lpc_intc_softc *)arg;
 	uint32_t value;
 	int i;
 
 	value = intc_read_4(sc, LPC_INTC_SR);
 	for (i = 0; i < 32; i++) {
 		if (value & (1 << i))
-			arm_dispatch_irq(sc->li_dev, id->tf, i);
+			arm_dispatch_irq(sc->li_dev, NULL, i);
 	}
 
 	return (FILTER_HANDLED);