Date: Sat, 3 Jul 2010 20:48:43 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r209673 - user/nwhitehorn/ps3/dev/ofw Message-ID: <201007032048.o63KmhXe021581@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201007032048.o63KmhXe021581>