Merge remote-tracking branch 'origin/master' into isa/arm64

[lunaix-os.git] / lunaix-os / includes / hal / devtree.h

diff --git a/lunaix-os/includes/hal/devtree.h b/lunaix-os/includes/hal/devtree.h
index 111617e7626c786e3afa5c4af5780ab0da90b7b5..cc8e5836c28049aaef56bdb63c8648082a0ae15b 100644 (file)
--- a/lunaix-os/includes/hal/devtree.h
+++ b/lunaix-os/includes/hal/devtree.h
@@ -260,7 +260,7 @@ struct dtn_base
 
     struct dtp_table        *props;
 
 
     struct dtp_table        *props;
 

-    morph_t                 *binded_dev;
+    morph_t                 *binded_obj;

 };
 
 struct dtspec_key
 };
 
 struct dtspec_key


@@ -443,6 +443,12 @@ dtp_val_set(struct dtp_val* val, dt_enc_t raw, unsigned cells)
     val->size = cells * sizeof(u32_t);
 }
 
     val->size = cells * sizeof(u32_t);
 }
 

+static inline void
+dtn_bind_object(struct dtn* node, morph_t* mobj)
+{
+    node->base.binded_obj = changeling_ref(mobj);
+}
+

 
 //////////////////////////////////////
 ///     DT Methods: Specifier Map
 
 //////////////////////////////////////
 ///     DT Methods: Specifier Map


@@ -590,11 +596,11 @@ struct dtpropx
 #define dtprop_reglike(base)                    \
     ({                                          \
         dt_proplet p = {                        \
 #define dtprop_reglike(base)                    \
     ({                                          \
         dt_proplet p = {                        \

-            dtprop_compx(base->addr_c),         \
-            dtprop_compx(base->sz_c),           \
+            dtprop_compx((base)->addr_c),       \
+            dtprop_compx((base)->sz_c),         \

             dtprop_end                          \
         };                                      \
             dtprop_end                          \
         };                                      \

-        dt_proplet;                             \
+        p;                             \

     })
 
 #define dtprop_rangelike(node)                  \
     })
 
 #define dtprop_rangelike(node)                  \


@@ -605,7 +611,7 @@ struct dtpropx
             dtprop_compx(base->sz_c),           \
             dtprop_end                          \
         };                                      \
             dtprop_compx(base->sz_c),           \
             dtprop_end                          \
         };                                      \

-        dt_proplet;                             \
+        p;                             \

     })
 
 #define dtprop_strlst_foreach(pos, prop)    \
     })
 
 #define dtprop_strlst_foreach(pos, prop)    \