diff --git a/apps/ball/Cargo.toml b/apps/ball/Cargo.toml index 88e5d2606..dcb0416c4 100644 --- a/apps/ball/Cargo.toml +++ b/apps/ball/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "Ball demo app" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] log = "0.4.14" num-derive = {version = "0.3.3", default-features = false} diff --git a/apps/repl/Cargo.toml b/apps/repl/Cargo.toml index d4fe10f28..95c67bcb9 100644 --- a/apps/repl/Cargo.toml +++ b/apps/repl/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "REPL demo app" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] log = "0.4.14" num-derive = {version = "0.3.3", default-features = false} diff --git a/apps/vault/src/ux.rs b/apps/vault/src/ux.rs index 344ad3d23..0df9aa6b6 100644 --- a/apps/vault/src/ux.rs +++ b/apps/vault/src/ux.rs @@ -80,7 +80,8 @@ pub(crate) fn set_durations(prompt: i64, presence: i64) { /// Some(char) => user is present, and they hit the key indicated /// None => user was not present pub(crate) fn request_permission_blocking(reason: String, channel_id: [u8; 4]) -> Option { - log::info!("requesting permission (blocking)"); + log::trace!("requesting permission (blocking)"); + log::info!("{}VAULT.PERMISSION,{}", xous::BOOKEND_START, xous::BOOKEND_END); request_permission_inner(reason, channel_id, true, None) } pub(crate) fn request_permission_polling(reason: String, application: [u8; 32]) -> bool { diff --git a/imports/com_rs-ref/Cargo.toml b/imports/com_rs-ref/Cargo.toml index 8f611ad24..881e44b14 100644 --- a/imports/com_rs-ref/Cargo.toml +++ b/imports/com_rs-ref/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "com_rs import package" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] com_rs = { git = "https://github.com/betrusted-io/com_rs.git", rev = "4a53c95b56407b8ad518b8c5ab6a361aae5dfaa1" } #com_rs = { path = "../../../betrusted-ec/sw/com_rs" } diff --git a/imports/riscv-0.5.6/Cargo.toml b/imports/riscv-0.5.6/Cargo.toml index 3da2216f5..0f59b21df 100644 --- a/imports/riscv-0.5.6/Cargo.toml +++ b/imports/riscv-0.5.6/Cargo.toml @@ -8,7 +8,7 @@ description = "Low level access to RISC-V processors" keywords = ["riscv", "register", "peripheral"] license = "ISC" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] bare-metal = ">=0.2.0,<0.2.5" bit_field = "0.9.0" diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 21a1b8736..564b4b2b3 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -6,7 +6,7 @@ name = "kernel" version = "0.8.2" resolver = "2" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] bitflags = "1.2.1" # gdbstub branch "dev/0.6" diff --git a/kernel/build.rs b/kernel/build.rs index 6dadf691e..32ddd191c 100644 --- a/kernel/build.rs +++ b/kernel/build.rs @@ -52,6 +52,6 @@ fn main() { // CI sets this variable. This changes how the panic handler works. println!("cargo:rerun-if-env-changed=CI"); if option_env!("CI").is_some() { - println!("cargp:rustc-cfg=ci"); + println!("cargo:rustc-cfg=ci"); } } diff --git a/loader/sha2-loader/Cargo.toml b/loader/sha2-loader/Cargo.toml index f56411cb1..e0c4695e3 100644 --- a/loader/sha2-loader/Cargo.toml +++ b/loader/sha2-loader/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "sha2 hardware accelerator engine" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] # Rust-standard digest API dependencies diff --git a/locales/Cargo.toml b/locales/Cargo.toml index dd1cf858d..cced5a1e9 100644 --- a/locales/Cargo.toml +++ b/locales/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" name = "locales" version = "0.1.0" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] [build-dependencies] diff --git a/services/aes-test/Cargo.toml b/services/aes-test/Cargo.toml index 0f7e29013..9493234f3 100644 --- a/services/aes-test/Cargo.toml +++ b/services/aes-test/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" name = "aes-test" version = "0.1.0" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] log = "0.4.14" log-server = {path = "../log-server"} diff --git a/services/aes/Cargo.toml b/services/aes/Cargo.toml index 16a569845..90b9f763d 100644 --- a/services/aes/Cargo.toml +++ b/services/aes/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "AES library for Xous" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] xous = { path = "../../xous-rs" } log-server = { path = "../log-server" } diff --git a/services/benchmark-target/Cargo.toml b/services/benchmark-target/Cargo.toml index 888dd744b..9ace42aa7 100644 --- a/services/benchmark-target/Cargo.toml +++ b/services/benchmark-target/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "Benchmark target for Xous" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] xous = { path = "../../xous-rs" } xous-names = { path = "../xous-names" } diff --git a/services/benchmark/Cargo.toml b/services/benchmark/Cargo.toml index 74c6d9f4b..d02666162 100644 --- a/services/benchmark/Cargo.toml +++ b/services/benchmark/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "Benchmarks for Xous" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] xous = { path = "../../xous-rs" } graphics-server = { path = "../graphics-server" } diff --git a/services/codec/Cargo.toml b/services/codec/Cargo.toml index 9190cf700..aa9b14c78 100644 --- a/services/codec/Cargo.toml +++ b/services/codec/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "Audio CODEC server" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] xous = { path = "../../xous-rs" } log-server = { path = "../log-server" } diff --git a/services/com/Cargo.toml b/services/com/Cargo.toml index 23209b83e..a4da9ea02 100644 --- a/services/com/Cargo.toml +++ b/services/com/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" name = "com" version = "0.1.0" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] com_rs-ref = {path = "../../imports/com_rs-ref"} log = "0.4.14" diff --git a/services/content-plugin-api/Cargo.toml b/services/content-plugin-api/Cargo.toml index 0c9ae8442..8b838e6e7 100644 --- a/services/content-plugin-api/Cargo.toml +++ b/services/content-plugin-api/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "Content Canvas Plugin Common APIs" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] xous = { path = "../../xous-rs" } rkyv = { version = "0.4.3", default_features = false } diff --git a/services/dns/Cargo.toml b/services/dns/Cargo.toml index e258ccb0c..4779d0c80 100644 --- a/services/dns/Cargo.toml +++ b/services/dns/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "Xous DNS resolver" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] xous = { path = "../../xous-rs" } log-server = { path = "../log-server" } diff --git a/services/engine-25519/Cargo.toml b/services/engine-25519/Cargo.toml index 74c033d77..165838df4 100644 --- a/services/engine-25519/Cargo.toml +++ b/services/engine-25519/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "Curve25519 Engine" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] xous = { path = "../../xous-rs" } log-server = { path = "../log-server" } diff --git a/services/engine-sha512/Cargo.toml b/services/engine-sha512/Cargo.toml index c9c356292..fe1f26a43 100644 --- a/services/engine-sha512/Cargo.toml +++ b/services/engine-sha512/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "Sha512 hardware accelerator engine" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] xous = { path = "../../xous-rs" } log-server = { path = "../log-server" } diff --git a/services/ffi-test/Cargo.toml b/services/ffi-test/Cargo.toml index 5f6a7e332..11cce4360 100644 --- a/services/ffi-test/Cargo.toml +++ b/services/ffi-test/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "FFI test integration" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] xous = { path = "../../xous-rs" } log-server = { path = "../log-server" } diff --git a/services/gam/Cargo.toml b/services/gam/Cargo.toml index f5ca41651..8fce83b7b 100644 --- a/services/gam/Cargo.toml +++ b/services/gam/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" name = "gam" version = "0.1.0" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] com = {path = "../com"} # used by the backlight setting on the main menu thread content-plugin-api = {path = "../content-plugin-api"} diff --git a/services/gam/src/api.rs b/services/gam/src/api.rs index 2f514184a..d5cd1d587 100644 --- a/services/gam/src/api.rs +++ b/services/gam/src/api.rs @@ -204,6 +204,7 @@ pub const MODAL_Y_MAX: i16 = 350; // in absolute screen coords, not relative to pub(crate) enum MenuMgrOp { // incoming is one of these ops AddItem, + InsertItem(usize), DeleteItem, SetIndex(usize), Quit, diff --git a/services/gam/src/menu.rs b/services/gam/src/menu.rs index 15476240a..39f881938 100644 --- a/services/gam/src/menu.rs +++ b/services/gam/src/menu.rs @@ -105,8 +105,7 @@ impl<'a> Menu<'a> { self.helper_data = Some(buf); xous::create_thread_3(forwarding_thread, addr, size, offset).expect("couldn't spawn a helper thread"); } - - // if successful, returns None, otherwise, the menu item + /// Appends a menu item to the end of the current Menu pub fn add_item(&mut self, new_item: MenuItem) { if new_item.name.as_str().unwrap() == "🔇" { // suppress the addition of menu items that are not applicable for a given locale return; @@ -132,6 +131,38 @@ impl<'a> Menu<'a> { log::debug!("add_item requesting bounds of {:?}", new_bounds); self.gam.set_canvas_bounds_request(&mut new_bounds).expect("couldn't call set bounds"); } + // Attempts to insert a MenuItem at the index given. This displaces the item at that index down + // by one slot. Returns false if the index is invalid. + pub fn insert_item(&mut self, new_item: MenuItem, at: usize) -> bool { + if new_item.name.as_str().unwrap() == "🔇" { // suppress the addition of menu items that are not applicable for a given locale + return false; + } + // first, do the insertion. + // add the menu item to the first free slot + // any modifications to the menu structure should guarantee that the list is compacted + // and has no holes, in order for the "selected index" logic to work + if at <= self.items.len() { + self.items.insert(at, new_item); + // now, recompute the height + let mut total_items = self.num_items(); + if total_items == 0 { + total_items = 1; // just so we see a blank menu at least, and have a clue how to debug + } + let current_bounds = self.gam.get_canvas_bounds(self.canvas).expect("couldn't get current bounds"); + let mut new_bounds = SetCanvasBoundsRequest { + requested: Point::new(current_bounds.x, total_items as i16 * self.line_height + self.margin * 2), + granted: None, + token_type: TokenType::App, + token: self.authtoken, + }; + log::debug!("add_item requesting bounds of {:?}", new_bounds); + self.gam.set_canvas_bounds_request(&mut new_bounds).expect("couldn't call set bounds"); + true + } else { + false + } + } + // note: this routine has yet to be tested. (remove this comment once it has been actually used by something) pub fn delete_item(&mut self, item: &str) -> bool { let len_before = self.items.len(); @@ -364,6 +395,20 @@ impl MenuMatic { false } } + pub fn insert_item(&self, item: MenuItem, at: usize) -> bool { + let mm = MenuManagement { + item, + op: MenuMgrOp::InsertItem(at), + }; + let mut buf = Buffer::into_buf(mm).expect("Couldn't convert to memory structure"); + buf.lend_mut(self.cid, 0).expect("Couldn't issue management opcode"); + let ret = buf.to_original::().unwrap(); + if ret.op == MenuMgrOp::Ok { + true + } else { + false + } + } pub fn delete_item(&self, item_name: &str) -> bool { let mm = MenuManagement { item: MenuItem { @@ -475,6 +520,15 @@ pub fn menu_matic(items: Vec::, menu_name: &'static str, maybe_manager mgmt.op = MenuMgrOp::Ok; buffer.replace(mgmt).unwrap(); } + MenuMgrOp::InsertItem(at) => { + if menu.lock().unwrap().insert_item(mgmt.item, at) { + mgmt.op = MenuMgrOp::Ok; + buffer.replace(mgmt).unwrap(); + } else { + mgmt.op = MenuMgrOp::Err; + buffer.replace(mgmt).unwrap(); + } + } MenuMgrOp::DeleteItem => { if !menu.lock().unwrap().delete_item(mgmt.item.name.as_str().unwrap()) { mgmt.op = MenuMgrOp::Err; diff --git a/services/graphics-server/Cargo.toml b/services/graphics-server/Cargo.toml index c86dbd01e..c07cd3090 100644 --- a/services/graphics-server/Cargo.toml +++ b/services/graphics-server/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" name = "graphics-server" version = "0.1.0" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] keyboard = {path = "../keyboard"} log = "0.4.14" diff --git a/services/ime-frontend/Cargo.toml b/services/ime-frontend/Cargo.toml index f41556beb..482ae8771 100644 --- a/services/ime-frontend/Cargo.toml +++ b/services/ime-frontend/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" name = "ime-frontend" version = "0.1.0" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] gam = {path = "../gam"} graphics-server = {path = "../graphics-server"} diff --git a/services/ime-plugin-api/Cargo.toml b/services/ime-plugin-api/Cargo.toml index eb75b5daa..1ace61eda 100644 --- a/services/ime-plugin-api/Cargo.toml +++ b/services/ime-plugin-api/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" name = "ime-plugin-api" version = "0.1.0" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] graphics-server = {path = "../graphics-server"}# this is used by the IMEF portion of the API log = "0.4.14" diff --git a/services/ime-plugin-shell/Cargo.toml b/services/ime-plugin-shell/Cargo.toml index ddc35e893..fb506c24a 100644 --- a/services/ime-plugin-shell/Cargo.toml +++ b/services/ime-plugin-shell/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" name = "ime-plugin-shell" version = "0.1.0" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] ime-plugin-api = {path = "../ime-plugin-api"} log = "0.4.14" diff --git a/services/ime-plugin-tts/Cargo.toml b/services/ime-plugin-tts/Cargo.toml index 40d924e35..ee263ac20 100644 --- a/services/ime-plugin-tts/Cargo.toml +++ b/services/ime-plugin-tts/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" name = "ime-plugin-tts" version = "0.1.0" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] ime-plugin-api = {path = "../ime-plugin-api"} log = "0.4.14" diff --git a/services/jtag/Cargo.toml b/services/jtag/Cargo.toml index 94b5c37b2..c6efa0822 100644 --- a/services/jtag/Cargo.toml +++ b/services/jtag/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "JTAG port server" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] xous = { path = "../../xous-rs" } log-server = { path = "../log-server" } diff --git a/services/kernel-test/Cargo.toml b/services/kernel-test/Cargo.toml index 358ab18aa..9af9018a3 100644 --- a/services/kernel-test/Cargo.toml +++ b/services/kernel-test/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Sean Cross "] edition = "2018" description = "Program to test various aspects of the kernel" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] xous = { path = "../../xous-rs" } log-server = { path = "../log-server" } diff --git a/services/keyboard/Cargo.toml b/services/keyboard/Cargo.toml index 1b467afe0..ad92daac9 100644 --- a/services/keyboard/Cargo.toml +++ b/services/keyboard/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" name = "keyboard" version = "0.1.0" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] log = {version = "0.4", features = ["max_level_trace", "release_max_level_trace"]} log-server = {path = "../log-server"} diff --git a/services/libstd-test/Cargo.toml b/services/libstd-test/Cargo.toml index 6a2ab573e..641b87c78 100644 --- a/services/libstd-test/Cargo.toml +++ b/services/libstd-test/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "libstd test stub" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] xous = { path = "../../xous-rs" } log-server = { path = "../log-server" } diff --git a/services/llio/Cargo.toml b/services/llio/Cargo.toml index e6a9963f9..c525f826a 100644 --- a/services/llio/Cargo.toml +++ b/services/llio/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" name = "llio" version = "0.1.0" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] log = "0.4.14" log-server = {path = "../log-server"} diff --git a/services/log-server/Cargo.toml b/services/log-server/Cargo.toml index dace3bdc0..f99aec46f 100644 --- a/services/log-server/Cargo.toml +++ b/services/log-server/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" name = "log-server" version = "0.1.0" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] log = "0.4.14" num-derive = {version = "0.3.3", default-features = false} diff --git a/services/log-test-client/Cargo.toml b/services/log-test-client/Cargo.toml index 61e547c1c..c902c8287 100644 --- a/services/log-test-client/Cargo.toml +++ b/services/log-test-client/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" name = "log-test-client" version = "0.1.0" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] xous = {path = "../../xous-rs"} diff --git a/services/modals/Cargo.toml b/services/modals/Cargo.toml index 1e2e94d13..02431fb5c 100644 --- a/services/modals/Cargo.toml +++ b/services/modals/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "Ux modals server" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] xous = { path = "../../xous-rs" } log-server = { path = "../log-server" } diff --git a/services/net/Cargo.toml b/services/net/Cargo.toml index 5ab5f7230..88a6274ea 100644 --- a/services/net/Cargo.toml +++ b/services/net/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "Network middleware" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] xous = { path = "../../xous-rs" } xous-ipc = {path="../../xous-ipc"} diff --git a/services/pddb/Cargo.toml b/services/pddb/Cargo.toml index 8560dd0af..fee6a6d6d 100644 --- a/services/pddb/Cargo.toml +++ b/services/pddb/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "Plausibly Deniable Database" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] bitflags = {version = "1"} xous = { path = "../../xous-rs" } diff --git a/services/rkyv-test-client/Cargo.toml b/services/rkyv-test-client/Cargo.toml index 960e06572..f788a0fda 100644 --- a/services/rkyv-test-client/Cargo.toml +++ b/services/rkyv-test-client/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" name = "rkyv-test-client" version = "0.1.0" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] log = "0.4.14" log-server = {path = "../log-server"} diff --git a/services/rkyv-test-server/Cargo.toml b/services/rkyv-test-server/Cargo.toml index cd4e4c4e8..d512fcbed 100644 --- a/services/rkyv-test-server/Cargo.toml +++ b/services/rkyv-test-server/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" name = "rkyv-test-server" version = "0.1.0" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] log = "0.4.14" log-server = {path = "../log-server"} diff --git a/services/root-keys/Cargo.toml b/services/root-keys/Cargo.toml index 8f360923c..908e2bbf0 100644 --- a/services/root-keys/Cargo.toml +++ b/services/root-keys/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "Xous root keys server" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] xous = { path = "../../xous-rs" } log-server = { path = "../log-server" } diff --git a/services/shellchat/Cargo.toml b/services/shellchat/Cargo.toml index d54441fbe..caeb18fde 100644 --- a/services/shellchat/Cargo.toml +++ b/services/shellchat/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" name = "shellchat" version = "0.1.0" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] com = {path = "../com"} content-plugin-api = {path = "../content-plugin-api"}# all content canvas providers must provide this API diff --git a/services/skeleton/Cargo.toml b/services/skeleton/Cargo.toml index a0d5684ae..34ace4cc6 100644 --- a/services/skeleton/Cargo.toml +++ b/services/skeleton/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "Audio CODEC server" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] xous = { path = "../../xous-rs" } log-server = { path = "../log-server" } diff --git a/services/spinor/Cargo.toml b/services/spinor/Cargo.toml index bebaf47a1..a41554bc7 100644 --- a/services/spinor/Cargo.toml +++ b/services/spinor/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "SPINOR ROM operations server" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] xous = { path = "../../xous-rs" } log-server = { path = "../log-server" } diff --git a/services/status/Cargo.toml b/services/status/Cargo.toml index bf841d444..ff56824d7 100644 --- a/services/status/Cargo.toml +++ b/services/status/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" name = "status" version = "0.1.0" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] com = {path = "../com"} content-plugin-api = {path = "../content-plugin-api"} diff --git a/services/susres/Cargo.toml b/services/susres/Cargo.toml index f1cddebbb..b3d41331e 100644 --- a/services/susres/Cargo.toml +++ b/services/susres/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "Manager of suspend/resume operations" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] xous = { path = "../../xous-rs" } log-server = { path = "../log-server" } diff --git a/services/ticktimer-server/Cargo.toml b/services/ticktimer-server/Cargo.toml index cf9b43411..c98c99f7b 100644 --- a/services/ticktimer-server/Cargo.toml +++ b/services/ticktimer-server/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" name = "ticktimer-server" version = "0.1.0" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] log = "0.4.14" log-server = {path = "../log-server"} diff --git a/services/trng/Cargo.toml b/services/trng/Cargo.toml index 15723d809..e2d17a7d2 100644 --- a/services/trng/Cargo.toml +++ b/services/trng/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "TRNG server" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] xous = { path = "../../xous-rs" } log-server = { path = "../log-server" } diff --git a/services/tts/Cargo.toml b/services/tts/Cargo.toml index bf158787a..85850d8ee 100644 --- a/services/tts/Cargo.toml +++ b/services/tts/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "Text to speech integration server" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] xous = { path = "../../xous-rs" } xous-ipc = {path="../../xous-ipc"} diff --git a/services/usb-device-xous/Cargo.toml b/services/usb-device-xous/Cargo.toml index 04fdebabc..4ea4b2807 100644 --- a/services/usb-device-xous/Cargo.toml +++ b/services/usb-device-xous/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "Xous USB device drivers" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] xous = { path = "../../xous-rs" } xous-ipc = { path = "../../xous-ipc" } diff --git a/services/usb-device-xous/src/hw.rs b/services/usb-device-xous/src/hw.rs index d61f4e7f5..940cf58c6 100644 --- a/services/usb-device-xous/src/hw.rs +++ b/services/usb-device-xous/src/hw.rs @@ -853,13 +853,15 @@ impl UsbBus for SpinalUsbDevice { /// continue be polled, and it shall return a value other than `Suspend` from `poll` when it no /// longer detects the suspend condition. fn suspend(&self) { - log::warn!("USB suspend called, doing nothing"); + log::info!("{}USB.SUSPEND,{}", xous::BOOKEND_START, xous::BOOKEND_END); + log::warn!("USB suspend called; this implementation does nothing."); } /// Resumes from suspend mode. This may only be called after the peripheral has been previously /// suspended. fn resume(&self) { - log::warn!("USB resume called, but suspend is not implemented"); + log::info!("{}USB.RESUME,{}", xous::BOOKEND_START, xous::BOOKEND_END); + log::info!("USB resume called."); } /// Gets information about events and incoming data. Usually called in a loop or from an diff --git a/services/usb-test/Cargo.toml b/services/usb-test/Cargo.toml index aedf99f08..f15235a64 100644 --- a/services/usb-test/Cargo.toml +++ b/services/usb-test/Cargo.toml @@ -5,7 +5,7 @@ authors = ["bunnie "] edition = "2018" description = "USB test & development stub" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] xous = { path = "../../xous-rs" } log-server = { path = "../log-server" } diff --git a/services/xous-names/Cargo.toml b/services/xous-names/Cargo.toml index a04ac7b71..9209b1a04 100644 --- a/services/xous-names/Cargo.toml +++ b/services/xous-names/Cargo.toml @@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0" repository = "https://github.com/betrusted-io/xous-core/" homepage = "https://betrusted.io/" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] num-derive = {version = "0.3.3", default-features = false} num-traits = {version = "0.2.14", default-features = false} diff --git a/svd2repl/Cargo.toml b/svd2repl/Cargo.toml index 18bc23fe5..13e41f95f 100644 --- a/svd2repl/Cargo.toml +++ b/svd2repl/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] quick-xml = "0.19.0" clap = "2.33.3" diff --git a/svd2utra/Cargo.toml b/svd2utra/Cargo.toml index af365fb9c..3443a4e33 100644 --- a/svd2utra/Cargo.toml +++ b/svd2utra/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] quick-xml = "0.19.0" clap = "2.33.3" diff --git a/tools/Cargo.toml b/tools/Cargo.toml index 7479db929..31d6efee7 100644 --- a/tools/Cargo.toml +++ b/tools/Cargo.toml @@ -7,7 +7,7 @@ version = "0.1.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] bitflags = "1.2.1" clap = "2.33.3" diff --git a/tools/wycheproof-import/Cargo.toml b/tools/wycheproof-import/Cargo.toml index fdf2a0040..70c56c410 100644 --- a/tools/wycheproof-import/Cargo.toml +++ b/tools/wycheproof-import/Cargo.toml @@ -3,7 +3,7 @@ name = "wycheproof-import" version = "0.1.0" edition = "2018" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] eyre = "0.6.5" serde = { version = "1.0.129", features = ["derive"] } diff --git a/utralib/Cargo.toml b/utralib/Cargo.toml index f980da7a1..b5d1a05ab 100644 --- a/utralib/Cargo.toml +++ b/utralib/Cargo.toml @@ -9,7 +9,7 @@ std = [] default_features = ["std"] -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] [build-dependencies] diff --git a/xous-ipc/Cargo.toml b/xous-ipc/Cargo.toml index ecb866f6f..8bf09dd93 100644 --- a/xous-ipc/Cargo.toml +++ b/xous-ipc/Cargo.toml @@ -8,7 +8,7 @@ version = "0.9.7" repository = "https://github.com/betrusted-io/xous-core/" homepage = "https://betrusted.io/" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] bitflags = {version = "1"} rkyv = {version = "0.4.3", features = ["const_generics"], default-features = false} diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index 06aa0299f..e84e48733 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Sean Cross "] edition = "2018" rust-version = "1.59" -# Dependency policy: fully specify dependencies to the minor version number +# Dependency versions enforced by Cargo.lock. [dependencies] atty = "0.2.14" filetime = "0.2.14"