Merge branch '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 3a92116eeb4fc744be07297c6b0664b49591b3cb..0a132da5f2e805f7a08a3f0327dd971f1c8838af 100644 (file)
--- a/lunaix-os/includes/hal/devtree.h
+++ b/lunaix-os/includes/hal/devtree.h
@@ -319,11 +319,11 @@ dt_decode(struct dt_prop_iter* dtpi, struct dt_node_base* node,
 }
 
 #define dt_decode_reg(dtpi, node, field) \
 }
 
 #define dt_decode_reg(dtpi, node, field) \

-            dt_decode(dtpi, &(node)->base, (node)->(field), \
+            dt_decode(dtpi, &(node)->base, &(node)->field, \

                             (node)->base.sz_c + (node)->base.addr_c);
 
 #define dt_decode_range(dtpi, node, field) \
                             (node)->base.sz_c + (node)->base.addr_c);
 
 #define dt_decode_range(dtpi, node, field) \

-            dt_decode(dtpi, &(node)->base, (node)->field, \
+            dt_decode(dtpi, &(node)->base, &(node)->field, \

                             (node)->base.sz_c * 2 + (node)->base.addr_c);
 
 static inline void
                             (node)->base.sz_c * 2 + (node)->base.addr_c);
 
 static inline void


@@ -410,12 +410,34 @@ dtprop_reg_addr(struct dt_prop_iter* dtpi)
     return dtprop_extract(dtpi, 0);
 }
 
     return dtprop_extract(dtpi, 0);
 }
 

+static inline ptr_t
+dtprop_reg_nextaddr(struct dt_prop_iter* dtpi)
+{
+    ptr_t t;
+
+    t = (ptr_t)dtprop_to_u64(dtprop_reg_addr(dtpi));
+    dtprop_next(dtpi);
+
+    return t;
+}
+

 static inline dt_enc_t
 dtprop_reg_len(struct dt_prop_iter* dtpi)
 {
     return dtprop_extract(dtpi, dtpi->node->addr_c);
 }
 
 static inline dt_enc_t
 dtprop_reg_len(struct dt_prop_iter* dtpi)
 {
     return dtprop_extract(dtpi, dtpi->node->addr_c);
 }
 

+static inline size_t
+dtprop_reg_nextlen(struct dt_prop_iter* dtpi)
+{
+    size_t t;
+
+    t = (size_t)dtprop_to_u64(dtprop_reg_len(dtpi));
+    dtprop_next(dtpi);
+
+    return t;
+}
+

 static inline dt_enc_t
 dtprop_range_childbus(struct dt_prop_iter* dtpi)
 {
 static inline dt_enc_t
 dtprop_range_childbus(struct dt_prop_iter* dtpi)
 {