sq fix compilation

machine/src/device_tree.rs

@@ -1,16 +1,17 @@
+#![allow(dead_code)]
+
 use {
     core::alloc::Layout,
     fdt_rs::{
         base::DevTree,
         error::DevTreeError,
-        index::{
-            iters::DevTreeIndexNodeSiblingIter,
-            {DevTreeIndex, DevTreeIndexNode, DevTreeIndexProp},
-        },
-        prelude::{FallibleIterator, PropReader},
+        index::{DevTreeIndex, DevTreeIndexNode, DevTreeIndexProp},
+        prelude::PropReader,
     },
     shrinkwraprs::Shrinkwrap,
 };
+//iters::DevTreeIndexNodeSiblingIter,
+//FallibleIterator,
 
 /// Uses DevTreeIndex implementation for simpler navigation.
 /// This requires allocation of a single buffer, which is done at boot time via bump allocator.
@@ -38,8 +39,9 @@ impl<'a> DeviceTree<'a> {
             path.move_next();
         }
         while !path.is_finished() {
-            node = node_iter
-                .try_find::<_, _, DevTreeError>(|node| Ok(node.name()? == path.component()))?;
+            let res: Result<_, DevTreeError> =
+                node_iter.try_find(|node| Ok(node.name()? == path.component()));
+            node = res?;
             if node.is_none() {
                 return Err(DevTreeError::InvalidParameter("Invalid path")); // @todo
             }
@@ -49,8 +51,9 @@ impl<'a> DeviceTree<'a> {
         assert!(path.is_finished()); // tbd
         assert!(node.is_some());
         let mut prop_iter = node.unwrap().props();
-        let prop = prop_iter
-            .try_find::<_, _, DevTreeError>(|prop| Ok(prop.name()? == path.component()))?;
+        let res: Result<_, DevTreeError> =
+            prop_iter.try_find(|prop| Ok(prop.name()? == path.component()));
+        let prop = res?;
         if prop.is_none() {
             return Err(DevTreeError::InvalidParameter("Invalid path")); // @todo
         }

machine/src/lib.rs

@@ -1,5 +1,6 @@
 #![no_std]
 #![no_main]
+#![feature(try_find)] // For DeviceTree iterators
 #![feature(decl_macro)]
 #![feature(allocator_api)]
 #![feature(format_args_nl)]
@@ -23,6 +24,7 @@ pub mod arch;
 
 pub use arch::*;
 
+pub mod device_tree;
 pub mod devices;
 pub mod macros;
 mod mm;
@@ -39,7 +41,7 @@ pub static CONSOLE: sync::NullLock<devices::Console> = sync::NullLock::new(devic
 /// The global allocator for DMA-able memory. That is, memory which is tagged
 /// non-cacheable in the page tables.
 #[allow(dead_code)]
-static DMA_ALLOCATOR: sync::NullLock<mm::BumpAllocator> =
+pub static DMA_ALLOCATOR: sync::NullLock<mm::BumpAllocator> =
     sync::NullLock::new(mm::BumpAllocator::new(
         // @todo Init this after we loaded boot memory map
         memory::map::virt::DMA_HEAP_START as usize,

nucleus/Cargo.toml

@@ -37,3 +37,4 @@ bit_field = "0.10"
 bitflags = "1.3"
 cfg-if = "1.0"
 snafu = { version = "0.7", default-features = false }
+fdt-rs = { version = "0.4", default-features = false }