From owner-svn-src-projects@FreeBSD.ORG  Wed Dec 24 15:44:24 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A34BC6FB;
 Wed, 24 Dec 2014 15:44:24 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8F6DD646AE;
 Wed, 24 Dec 2014 15:44:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBOFiOio096322;
 Wed, 24 Dec 2014 15:44:24 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBOFiOjm096320;
 Wed, 24 Dec 2014 15:44:24 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201412241544.sBOFiOjm096320@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Wed, 24 Dec 2014 15:44:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r276184 - projects/arm_intrng/sys/arm/arm
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Dec 2014 15:44:24 -0000

Author: andrew
Date: Wed Dec 24 15:44:23 2014
New Revision: 276184
URL: https://svnweb.freebsd.org/changeset/base/276184

Log:
  Attempt to get this working when intrng is disabled

Modified:
  projects/arm_intrng/sys/arm/arm/gic.c

Modified: projects/arm_intrng/sys/arm/arm/gic.c
==============================================================================
--- projects/arm_intrng/sys/arm/arm/gic.c	Wed Dec 24 15:32:23 2014	(r276183)
+++ projects/arm_intrng/sys/arm/arm/gic.c	Wed Dec 24 15:44:23 2014	(r276184)
@@ -55,7 +55,9 @@ __FBSDID("$FreeBSD$");
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
+#ifdef ARM_INTRNG
 #include "pic_if.h"
+#endif
 
 /* We are using GICv2 register naming */
 
@@ -479,11 +481,28 @@ arm_gic_ipi_clear(device_t dev, int ipi)
 	/* no-op */
 }
 
+#ifndef ARM_INTRNG
+int
+pic_ipi_read(int i)
+{
+
+	return (arm_gic_pid_ipi_read(arm_gic_sc->gic_dev, i);
+}
+
+void
+pic_ipi_clear(int ipi)
+{
+
+	return arm_gic_ipi_clear(arm_gic_sc->gic_dev, ipi);
+}
+#endif
+
 static device_method_t arm_gic_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		arm_gic_probe),
 	DEVMETHOD(device_attach,	arm_gic_attach),
 
+#ifdef ARM_INTRNG
 	/* Interrupt controller interface */
 	DEVMETHOD(pic_config,		arm_gic_config),
 	DEVMETHOD(pic_mask,		arm_gic_mask),
@@ -493,6 +512,8 @@ static device_method_t arm_gic_methods[]
 	DEVMETHOD(pic_ipi_send,		arm_gic_ipi_send),
 	DEVMETHOD(pic_ipi_clear,	arm_gic_ipi_clear),
 	DEVMETHOD(pic_ipi_read,		arm_gic_ipi_read),
+#endif
+
 	{ 0, 0 }
 };