Merge pull request betrusted-io#266 from Foundation-Devices/driver-re…

…factor

kernel: Drivers refactor.

kernel/Cargo.toml

@@ -4,7 +4,7 @@ description = "Core kernel for Xous, including task switching and memory managem
 license = "MIT OR Apache-2.0"
 edition = "2018"
 name = "xous-kernel"
-version = "0.9.17"
+version = "0.9.18"
 resolver = "2"
 
 # Dependency versions enforced by Cargo.lock.

kernel/src/arch/riscv/mod.rs

@@ -7,7 +7,6 @@ pub mod exception;
 pub mod irq;
 pub mod mem;
 pub mod process;
-pub mod rand;
 pub mod syscall;
 
 pub use process::Thread;
@@ -49,7 +48,6 @@ pub fn init() {
         sie::set_ssoft();
         sie::set_sext();
     }
-    rand::init();
 }
 
 /// Put the core to sleep until an interrupt hits. Returns `true`

kernel/src/debug/macros.rs

@@ -0,0 +1,53 @@
+// SPDX-FileCopyrightText: 2020 Sean Cross <sean@xobs.io>
+// SPDX-FileCopyrightText: 2022 Foundation Devices, Inc. <hello@foundationdevices.com>
+// SPDX-License-Identifier: Apache-2.0
+
+/// Prints to the debug output directly.
+#[cfg(baremetal)]
+#[macro_export]
+macro_rules! print {
+    ($($args:tt)+) => {{
+        #[allow(unused_unsafe)]
+        unsafe {
+			use core::fmt::Write;
+            if let Some(stream) = crate::debug::shell::OUTPUT.as_mut() {
+                write!(stream, $($args)+).unwrap();
+            }
+        }
+    }};
+}
+
+/// Prints to the debug output directly, with a newline.
+#[cfg(baremetal)]
+#[macro_export]
+macro_rules! println {
+	() => ({
+		print!("\r\n")
+	});
+	($fmt:expr) => ({
+		print!(concat!($fmt, "\r\n"))
+	});
+	($fmt:expr, $($args:tt)+) => ({
+		print!(concat!($fmt, "\r\n"), $($args)+)
+	});
+}
+
+#[cfg(feature = "debug-print")]
+#[macro_export]
+macro_rules! klog {
+	() => ({
+		print!(" [{}:{}]", file!(), line!())
+	});
+	($fmt:expr) => ({
+        print!(concat!(" [{}:{} ", $fmt, "]"), file!(), line!())
+	});
+	($fmt:expr, $($args:tt)+) => ({
+		print!(concat!(" [{}:{} ", $fmt, "]"), file!(), line!(), $($args)+)
+	});
+}
+
+#[cfg(not(feature = "debug-print"))]
+#[macro_export]
+macro_rules! klog {
+    ($($args:tt)+) => {{}};
+}