From owner-svn-src-all@FreeBSD.ORG  Mon Jan  5 01:05:37 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 F2F679B3;
 Mon,  5 Jan 2015 01:05:36 +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 C54C133C3;
 Mon,  5 Jan 2015 01:05:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0515aBH071877;
 Mon, 5 Jan 2015 01:05:36 GMT (envelope-from nwhitehorn@FreeBSD.org)
Received: (from nwhitehorn@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0515abb071875;
 Mon, 5 Jan 2015 01:05:36 GMT (envelope-from nwhitehorn@FreeBSD.org)
Message-Id: <201501050105.t0515abb071875@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: nwhitehorn set sender to
 nwhitehorn@FreeBSD.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 5 Jan 2015 01:05:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r276680 - head/sys/powerpc/ps3
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
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/options/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: Mon, 05 Jan 2015 01:05:37 -0000

Author: nwhitehorn
Date: Mon Jan  5 01:05:35 2015
New Revision: 276680
URL: https://svnweb.freebsd.org/changeset/base/276680

Log:
  Use FDT properties to identify a PS3 if present.

Modified:
  head/sys/powerpc/ps3/platform_ps3.c
  head/sys/powerpc/ps3/ps3_syscons.c

Modified: head/sys/powerpc/ps3/platform_ps3.c
==============================================================================
--- head/sys/powerpc/ps3/platform_ps3.c	Mon Jan  5 00:50:16 2015	(r276679)
+++ head/sys/powerpc/ps3/platform_ps3.c	Mon Jan  5 01:05:35 2015	(r276680)
@@ -49,6 +49,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/spr.h>
 #include <machine/vmparam.h>
 
+#include <dev/ofw/openfirm.h>
+
 #include "platform_if.h"
 #include "ps3-hvcall.h"
 
@@ -103,8 +105,17 @@ PLATFORM_DEF(ps3_platform);
 static int
 ps3_probe(platform_t plat)
 {
+	phandle_t root;
+	char compatible[64];
+
+	root = OF_finddevice("/");
+	if (OF_getprop(root, "compatible", compatible, sizeof(compatible)) <= 0)
+                return (BUS_PROBE_NOWILDCARD);
+	
+	if (strncmp(compatible, "sony,ps3", sizeof(compatible)) != 0)
+		return (BUS_PROBE_NOWILDCARD);
 
-	return (BUS_PROBE_NOWILDCARD);
+	return (BUS_PROBE_SPECIFIC);
 }
 
 static int

Modified: head/sys/powerpc/ps3/ps3_syscons.c
==============================================================================
--- head/sys/powerpc/ps3/ps3_syscons.c	Mon Jan  5 00:50:16 2015	(r276679)
+++ head/sys/powerpc/ps3/ps3_syscons.c	Mon Jan  5 01:05:35 2015	(r276680)
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/platform.h>
 #include <machine/pmap.h>
 
+#include <dev/ofw/openfirm.h>
 #include <dev/vt/vt.h>
 #include <dev/vt/hw/fb/vt_fb.h>
 #include <dev/vt/colors/vt_termcolors.h>
@@ -95,9 +96,7 @@ ps3fb_probe(struct vt_device *vd)
 	struct ps3fb_softc *sc;
 	int disable;
 	char compatible[64];
-#if 0
 	phandle_t root;
-#endif
 
 	disable = 0;
 	TUNABLE_INT_FETCH("hw.syscons.disable", &disable);
@@ -106,18 +105,16 @@ ps3fb_probe(struct vt_device *vd)
 
 	sc = &ps3fb_softc;
 
-#if 0
+	TUNABLE_STR_FETCH("hw.platform", compatible, sizeof(compatible));
+	if (strcmp(compatible, "ps3") == 0)
+		return (CN_INTERNAL);
+
 	root = OF_finddevice("/");
 	if (OF_getprop(root, "compatible", compatible, sizeof(compatible)) <= 0)
-                return (0);
+                return (CN_DEAD);
 	
 	if (strncmp(compatible, "sony,ps3", sizeof(compatible)) != 0)
-		return (0);
-#else
-	TUNABLE_STR_FETCH("hw.platform", compatible, sizeof(compatible));
-	if (strcmp(compatible, "ps3") != 0)
 		return (CN_DEAD);
-#endif
 
 	return (CN_INTERNAL);
 }