From owner-svn-src-user@FreeBSD.ORG  Sat Feb 27 03:33:32 2010
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 21A55106566C;
	Sat, 27 Feb 2010 03:33:32 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 114978FC2E;
	Sat, 27 Feb 2010 03:33:32 +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 o1R3XVEI039723;
	Sat, 27 Feb 2010 03:33:31 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1R3XVJb039720;
	Sat, 27 Feb 2010 03:33:31 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201002270333.o1R3XVJb039720@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Sat, 27 Feb 2010 03:33:31 +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: r204389 - in user/jmallett/octeon/sys/mips: include mips
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: Sat, 27 Feb 2010 03:33:32 -0000

Author: jmallett
Date: Sat Feb 27 03:33:31 2010
New Revision: 204389
URL: http://svn.freebsd.org/changeset/base/204389

Log:
  Check for __mips_n32, not ISA_MIPS32, on Octeon to tell whether we have
  longer-than-pointer bus addresses.  It's the ABI that matters (or at least
  it's more like the ABI than the ISA that matters.)

Modified:
  user/jmallett/octeon/sys/mips/include/_bus.h
  user/jmallett/octeon/sys/mips/mips/bus_space_generic.c

Modified: user/jmallett/octeon/sys/mips/include/_bus.h
==============================================================================
--- user/jmallett/octeon/sys/mips/include/_bus.h	Sat Feb 27 03:30:48 2010	(r204388)
+++ user/jmallett/octeon/sys/mips/include/_bus.h	Sat Feb 27 03:33:31 2010	(r204389)
@@ -35,10 +35,10 @@
  * Bus address and size types
  */
 #include "opt_cputype.h" 
-#if !(defined(TARGET_OCTEON) && defined(ISA_MIPS32))
-typedef uintptr_t bus_addr_t;
-#else
+#if defined(TARGET_OCTEON) && defined(__mips_n32)
 typedef uint64_t bus_addr_t;
+#else
+typedef uintptr_t bus_addr_t;
 #endif
 typedef uintptr_t bus_size_t;
 

Modified: user/jmallett/octeon/sys/mips/mips/bus_space_generic.c
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/bus_space_generic.c	Sat Feb 27 03:30:48 2010	(r204388)
+++ user/jmallett/octeon/sys/mips/mips/bus_space_generic.c	Sat Feb 27 03:33:31 2010	(r204389)
@@ -198,7 +198,7 @@ static struct bus_space generic_space = 
 
 /* Ultra-gross kludge */
 #include "opt_cputype.h"
-#if defined(TARGET_OCTEON) && defined(ISA_MIPS32)
+#if defined(TARGET_OCTEON) && defined(__mips_n32)
 #include <mips/cavium/octeon_pcmap_regs.h>
 #define rd8(a) oct_read8(a)
 #define rd16(a) oct_read16(a)