<div dir="ltr"><div class="gmail_default" style="font-size:small">ping.</div><div class="gmail_default" style="font-size:small"><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Jan 20, 2021 at 2:01 PM G S Niteesh Babu <<a href="mailto:niteesh.gs@gmail.com">niteesh.gs@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">This commit modifies the OFW interface to the RTEMS FDT<br>
implementation instead of the default FreeBSD.<br>
---<br>
freebsd/sys/dev/ofw/openfirm.c | 2 ++<br>
freebsd/sys/dev/ofw/openfirm.h | 9 ++++++++<br>
.../machine/rtems-bsd-kernel-namespace.h | 22 -------------------<br>
3 files changed, 11 insertions(+), 22 deletions(-)<br>
<br>
diff --git a/freebsd/sys/dev/ofw/openfirm.c b/freebsd/sys/dev/ofw/openfirm.c<br>
index 9cc7dbdc..30513ab2 100644<br>
--- a/freebsd/sys/dev/ofw/openfirm.c<br>
+++ b/freebsd/sys/dev/ofw/openfirm.c<br>
@@ -333,6 +333,7 @@ OF_interpret(const char *cmd, int nreturns, ...)<br>
* Device tree functions<br>
*/<br>
<br>
+#ifndef __rtems__<br>
/* Return the next sibling of this node or 0. */<br>
phandle_t<br>
OF_peer(phandle_t node)<br>
@@ -672,6 +673,7 @@ OF_xref_from_node(phandle_t node)<br>
return (node);<br>
return (xref);<br>
}<br>
+#endif /* __rtems__ */<br>
<br>
device_t<br>
OF_device_from_xref(phandle_t xref)<br>
diff --git a/freebsd/sys/dev/ofw/openfirm.h b/freebsd/sys/dev/ofw/openfirm.h<br>
index f043197a..5df07258 100644<br>
--- a/freebsd/sys/dev/ofw/openfirm.h<br>
+++ b/freebsd/sys/dev/ofw/openfirm.h<br>
@@ -64,7 +64,11 @@<br>
<br>
#include <sys/types.h><br>
#include <machine/_bus.h><br>
+#ifdef __rtems__<br>
+#include <ofw/ofw_compat.h><br>
+#endif /* __rtems__ */<br>
<br>
+#ifndef __rtems__<br>
/*<br>
* Prototypes for Open Firmware Interface Routines<br>
*/<br>
@@ -72,6 +76,7 @@<br>
typedef uint32_t ihandle_t;<br>
typedef uint32_t phandle_t;<br>
typedef uint32_t pcell_t;<br>
+#endif /* __rtems__ */<br>
<br>
#ifdef _KERNEL<br>
#include <sys/malloc.h><br>
@@ -102,6 +107,7 @@ int OF_test(const char *name);<br>
void OF_printf(const char *fmt, ...);<br>
<br>
/* Device tree functions */<br>
+#ifndef __rtems__<br>
phandle_t OF_peer(phandle_t node);<br>
phandle_t OF_child(phandle_t node);<br>
phandle_t OF_parent(phandle_t node);<br>
@@ -140,6 +146,7 @@ ssize_t OF_package_to_path(phandle_t node, char *buf, size_t len);<br>
*/<br>
phandle_t OF_node_from_xref(phandle_t xref);<br>
phandle_t OF_xref_from_node(phandle_t node);<br>
+#endif /* __rtems__ */<br>
<br>
/*<br>
* When properties contain references to other nodes using xref handles it is<br>
@@ -159,8 +166,10 @@ ssize_t OF_read(ihandle_t instance, void *buf, size_t len);<br>
ssize_t OF_write(ihandle_t instance, const void *buf, size_t len);<br>
int OF_seek(ihandle_t instance, uint64_t where);<br>
<br>
+#ifndef __rtems__<br>
phandle_t OF_instance_to_package(ihandle_t instance);<br>
ssize_t OF_instance_to_path(ihandle_t instance, char *buf, size_t len);<br>
+#endif /* __rtems__ */<br>
int OF_call_method(const char *method, ihandle_t instance,<br>
int nargs, int nreturns, ...);<br>
<br>
diff --git a/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h b/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h<br>
index 75b744a4..53944393 100644<br>
--- a/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h<br>
+++ b/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h<br>
@@ -3044,42 +3044,20 @@<br>
#define null_filtops _bsd_null_filtops<br>
#define nullop _bsd_nullop<br>
#define OF_call_method _bsd_OF_call_method<br>
-#define OF_canon _bsd_OF_canon<br>
-#define OF_child _bsd_OF_child<br>
#define OF_claim _bsd_OF_claim<br>
#define OF_close _bsd_OF_close<br>
#define OF_device_from_xref _bsd_OF_device_from_xref<br>
#define OF_device_register_xref _bsd_OF_device_register_xref<br>
#define OF_enter _bsd_OF_enter<br>
#define OF_exit _bsd_OF_exit<br>
-#define OF_finddevice _bsd_OF_finddevice<br>
-#define OF_getencprop _bsd_OF_getencprop<br>
-#define OF_getencprop_alloc _bsd_OF_getencprop_alloc<br>
-#define OF_getencprop_alloc_multi _bsd_OF_getencprop_alloc_multi<br>
-#define OF_getprop _bsd_OF_getprop<br>
-#define OF_getprop_alloc _bsd_OF_getprop_alloc<br>
-#define OF_getprop_alloc_multi _bsd_OF_getprop_alloc_multi<br>
-#define OF_getproplen _bsd_OF_getproplen<br>
-#define OF_hasprop _bsd_OF_hasprop<br>
#define OF_init _bsd_OF_init<br>
#define OF_install _bsd_OF_install<br>
-#define OF_instance_to_package _bsd_OF_instance_to_package<br>
-#define OF_instance_to_path _bsd_OF_instance_to_path<br>
#define OF_interpret _bsd_OF_interpret<br>
-#define OF_nextprop _bsd_OF_nextprop<br>
-#define OF_node_from_xref _bsd_OF_node_from_xref<br>
#define OF_open _bsd_OF_open<br>
-#define OF_package_to_path _bsd_OF_package_to_path<br>
-#define OF_parent _bsd_OF_parent<br>
-#define OF_peer _bsd_OF_peer<br>
#define OF_printf _bsd_OF_printf<br>
-#define OF_prop_free _bsd_OF_prop_free<br>
#define OF_read _bsd_OF_read<br>
#define OF_release _bsd_OF_release<br>
-#define OF_searchencprop _bsd_OF_searchencprop<br>
-#define OF_searchprop _bsd_OF_searchprop<br>
#define OF_seek _bsd_OF_seek<br>
-#define OF_setprop _bsd_OF_setprop<br>
#define OF_test _bsd_OF_test<br>
#define ofw_bus_assigned_addresses_to_rl _bsd_ofw_bus_assigned_addresses_to_rl<br>
#define ofwbus_driver _bsd_ofwbus_driver<br>
-- <br>
2.17.1<br>
<br>
</blockquote></div>