X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/ec98d05af80e6e68c889dac10b8478ce92bd5161..dd82b939699fb0b298ccbfd66b84ef0d7a78a53b:/lunaix-os/includes/hal/devtree.h

diff --git a/lunaix-os/includes/hal/devtree.h b/lunaix-os/includes/hal/devtree.h
index 5578284..f95abf2 100644
--- a/lunaix-os/includes/hal/devtree.h
+++ b/lunaix-os/includes/hal/devtree.h
@@ -1,6 +1,7 @@
 #ifndef __LUNAIX_DEVTREE_H
 #define __LUNAIX_DEVTREE_H
 
+#ifdef CONFIG_USE_DEVICETREE
 #include <lunaix/types.h>
 #include <lunaix/ds/llist.h>
 #include <lunaix/ds/hstr.h>
@@ -46,14 +47,14 @@ struct dtp_val
 {
     union
     {
-        union {
-            const char*  str_val;
-            const char*  str_lst;
-        };
         ptr_t        ptr_val;
         dt_enc_t     encoded;
         
         union dtp_baseval* ref;
+        union {
+            const char*  str_val;
+            const char*  str_lst;
+        };
     };
     unsigned int size;
 };
@@ -675,7 +676,7 @@ static inline void
 dtpi_init_empty(struct dtpropi* dtpi)
 {
     *dtpi = (struct dtpropi) {
-        .prop = { 0, 0 },
+        .prop = { {0}, 0 },
         .loc = 0
     };
 }
@@ -692,23 +693,27 @@ dtpi_has_next(struct dtpropi* dtpi)
     return dtpi->loc < dtpi->prop.size / sizeof(u32_t);
 }
 
-static inline u32_t
-dtpi_next_u32(struct dtpropi* dtpi) 
+static inline u64_t
+dtpi_next_integer(struct dtpropi* dtpi, int int_cells) 
 {
     union dtp_baseval* val;
-    val = (union dtp_baseval*)&dtpi->prop.encoded[dtpi->loc++];
-    return val->u32_val;
+    off_t loc = dtpi->loc;
+    dtpi->loc += int_cells;
+    val = (union dtp_baseval*)&dtpi->prop.encoded[loc];
+    
+    return int_cells == 1 ? val->u32_val : val->u64_val;
 }
 
 static inline u64_t
 dtpi_next_u64(struct dtpropi* dtpi) 
 {
-    union dtp_baseval* val;
-    off_t loc = dtpi->loc;
-    dtpi->loc += 2;
-    val = (union dtp_baseval*)&dtpi->prop.encoded[loc];
-    
-    return val->u64_val;
+    return dtpi_next_integer(dtpi, 2);
+}
+
+static inline u32_t
+dtpi_next_u32(struct dtpropi* dtpi) 
+{
+    return (u32_t)dtpi_next_integer(dtpi, 1);
 }
 
 static inline struct dtn*
@@ -733,4 +738,5 @@ dtpi_next_val(struct dtpropi* dtpi, struct dtp_val* val, int cells)
     return true;
 }
 
+#endif
 #endif /* __LUNAIX_DEVTREE_H */