From owner-svn-src-user@FreeBSD.ORG  Sat Jul  3 20:48:44 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 05128106566C;
	Sat,  3 Jul 2010 20:48:44 +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 E900B8FC12;
	Sat,  3 Jul 2010 20:48:43 +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 o63KmhVv021584;
	Sat, 3 Jul 2010 20:48:43 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o63KmhXe021581;
	Sat, 3 Jul 2010 20:48:43 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201007032048.o63KmhXe021581@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 3 Jul 2010 20:48:43 +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: r209673 - user/nwhitehorn/ps3/dev/ofw
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, 03 Jul 2010 20:48:44 -0000

Author: nwhitehorn
Date: Sat Jul  3 20:48:43 2010
New Revision: 209673
URL: http://svn.freebsd.org/changeset/base/209673

Log:
  We need Open Firmware and FDT to be able to coexist. Ideally, we would
  either kill the OFW iinfo stuff or the FDT duplicate version of it in
  favor of something unified, but for now at least don't break things.

Modified:
  user/nwhitehorn/ps3/dev/ofw/ofw_bus_subr.c
  user/nwhitehorn/ps3/dev/ofw/openfirm.c

Modified: user/nwhitehorn/ps3/dev/ofw/ofw_bus_subr.c
==============================================================================
--- user/nwhitehorn/ps3/dev/ofw/ofw_bus_subr.c	Sat Jul  3 20:26:33 2010	(r209672)
+++ user/nwhitehorn/ps3/dev/ofw/ofw_bus_subr.c	Sat Jul  3 20:48:43 2010	(r209673)
@@ -193,7 +193,6 @@ ofw_bus_is_compatible_strict(device_t de
 	return (0);
 }
 
-#ifndef FDT
 void
 ofw_bus_setup_iinfo(phandle_t node, struct ofw_bus_iinfo *ii, int intrsz)
 {
@@ -313,4 +312,3 @@ ofw_bus_search_intrmap(void *intr, int i
 	}
 	return (0);
 }
-#endif /* !FDT */

Modified: user/nwhitehorn/ps3/dev/ofw/openfirm.c
==============================================================================
--- user/nwhitehorn/ps3/dev/ofw/openfirm.c	Sat Jul  3 20:26:33 2010	(r209672)
+++ user/nwhitehorn/ps3/dev/ofw/openfirm.c	Sat Jul  3 20:48:43 2010	(r209673)
@@ -135,7 +135,6 @@ OF_init(void *cookie)
 	return (rv);
 }
 
-#ifndef FDT
 void
 OF_printf(const char *fmt, ...)
 {
@@ -159,7 +158,6 @@ OF_test(const char *name)
 
 	return (OFW_TEST(ofw_obj, name));
 }
-#endif
 
 int
 OF_interpret(const char *cmd, int nreturns, ...)
@@ -321,7 +319,6 @@ OF_package_to_path(phandle_t package, ch
 	return (OFW_PACKAGE_TO_PATH(ofw_obj, package, buf, len));
 }
 
-#ifndef FDT
 /*  Call the method in the scope of a given instance. */
 int
 OF_call_method(const char *method, ihandle_t instance, int nargs, int nreturns,
@@ -435,4 +432,3 @@ OF_exit()
 	for (;;)			/* just in case */
 		;
 }
-#endif