diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 356147ed1..2a522c6c9 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -1,18 +1,18 @@ [package] +authors = ["Sean Cross "] +description = "Core kernel for Xous, including task switching and memory management" +edition = "2018" name = "kernel" version = "0.8.0" -authors = ["Sean Cross "] -edition = "2018" -description = "Core kernel for Xous, including task switching and memory management" [dependencies] bitflags = "1.2.1" -xous-kernel = { package = "xous", path = "../xous-rs", features = ["forget-memory-messages"] } -stats_alloc = { version = "0.1.8", optional = true } -sha3 = { default-features = false, version = "0.8.2" } +sha3 = {default-features = false, version = "0.8.2"} +stats_alloc = {version = "0.1.8", optional = true} +xous-kernel = {package = "xous", path = "../xous-rs", features = ["forget-memory-messages"]} [target.'cfg(not(any(windows, unix)))'.dependencies] -utralib = { path = "../utralib"} +utralib = {path = "../utralib"} [target.'cfg(target_arch = "riscv32")'.dependencies] riscv = "0.5.6" @@ -26,11 +26,11 @@ wrap-print = [] default = ["print-panics"] [target.'cfg(any(windows, unix))'.dependencies] +crossbeam-channel = "0.5" +debug-here = "0.2.2" +hex = "0.4" lazy_static = "1.4" rand = "0.7" -hex = "0.4" -debug-here = "0.2.2" -crossbeam-channel = "0.5" [profile.release] codegen-units = 1 # 1 better optimizations diff --git a/kernel/src/debug.rs b/kernel/src/debug.rs index 9308d24df..831ac096d 100644 --- a/kernel/src/debug.rs +++ b/kernel/src/debug.rs @@ -60,9 +60,7 @@ macro_rules! println } #[cfg(baremetal)] -pub struct Uart { - // pub base: *mut usize, -} +pub struct Uart {} #[cfg(baremetal)] static mut INITIALIZED: bool = false;