From owner-svn-src-all@FreeBSD.ORG  Sun Aug 26 10:40:14 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 81781106564A;
	Sun, 26 Aug 2012 10:40:14 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6C6F38FC0C;
	Sun, 26 Aug 2012 10:40:14 +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 q7QAeEup008489;
	Sun, 26 Aug 2012 10:40:14 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7QAeERP008487;
	Sun, 26 Aug 2012 10:40:14 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201208261040.q7QAeERP008487@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sun, 26 Aug 2012 10:40:14 +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: r239713 - head/sys/mips/conf
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: Sun, 26 Aug 2012 10:40:14 -0000

Author: rwatson
Date: Sun Aug 26 10:40:13 2012
New Revision: 239713
URL: http://svn.freebsd.org/changeset/base/239713

Log:
  Expose DE4 buttons and switches via a de4bsw device, implemented using
  altera_avgen(4).
  
  Fix white space nit that must have arisen during the merge from Perforce.
  
  Submitted by:	brooks
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/mips/conf/BERI_DE4.hints

Modified: head/sys/mips/conf/BERI_DE4.hints
==============================================================================
--- head/sys/mips/conf/BERI_DE4.hints	Sun Aug 26 10:38:02 2012	(r239712)
+++ head/sys/mips/conf/BERI_DE4.hints	Sun Aug 26 10:40:13 2012	(r239713)
@@ -66,6 +66,16 @@ hint.altera_avgen.0.devname="berirom"
 #hint.altera_avgen.0.devname="de4flash"
 
 #
+# Expose the DE4 buttons and switches via an Avalon "generic" device.
+# 
+hint.altera_avgen.0.at="nexus0"
+hint.altera_avgen.0.maddr=0x7f009000
+hint.altera_avgen.0.msize=2
+hint.altera_avgen.0.width=1
+hint.altera_avgen.0.fileio="r"
+hint.altera_avgen.0.devname="de4bsw"
+
+#
 # General Intel StrataFlash driver
 #
 hint.isf.0.at="nexus0"
@@ -73,7 +83,7 @@ hint.isf.0.maddr=0x74000000
 hint.isf.0.msize=0x2000000
 hint.isf.1.at="nexus0"
 hint.isf.1.maddr=0x76000000
-hint.isf.1.msize=0x2000000  
+hint.isf.1.msize=0x2000000
 
 # Reserved configuration blocks.  Don't touch.
 hint.map.0.at="isf0"