svn commit: r209851 - head/sys/powerpc/aim

[Nathan Whitehorn]

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 at 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));