From owner-svn-src-head@FreeBSD.ORG  Fri Jul  9 14:02:24 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 733E2106566C;
	Fri,  9 Jul 2010 14:02:24 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 635678FC1C;
	Fri,  9 Jul 2010 14:02:24 +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 o69E2O4i054171;
	Fri, 9 Jul 2010 14:02:24 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o69E2Oh7054169;
	Fri, 9 Jul 2010 14:02:24 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201007091402.o69E2Oh7054169@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Fri, 9 Jul 2010 14:02:24 +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: r209851 - head/sys/powerpc/aim
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jul 2010 14:02:24 -0000

Author: nwhitehorn
Date: Fri Jul  9 14:02:24 2010
New Revision: 209851
URL: http://svn.freebsd.org/changeset/base/209851

Log:
  MFppc64:
  
  Minor 64-bit-cleanliness upgrades and support for platform detection on
  subtly-broken OF implementations like in the Mambo simulator.

Modified:
  head/sys/powerpc/aim/platform_chrp.c

Modified: head/sys/powerpc/aim/platform_chrp.c
==============================================================================
--- head/sys/powerpc/aim/platform_chrp.c	Fri Jul  9 14:01:18 2010	(r209850)
+++ head/sys/powerpc/aim/platform_chrp.c	Fri Jul  9 14:02:24 2010	(r209851)
@@ -88,7 +88,7 @@ PLATFORM_DEF(chrp_platform);
 static int
 chrp_probe(platform_t plat)
 {
-	if (OF_finddevice("/memory") != -1)
+	if (OF_finddevice("/memory") != -1 || OF_finddevice("/memory@0") != -1)
 		return (BUS_PROBE_GENERIC);
 
 	return (ENXIO);
@@ -105,7 +105,7 @@ static u_long
 chrp_timebase_freq(platform_t plat, struct cpuref *cpuref)
 {
 	phandle_t phandle;
-	long ticks = -1;
+	int32_t ticks = -1;
 
 	phandle = cpuref->cr_hwref;
 
@@ -121,7 +121,7 @@ chrp_timebase_freq(platform_t plat, stru
 static int
 chrp_smp_fill_cpuref(struct cpuref *cpuref, phandle_t cpu)
 {
-	int cpuid, res;
+	cell_t cpuid, res;
 
 	cpuref->cr_hwref = cpu;
 	res = OF_getprop(cpu, "reg", &cpuid, sizeof(cpuid));