diff --git a/Cargo.lock b/Cargo.lock index a9dce4aa4..ff5a885e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -118,7 +118,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -292,7 +292,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -577,7 +577,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -612,7 +612,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -715,7 +715,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -746,7 +746,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -864,7 +864,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", "xous-pio", "xous-pl230", ] @@ -1151,7 +1151,7 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" [[package]] name = "curve25519-dalek" version = "4.1.2" -source = "git+https://github.com/betrusted-io/curve25519-dalek.git?branch=main#468e304624b4bc4004863c9147176238cfc0dc10" +source = "git+https://github.com/betrusted-io/curve25519-dalek.git?branch=main#c8fbc82e2cffbb7c86b5b7309a634ff85968bdf0" dependencies = [ "cfg-if", "cpufeatures", @@ -1170,7 +1170,7 @@ dependencies = [ [[package]] name = "curve25519-dalek-derive" version = "0.1.1" -source = "git+https://github.com/betrusted-io/curve25519-dalek.git?branch=main#468e304624b4bc4004863c9147176238cfc0dc10" +source = "git+https://github.com/betrusted-io/curve25519-dalek.git?branch=main#c8fbc82e2cffbb7c86b5b7309a634ff85968bdf0" dependencies = [ "proc-macro2", "quote", @@ -1453,7 +1453,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1478,7 +1478,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2030,7 +2030,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2099,7 +2099,7 @@ dependencies = [ "wasm-bindgen-test", "xous", "xous-api-names", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2139,7 +2139,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2232,7 +2232,7 @@ dependencies = [ "xous", "xous-api-log", "xous-api-names", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2295,7 +2295,7 @@ dependencies = [ "xous", "xous-api-log", "xous-api-names", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2448,7 +2448,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2462,7 +2462,7 @@ dependencies = [ "rkyv", "xous", "xous-api-names", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2479,7 +2479,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2498,7 +2498,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2613,7 +2613,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2653,7 +2653,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2780,7 +2780,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -2945,7 +2945,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2980,7 +2980,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3010,7 +3010,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3051,7 +3051,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -3496,7 +3496,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", "zeroize", "zeroize_derive", ] @@ -4107,7 +4107,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4148,7 +4148,7 @@ dependencies = [ "windows-sys 0.52.0", "xous", "xous-api-names", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4213,7 +4213,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", "zeroize", ] @@ -4517,7 +4517,7 @@ dependencies = [ [[package]] name = "sha2" version = "0.10.8" -source = "git+https://github.com/betrusted-io/hashes.git?branch=sha2-v0.10.8-xous#9e4f31ab3fa63598d63167b36204bc67c0bb1ed1" +source = "git+https://github.com/betrusted-io/hashes.git?branch=sha2-v0.10.8-xous#58d62fc320d201ea2b86d36f3443442b35633969" dependencies = [ "cfg-if", "cpufeatures", @@ -4533,7 +4533,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4618,7 +4618,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4730,7 +4730,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4801,7 +4801,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -4953,7 +4953,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5110,7 +5110,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5229,7 +5229,7 @@ dependencies = [ "xous", "xous-api-log", "xous-api-names", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5249,7 +5249,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5266,7 +5266,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", "xous-tts-backend", ] @@ -5431,7 +5431,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", "xous-usb-hid", ] @@ -5646,7 +5646,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", "xous-usb-hid", ] @@ -6185,7 +6185,7 @@ checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[package]] name = "xous" -version = "0.9.58" +version = "0.9.59" dependencies = [ "compiler_builtins", "lazy_static", @@ -6194,22 +6194,22 @@ dependencies = [ [[package]] name = "xous-api-log" -version = "0.1.54" +version = "0.1.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941f7fd7c114e1e0c401bbbe8222e8adbb4bc8ebeb782f7812d8f1678a578934" +checksum = "c24045961cf1ce8bb923a70089d69fca9f1deedc391c5f751f2b40dc7c7d635b" dependencies = [ "log", "num-derive 0.3.3", "num-traits", "xous", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "xous-api-names" -version = "0.9.56" +version = "0.9.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "471502d9379d198738ec55dec7cd688ce21e1cfe7d93af6dad25e38c1c404d1c" +checksum = "68d97f22d491bbb9f039da4fb69f1a09d77ee2f71b8b1da6adf5bc293d259e05" dependencies = [ "log", "num-derive 0.3.3", @@ -6217,14 +6217,14 @@ dependencies = [ "rkyv", "xous", "xous-api-log", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "xous-api-susres" -version = "0.9.54" +version = "0.9.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7554497b3b3c07bd70948f1b997dd5692643996972e13388798306ac26588b2c" +checksum = "4cdd6f8ed55de2402462b461a42b8983cbf3fc71b7b306061a3178081a1fec29" dependencies = [ "log", "num-derive 0.3.3", @@ -6234,14 +6234,14 @@ dependencies = [ "xous", "xous-api-log", "xous-api-names", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "xous-api-ticktimer" -version = "0.9.54" +version = "0.9.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9e8bb005478553d38da42fcfe001d833d7ac4bb1065f6d88164547ac0e2294c" +checksum = "c9369db561ecd62aa0891cac0cee28e26f696da603d251c23e1dc42c9670a571" dependencies = [ "log", "num-derive 0.3.3", @@ -6251,13 +6251,13 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] [[package]] name = "xous-ipc" -version = "0.9.58" +version = "0.9.59" dependencies = [ "bitflags 1.3.2", "rkyv", @@ -6266,9 +6266,9 @@ dependencies = [ [[package]] name = "xous-ipc" -version = "0.9.58" +version = "0.9.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f5081581314f115e2005403ee2cc0957d86cbfc49edf6e8b05d2fcf6c226c5d" +checksum = "f9c3620f8d85beb70474ccc6708961e82194fb95e3cc8c86fc5d480a10413120" dependencies = [ "bitflags 1.3.2", "rkyv", @@ -6308,7 +6308,7 @@ dependencies = [ "utralib 0.1.24", "xous", "xous-api-log", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -6323,7 +6323,7 @@ dependencies = [ "xous", "xous-api-log", "xous-api-names", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -6381,7 +6381,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -6395,7 +6395,7 @@ dependencies = [ "xous", "xous-api-log", "xous-api-names", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -6412,7 +6412,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -6428,7 +6428,7 @@ dependencies = [ "rkyv", "xous", "xous-api-names", - "xous-ipc 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.59 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/RELEASE-v0.9.md b/RELEASE-v0.9.md index a83987212..f79f9173e 100644 --- a/RELEASE-v0.9.md +++ b/RELEASE-v0.9.md @@ -473,6 +473,8 @@ perform the Xous firmware upgrade. This requires running manual update commands, - change kernel and loader targets to riscv-unknown-elf-none because `xous` is now a proper target (required for Rust 1.76 compatibility) - `curve25519-dalek` API is now at 4.1.2, thanks to @kotval for pulling it together. The new API removes `engine-25519` and rolls hardware allocate/release into the forked crate, similar to how sha2 was ported. `engine-25519` crate now removed from source tree, as it is now depracted since all the functionality was pulled into `curve25519-dalek`. - keymap is checked on every call to send a key to the USB keyboard. This allows us to toggle the keymap temporarily to allow typing into hosts with a different keymap (instead of requiring a reboot) +- Encrypted swap introduced: encrypted swap will allow Xous to run on microcontrollers that have small internal memory footprints, and rely on external SPI RAM for backing storage. This should create a step function in physical security when running on a microcontroller with sufficient internal protected RAM to hold the working set and core OS, as it will complicated attacks that attempt to read out off-chip RAM. +- So far, the kernel API calls to support encrypted swap are in place. Still remaining are image creation, loader setup, and the actual swapper itself. ## Roadmap - Lots of testing and bug fixes diff --git a/api/xous-api-log/Cargo.toml b/api/xous-api-log/Cargo.toml index 55e7d045b..48579c4b6 100644 --- a/api/xous-api-log/Cargo.toml +++ b/api/xous-api-log/Cargo.toml @@ -3,15 +3,15 @@ authors = ["Sean Cross "] description = "Log server API" edition = "2018" name = "xous-api-log" -version = "0.1.54" +version = "0.1.55" license = "MIT OR Apache-2.0" repository = "https://github.com/betrusted-io/xous-core/" homepage = "https://betrusted.io/xous-book/" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.58" -xous-ipc = "0.9.58" +xous = "0.9.59" +xous-ipc = "0.9.59" log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } diff --git a/api/xous-api-names/Cargo.toml b/api/xous-api-names/Cargo.toml index 2dab7ab74..1c550bac9 100644 --- a/api/xous-api-names/Cargo.toml +++ b/api/xous-api-names/Cargo.toml @@ -3,16 +3,16 @@ authors = ["bunnie "] description = "Xous microkernel OS inter-process name resolution server" edition = "2018" name = "xous-api-names" -version = "0.9.56" +version = "0.9.57" license = "MIT OR Apache-2.0" repository = "https://github.com/betrusted-io/xous-core/" homepage = "https://betrusted.io/" # Dependency versions enforced by Cargo.lock. [dependencies] -log-server = { package = "xous-api-log", version = "0.1.54" } -xous = "0.9.58" -xous-ipc = "0.9.58" +log-server = { package = "xous-api-log", version = "0.1.55" } +xous = "0.9.59" +xous-ipc = "0.9.59" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } log = "0.4.14" diff --git a/api/xous-api-susres/Cargo.toml b/api/xous-api-susres/Cargo.toml index 72db3c1cb..0cc491bab 100644 --- a/api/xous-api-susres/Cargo.toml +++ b/api/xous-api-susres/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xous-api-susres" -version = "0.9.54" +version = "0.9.55" authors = ["bunnie "] edition = "2018" description = "Manager of suspend/resume operations" @@ -10,10 +10,10 @@ homepage = "https://betrusted.io/xous-book/" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.58" -xous-ipc = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +xous-ipc = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } diff --git a/api/xous-api-ticktimer/Cargo.toml b/api/xous-api-ticktimer/Cargo.toml index 3f3a72c29..a071de9e4 100644 --- a/api/xous-api-ticktimer/Cargo.toml +++ b/api/xous-api-ticktimer/Cargo.toml @@ -3,18 +3,18 @@ authors = ["bunnie ", "Sean Cross "] description = "Provide high-resolution, non-rollover system time" edition = "2018" name = "xous-api-ticktimer" -version = "0.9.54" +version = "0.9.55" license = "MIT OR Apache-2.0" repository = "https://github.com/betrusted-io/xous-core/" homepage = "https://betrusted.io/xous-book/" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.58" -xous-ipc = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -susres = { package = "xous-api-susres", version = "0.9.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +xous-ipc = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +susres = { package = "xous-api-susres", version = "0.9.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } log = "0.4.14" rkyv = { version = "0.4.3", default-features = false, features = [ "const_generics", diff --git a/apps/app-loader/Cargo.toml b/apps/app-loader/Cargo.toml index 352fe568d..e5f1e09da 100644 --- a/apps/app-loader/Cargo.toml +++ b/apps/app-loader/Cargo.toml @@ -7,15 +7,15 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -xous = "0.9.58" -xous-ipc = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } +xous = "0.9.59" +xous-ipc = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } log = "0.4.14" -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous-names = { package = "xous-api-names", version = "0.9.57" } gam = { path = "../../services/gam" } graphics-server = { path = "../../services/graphics-server" } modals = { path = "../../services/modals" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } locales = { path = "../../locales" } num-derive = { version = "0.3.3", default-features = false } diff --git a/apps/app-loader/spawn/Cargo.toml b/apps/app-loader/spawn/Cargo.toml index a5ee17f95..a2eebc075 100644 --- a/apps/app-loader/spawn/Cargo.toml +++ b/apps/app-loader/spawn/Cargo.toml @@ -6,6 +6,6 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -xous = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54", features = ["nostd"] } +xous = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55", features = ["nostd"] } log = "0.4.17" diff --git a/apps/ball/Cargo.toml b/apps/ball/Cargo.toml index e4f79d6b1..55919ff81 100644 --- a/apps/ball/Cargo.toml +++ b/apps/ball/Cargo.toml @@ -10,11 +10,11 @@ description = "Ball demo app" log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous = "0.9.58" -xous-ipc = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +xous-ipc = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } gam = { path = "../../services/gam" } trng = { path = "../../services/trng" } modals = { path = "../../services/modals" } diff --git a/apps/chat-test/Cargo.toml b/apps/chat-test/Cargo.toml index e74c1078e..b5d7f61d7 100644 --- a/apps/chat-test/Cargo.toml +++ b/apps/chat-test/Cargo.toml @@ -10,11 +10,11 @@ description = "Chat UI test routines" log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous = "0.9.58" -xous-ipc = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +xous-ipc = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } gam = { path = "../../services/gam" } graphics-server = { path = "../../services/graphics-server" } trng = { path = "../../services/trng" } diff --git a/apps/hello/Cargo.toml b/apps/hello/Cargo.toml index 75b535074..287e9ee5c 100644 --- a/apps/hello/Cargo.toml +++ b/apps/hello/Cargo.toml @@ -7,10 +7,10 @@ edition = "2021" log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous = "0.9.58" -xous-ipc = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +xous-ipc = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } gam = { path = "../../services/gam" } graphics-server = { path = "../../services/graphics-server" } locales = { path = "../../locales" } diff --git a/apps/hidv2/Cargo.toml b/apps/hidv2/Cargo.toml index c4378bc81..eb0281fdb 100644 --- a/apps/hidv2/Cargo.toml +++ b/apps/hidv2/Cargo.toml @@ -7,10 +7,10 @@ edition = "2021" log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous = "0.9.58" -xous-ipc = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +xous-ipc = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } gam = { path = "../../services/gam" } graphics-server = { path = "../../services/graphics-server" } locales = { path = "../../locales" } diff --git a/apps/mtxchat/Cargo.toml b/apps/mtxchat/Cargo.toml index 02a381131..5b76a0bca 100644 --- a/apps/mtxchat/Cargo.toml +++ b/apps/mtxchat/Cargo.toml @@ -10,11 +10,11 @@ description = "Matrix chat" log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous = "0.9.58" -xous-ipc = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +xous-ipc = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } gam = { path = "../../services/gam" } graphics-server = { path = "../../services/graphics-server" } trng = { path = "../../services/trng" } diff --git a/apps/mtxcli/Cargo.toml b/apps/mtxcli/Cargo.toml index e106e722d..7d7702df5 100644 --- a/apps/mtxcli/Cargo.toml +++ b/apps/mtxcli/Cargo.toml @@ -10,11 +10,11 @@ description = "Matrix chat" log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous = "0.9.58" -xous-ipc = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +xous-ipc = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } gam = { path = "../../services/gam" } graphics-server = { path = "../../services/graphics-server" } trng = { path = "../../services/trng" } diff --git a/apps/repl/Cargo.toml b/apps/repl/Cargo.toml index a5910a8f9..cac3f5264 100644 --- a/apps/repl/Cargo.toml +++ b/apps/repl/Cargo.toml @@ -10,11 +10,11 @@ description = "REPL demo app" log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous = "0.9.58" -xous-ipc = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +xous-ipc = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } gam = { path = "../../services/gam" } graphics-server = { path = "../../services/graphics-server" } trng = { path = "../../services/trng" } diff --git a/apps/transientdisk/Cargo.toml b/apps/transientdisk/Cargo.toml index af5de47b3..88b783e42 100644 --- a/apps/transientdisk/Cargo.toml +++ b/apps/transientdisk/Cargo.toml @@ -9,10 +9,10 @@ edition = "2021" log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous = "0.9.58" -xous-ipc = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +xous-ipc = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } gam = { path = "../../services/gam" } graphics-server = { path = "../../services/graphics-server" } usb-device-xous = { path = "../../services/usb-device-xous" } diff --git a/apps/vault/Cargo.toml b/apps/vault/Cargo.toml index 50a7e10fc..fe8eeaa01 100644 --- a/apps/vault/Cargo.toml +++ b/apps/vault/Cargo.toml @@ -7,13 +7,13 @@ edition = "2018" log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous = "0.9.58" -xous-ipc = "0.9.58" +xous = "0.9.59" +xous-ipc = "0.9.59" rkyv = { version = "0.4.3", features = [ "const_generics", ], default-features = false } -log-server = { package = "xous-api-log", version = "0.1.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +log-server = { package = "xous-api-log", version = "0.1.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } gam = { path = "../../services/gam" } graphics-server = { path = "../../services/graphics-server" } locales = { path = "../../locales" } @@ -23,7 +23,7 @@ xous-usb-hid = { git = "https://github.com/betrusted-io/xous-usb-hid.git", branc pddb = { path = "../../services/pddb" } modals = { path = "../../services/modals" } trng = { path = "../../services/trng" } -susres = { package = "xous-api-susres", version = "0.9.54" } +susres = { package = "xous-api-susres", version = "0.9.55" } ime-plugin-api = { path = "../../services/ime-plugin-api" } content-plugin-api = { path = "../../services/content-plugin-api" } # all content canvas providers must provide this API backup = { path = "libraries/backup" } @@ -31,7 +31,7 @@ byteorder = { version = "1.4.3", default-features = false } arrayref = "0.3.6" subtle = { version = "2.5.0", features = ["core_hint_black_box"] } rand_core = "0.6.3" -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } userprefs = { path = "../../libs/userprefs" } # opensk diff --git a/apps/vault/libraries/crypto/Cargo.toml b/apps/vault/libraries/crypto/Cargo.toml index 0b870349a..cb2dc35f7 100644 --- a/apps/vault/libraries/crypto/Cargo.toml +++ b/apps/vault/libraries/crypto/Cargo.toml @@ -14,7 +14,7 @@ cbor = { path = "../cbor" } arrayref = "0.3.6" subtle = { version = "2.2.3", default-features = false } trng = { path = "../../../../services/trng" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous-names = { package = "xous-api-names", version = "0.9.57" } rand_core = "0.6.3" p256 = { version = "0.10.1", default-features = false, features = [ "ecdsa", diff --git a/apps/vault/src/vendor_commands.rs b/apps/vault/src/vendor_commands.rs index 4b8e6fbc9..3f52b46b8 100644 --- a/apps/vault/src/vendor_commands.rs +++ b/apps/vault/src/vendor_commands.rs @@ -194,6 +194,7 @@ pub fn handle_vendor_command(session: &mut VendorSession, allow_host: bool) -> H } #[derive(Debug)] +#[allow(dead_code)] enum BackupError { CborError(DecoderError), CborConversionError(backup::CborConversionError), diff --git a/imports/getrandom/Cargo.toml b/imports/getrandom/Cargo.toml index 68ce2f41e..7f56d1d4b 100644 --- a/imports/getrandom/Cargo.toml +++ b/imports/getrandom/Cargo.toml @@ -30,9 +30,9 @@ js-sys = { version = "0.3", optional = true } wasm-bindgen-test = "0.3.18" [target.'cfg(target_os = "xous")'.dependencies] -xous-names = {package = "xous-api-names", version = "0.9.56"} -xous = "0.9.58" -xous-ipc = "0.9.58" +xous-names = {package = "xous-api-names", version = "0.9.57"} +xous = "0.9.59" +xous-ipc = "0.9.59" rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]} diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 93e3d96be..311df89ed 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -11,7 +11,7 @@ resolver = "2" [dependencies] bitflags = "1.2.1" stats_alloc = { version = "0.1.8", optional = true } -xous-kernel = { package = "xous", version = "0.9.58", features = [ +xous-kernel = { package = "xous", version = "0.9.59", features = [ "forget-memory-messages", ] } utralib = { version = "0.1.24", optional = true, default_features = false } @@ -19,7 +19,7 @@ rand_chacha = { version = "0.3.1", optional = true, default_features = false } cramium-hal = { path = "../libs/cramium-hal", optional = true, default_features = false } [target.'cfg(any(windows,unix))'.dev-dependencies] -xous-kernel = { package = "xous", version = "0.9.58", features = [ +xous-kernel = { package = "xous", version = "0.9.59", features = [ "forget-memory-messages", "processes-as-threads", ] } @@ -35,7 +35,7 @@ armv7 = { git = "https://github.com/Foundation-Devices/armv7.git", branch = "upd ] } # FIXME: bring atsama5d27 target up to date so utralib dependency does not conflict # atsama5d27 = { git = "https://github.com/Foundation-Devices/atsama5d27.git", branch = "master" } -xous-kernel = { package = "xous", version = "0.9.58", features = ["v2p"] } +xous-kernel = { package = "xous", version = "0.9.59", features = ["v2p"] } critical-section = "1.1.1" [features] diff --git a/kernel/src/arch/riscv/irq.rs b/kernel/src/arch/riscv/irq.rs index c438e3b8c..e9f4f5ee8 100644 --- a/kernel/src/arch/riscv/irq.rs +++ b/kernel/src/arch/riscv/irq.rs @@ -9,9 +9,12 @@ use xous_kernel::{SysCall, PID, TID}; use crate::arch::current_pid; use crate::arch::exception::RiscvException; use crate::arch::mem::MemoryMapping; +#[cfg(feature = "swap")] +use crate::arch::process::RETURN_FROM_SWAPPER; use crate::arch::process::{Process as ArchProcess, RETURN_FROM_EXCEPTION_HANDLER}; -use crate::arch::process::{Thread, EXIT_THREAD, RETURN_FROM_ISR, RETURN_FROM_SWAPPER}; +use crate::arch::process::{Thread, EXIT_THREAD, RETURN_FROM_ISR}; use crate::services::SystemServices; +#[cfg(feature = "swap")] use crate::swap::Swap; extern "Rust" { @@ -307,7 +310,7 @@ pub extern "C" fn trap_handler( crate::arch::syscall::resume(current_pid().get() == 1, process.current_thread()) }); } - + #[cfg(feature = "swap")] RiscvException::InstructionPageFault(RETURN_FROM_SWAPPER, _offset) => { #[cfg(feature = "debug-swap")] { diff --git a/kernel/src/arch/riscv/mem.rs b/kernel/src/arch/riscv/mem.rs index 1dc385ff1..aed182ed5 100644 --- a/kernel/src/arch/riscv/mem.rs +++ b/kernel/src/arch/riscv/mem.rs @@ -10,6 +10,7 @@ use xous_kernel::{MemoryFlags, PID}; use crate::arch::process::InitialProcess; use crate::mem::MemoryManager; +#[cfg(feature = "swap")] use crate::swap::Swap; // pub const DEFAULT_STACK_TOP: usize = 0x8000_0000; diff --git a/kernel/src/main.rs b/kernel/src/main.rs index 559f115dd..07302f12e 100644 --- a/kernel/src/main.rs +++ b/kernel/src/main.rs @@ -42,6 +42,7 @@ use xous_kernel::*; /// /// This is safe to call only to initialize the kernel. pub unsafe extern "C" fn init(arg_offset: *const u32, init_offset: *const u32, rpt_offset: *mut u32) { + #[cfg(feature = "swap")] use crate::swap::Swap; args::KernelArguments::init(arg_offset); diff --git a/kernel/src/services.rs b/kernel/src/services.rs index 547ef0608..09f25d3fe 100644 --- a/kernel/src/services.rs +++ b/kernel/src/services.rs @@ -33,6 +33,7 @@ const MINIELF_FLG_X: u8 = 4; const MINIELF_FLG_EHF: u8 = 8; #[derive(Debug)] +#[allow(dead_code)] // suppresses unused warnings in hosted mode pub enum CallbackType { /// args: irq_no, arg Interrupt(usize, *mut usize), @@ -267,6 +268,7 @@ impl Process { } /// Reveal state for debugging outside the crate. + #[cfg(all(feature = "swap", baremetal))] pub fn state(&self) -> ProcessState { self.state } } diff --git a/libs/chat/Cargo.toml b/libs/chat/Cargo.toml index fa5710618..05866305e 100644 --- a/libs/chat/Cargo.toml +++ b/libs/chat/Cargo.toml @@ -10,11 +10,11 @@ description = "Chat UI over pddb records" log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous = "0.9.58" -xous-ipc = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +xous-ipc = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } gam = { path = "../../services/gam" } graphics-server = { path = "../../services/graphics-server" } trng = { path = "../../services/trng" } diff --git a/libs/cramium-hal/Cargo.toml b/libs/cramium-hal/Cargo.toml index c74581cd8..f085a8d95 100644 --- a/libs/cramium-hal/Cargo.toml +++ b/libs/cramium-hal/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -xous-api-names = { version = "0.9.56", optional = true } +xous-api-names = { version = "0.9.57", optional = true } log = { version = "0.4.14", optional = true } utralib = { version = "0.1.24", default-features = false, features = [ "cramium-soc", @@ -19,7 +19,7 @@ num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } # [target.'cfg(target_os = "xous")'.dependencies] -xous = { version = "0.9.58", features = ["v2p"] } +xous = { version = "0.9.59", features = ["v2p"] } [features] std = ["log", "xous-api-names"] diff --git a/libs/mass-storage/usbd_bulk_only_transport/Cargo.toml b/libs/mass-storage/usbd_bulk_only_transport/Cargo.toml index e804351d7..074020975 100644 --- a/libs/mass-storage/usbd_bulk_only_transport/Cargo.toml +++ b/libs/mass-storage/usbd_bulk_only_transport/Cargo.toml @@ -20,7 +20,7 @@ typenum = "1.11.2" usbd_mass_storage = { version = "0.1.0", path = "../usbd_mass_storage" } packing = { version = "0.2.0", path = "../packing/packing" } log = "0.4.17" -xous = "0.9.58" -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } +xous = "0.9.59" +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } [features] diff --git a/libs/mass-storage/usbd_scsi/Cargo.toml b/libs/mass-storage/usbd_scsi/Cargo.toml index 4eea295c2..68a56b6c3 100644 --- a/libs/mass-storage/usbd_scsi/Cargo.toml +++ b/libs/mass-storage/usbd_scsi/Cargo.toml @@ -22,7 +22,7 @@ usbd_mass_storage = { version = "0.1.0", path = "../usbd_mass_storage" } packing = { version = "0.2.0", path = "../packing/packing" } usbd_bulk_only_transport = { version = "0.1.0", path = "../usbd_bulk_only_transport" } log = "0.4.17" -xous = "0.9.58" -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } +xous = "0.9.59" +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } [features] diff --git a/libs/perflib/Cargo.toml b/libs/perflib/Cargo.toml index 31c93abde..8a286408e 100644 --- a/libs/perflib/Cargo.toml +++ b/libs/perflib/Cargo.toml @@ -7,7 +7,7 @@ description = "Performance counter tooling" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.58" +xous = "0.9.59" log = "0.4.14" utralib = { version = "0.1.24", default-features = false } diff --git a/libs/tls/Cargo.toml b/libs/tls/Cargo.toml index 6d03a90df..e27d7d618 100644 --- a/libs/tls/Cargo.toml +++ b/libs/tls/Cargo.toml @@ -9,11 +9,11 @@ version = "0.1.0" log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous = "0.9.58" -xous-ipc = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +xous-ipc = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } modals = { path = "../../services/modals" } net = { path = "../../services/net" } diff --git a/libs/userprefs/Cargo.toml b/libs/userprefs/Cargo.toml index 82ba6e364..58230baa8 100644 --- a/libs/userprefs/Cargo.toml +++ b/libs/userprefs/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous-names = { package = "xous-api-names", version = "0.9.57" } pddb = { path = "../../services/pddb" } keyboard = { path = "../../services/keyboard" } bincode = { version = "2.0.0-rc.2" } diff --git a/libs/xous-bio/Cargo.toml b/libs/xous-bio/Cargo.toml index 4bacb1c10..5f72b8320 100644 --- a/libs/xous-bio/Cargo.toml +++ b/libs/xous-bio/Cargo.toml @@ -11,7 +11,7 @@ defmt = { version = "0.3", optional = true } utralib = { version = "0.1.24", default-features = false, features = ["cramium-soc"] } [target.'cfg(target_os = "xous")'.dependencies] -xous = "0.9.58" +xous = "0.9.59" [features] cramium-soc = ["utralib/cramium-soc"] diff --git a/libs/xous-pio/Cargo.toml b/libs/xous-pio/Cargo.toml index b32cd09db..2a4b28e14 100644 --- a/libs/xous-pio/Cargo.toml +++ b/libs/xous-pio/Cargo.toml @@ -13,7 +13,7 @@ defmt = { version = "0.3", optional = true } utralib = { version = "0.1.24", default-features = false } [target.'cfg(target_os = "xous")'.dependencies] -xous = "0.9.58" +xous = "0.9.59" [features] cramium-soc = ["utralib/cramium-soc"] diff --git a/libs/xous-pl230/Cargo.toml b/libs/xous-pl230/Cargo.toml index c46ee2bc6..a3dbc4df7 100644 --- a/libs/xous-pl230/Cargo.toml +++ b/libs/xous-pl230/Cargo.toml @@ -15,7 +15,7 @@ pio = "0.2.1" cramium-hal = { path = "../cramium-hal", optional = true, default-features = false } [target.'cfg(target_os = "xous")'.dependencies] -xous = "0.9.58" +xous = "0.9.59" [features] cramium-soc = ["utralib/cramium-soc"] diff --git a/publish.py b/publish.py index 311562ed9..efe8ea89e 100644 --- a/publish.py +++ b/publish.py @@ -249,7 +249,7 @@ def main(): print("Can't simultaneously change to local and remote paths. Pick only one operation.") exit(1) - crate_roots = ['.', '../hashes/sha2'] + crate_roots = ['.', '../hashes/sha2', '../curve25519-dalek/curve25519-dalek'] if args.bump or args.local_paths or args.remote_paths: cargo_toml_paths = [] diff --git a/services/aes-test/Cargo.toml b/services/aes-test/Cargo.toml index 871de32f9..6c94b2b01 100644 --- a/services/aes-test/Cargo.toml +++ b/services/aes-test/Cargo.toml @@ -10,8 +10,8 @@ version = "0.1.0" aes = { path = "../aes" } hex-literal = "0.3.1" log = "0.4.14" -log-server = { package = "xous-api-log", version = "0.1.54" } -xous = "0.9.58" +log-server = { package = "xous-api-log", version = "0.1.55" } +xous = "0.9.59" [features] default = [] diff --git a/services/codec/Cargo.toml b/services/codec/Cargo.toml index 8f660fa99..d30779e86 100644 --- a/services/codec/Cargo.toml +++ b/services/codec/Cargo.toml @@ -7,16 +7,16 @@ description = "Audio CODEC server" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } log = "0.4.14" -susres = { package = "xous-api-susres", version = "0.9.54" } +susres = { package = "xous-api-susres", version = "0.9.55" } llio = { path = "../llio" } trng = { path = "../trng" } -xous-ipc = "0.9.58" +xous-ipc = "0.9.59" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } rkyv = { version = "0.4.3", default-features = false, features = [ diff --git a/services/com/Cargo.toml b/services/com/Cargo.toml index fd1deae2d..5d1e46853 100644 --- a/services/com/Cargo.toml +++ b/services/com/Cargo.toml @@ -9,13 +9,13 @@ version = "0.1.0" [dependencies] com_rs = { git = "https://github.com/betrusted-io/com_rs", rev = "891bdd3ca8e41f81510d112483e178aea3e3a921" } log = "0.4.14" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -susres = { package = "xous-api-susres", version = "0.9.54" } +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +susres = { package = "xous-api-susres", version = "0.9.55" } typenum = "1.12" -xous = "0.9.58" -xous-ipc = "0.9.58" -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +xous-ipc = "0.9.59" +xous-names = { package = "xous-api-names", version = "0.9.57" } trng = { path = "../trng" } llio = { path = "../llio" } diff --git a/services/content-plugin-api/Cargo.toml b/services/content-plugin-api/Cargo.toml index d555e5132..017f4154d 100644 --- a/services/content-plugin-api/Cargo.toml +++ b/services/content-plugin-api/Cargo.toml @@ -7,8 +7,8 @@ description = "Content Canvas Plugin Common APIs" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.58" +xous = "0.9.59" rkyv = { version = "0.4.3", default_features = false } graphics-server = { path = "../graphics-server" } # this is used by the IMEF portion of the API -xous-names = { package = "xous-api-names", version = "0.9.56" } # used by the IMEF for registering listeners +xous-names = { package = "xous-api-names", version = "0.9.57" } # used by the IMEF for registering listeners log = "0.4.14" diff --git a/services/cram-console/Cargo.toml b/services/cram-console/Cargo.toml index 75d3e5564..a6e666fe6 100644 --- a/services/cram-console/Cargo.toml +++ b/services/cram-console/Cargo.toml @@ -7,10 +7,10 @@ edition = "2021" [dependencies] utralib = { version = "0.1.24", optional = true, default-features = false } -xous-api-names = "0.9.56" -xous-api-ticktimer = "0.9.54" -xous = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } +xous-api-names = "0.9.57" +xous-api-ticktimer = "0.9.55" +xous = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } log = "0.4.14" xous-pio = { path = "../../libs/xous-pio", optional = true } xous-pl230 = { path = "../../libs/xous-pl230", optional = true } diff --git a/services/cram-hal-service/Cargo.toml b/services/cram-hal-service/Cargo.toml index 87e98926a..b5d678feb 100644 --- a/services/cram-hal-service/Cargo.toml +++ b/services/cram-hal-service/Cargo.toml @@ -9,11 +9,11 @@ edition = "2021" utralib = { version = "0.1.24", optional = true, default-features = false, features = [ "cramium-soc", ] } -xous-api-names = "0.9.56" -xous-api-ticktimer = "0.9.54" -xous = "0.9.58" -xous-ipc = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } +xous-api-names = "0.9.57" +xous-api-ticktimer = "0.9.55" +xous = "0.9.59" +xous-ipc = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } log = "0.4.14" cramium-hal = { path = "../../libs/cramium-hal", features = [ "derive-rkyv", diff --git a/services/cram-mbox1/Cargo.toml b/services/cram-mbox1/Cargo.toml index bf7b2cf26..5e831d525 100644 --- a/services/cram-mbox1/Cargo.toml +++ b/services/cram-mbox1/Cargo.toml @@ -7,10 +7,10 @@ edition = "2021" [dependencies] utralib = { version = "0.1.24", optional = true, default-features = false } -xous-api-names = "0.9.56" -xous-api-ticktimer = "0.9.54" -xous = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } +xous-api-names = "0.9.57" +xous-api-ticktimer = "0.9.55" +xous = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } diff --git a/services/cram-mbox2/Cargo.toml b/services/cram-mbox2/Cargo.toml index fec09f4a7..7994861ae 100644 --- a/services/cram-mbox2/Cargo.toml +++ b/services/cram-mbox2/Cargo.toml @@ -7,10 +7,10 @@ edition = "2021" [dependencies] utralib = { version = "0.1.24", optional = true, default-features = false } -xous-api-names = "0.9.56" -xous-api-ticktimer = "0.9.54" -xous = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } +xous-api-names = "0.9.57" +xous-api-ticktimer = "0.9.55" +xous = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } diff --git a/services/dns/Cargo.toml b/services/dns/Cargo.toml index 2fa6f882a..339d2a8ae 100644 --- a/services/dns/Cargo.toml +++ b/services/dns/Cargo.toml @@ -7,15 +7,15 @@ description = "Xous DNS resolver" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } net = { path = "../net" } -xous-ipc = "0.9.58" +xous-ipc = "0.9.59" rkyv = { version = "0.4.3", default-features = false, features = [ "const_generics", ] } @@ -30,7 +30,7 @@ chrono = { version = "0.4.33", default-features = false, features = ["std"] } sntpc = { version = "0.3.1" } #, features = ["log"] locales = { path = "../../locales" } gam = { path = "../gam" } -susres = { package = "xous-api-susres", version = "0.9.54" } +susres = { package = "xous-api-susres", version = "0.9.55" } userprefs = { path = "../../libs/userprefs" } modals = { path = "../modals" } diff --git a/services/early_settings/Cargo.toml b/services/early_settings/Cargo.toml index 8a55043cd..76ced5e05 100644 --- a/services/early_settings/Cargo.toml +++ b/services/early_settings/Cargo.toml @@ -11,12 +11,12 @@ log = { version = "0.4", features = [ "max_level_trace", "release_max_level_trace", ] } -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous = "0.9.58" -xous-ipc = "0.9.58" -xous-names = { package = "xous-api-names", version = "0.9.56" } -susres = { package = "xous-api-susres", version = "0.9.54" } +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous = "0.9.59" +xous-ipc = "0.9.59" +xous-names = { package = "xous-api-names", version = "0.9.57" } +susres = { package = "xous-api-susres", version = "0.9.55" } spinor = { path = "../../services/spinor" } num-derive = { version = "0.3.3", default-features = false } diff --git a/services/ffi-test/Cargo.toml b/services/ffi-test/Cargo.toml index f0ac08ffb..9bd7af674 100644 --- a/services/ffi-test/Cargo.toml +++ b/services/ffi-test/Cargo.toml @@ -7,14 +7,14 @@ description = "FFI test integration" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } -susres = { package = "xous-api-susres", version = "0.9.54" } +susres = { package = "xous-api-susres", version = "0.9.55" } ffi-sys = { path = "sys" } keyboard = { path = "../keyboard" } diff --git a/services/gam/Cargo.toml b/services/gam/Cargo.toml index 6c401f546..825f113d9 100644 --- a/services/gam/Cargo.toml +++ b/services/gam/Cargo.toml @@ -14,12 +14,12 @@ ime-plugin-api = { path = "../ime-plugin-api" } ime-plugin-shell = { path = "../ime-plugin-shell" } keyboard = { path = "../keyboard" } log = "0.4.14" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } trng = { path = "../trng" } -xous = "0.9.58" -xous-ipc = "0.9.58" -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +xous-ipc = "0.9.59" +xous-names = { package = "xous-api-names", version = "0.9.57" } num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } @@ -27,7 +27,7 @@ rkyv = { version = "0.4.3", default-features = false, features = [ "const_generics", ] } -susres = { package = "xous-api-susres", version = "0.9.54" } # used for the sleep now menu item +susres = { package = "xous-api-susres", version = "0.9.55" } # used for the sleep now menu item enum_dispatch = "0.3.7" # used for trait-based dispatch off of multiple layout objects. locales = { path = "../../locales" } diff --git a/services/graphics-server/Cargo.toml b/services/graphics-server/Cargo.toml index dec74e30b..33a70cdb3 100644 --- a/services/graphics-server/Cargo.toml +++ b/services/graphics-server/Cargo.toml @@ -9,14 +9,14 @@ version = "0.1.0" [dependencies] keyboard = { path = "../keyboard" } log = "0.4.14" -log-server = { package = "xous-api-log", version = "0.1.54" } -xous = "0.9.58" -susres = { package = "xous-api-susres", version = "0.9.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } +log-server = { package = "xous-api-log", version = "0.1.55" } +xous = "0.9.59" +susres = { package = "xous-api-susres", version = "0.9.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } locales = { path = "../../locales" } -xous-ipc = "0.9.58" -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous-ipc = "0.9.59" +xous-names = { package = "xous-api-names", version = "0.9.57" } num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } rkyv = { version = "0.4.3", default-features = false, features = [ diff --git a/services/ime-frontend/Cargo.toml b/services/ime-frontend/Cargo.toml index 7d23a544d..07e8e1d27 100644 --- a/services/ime-frontend/Cargo.toml +++ b/services/ime-frontend/Cargo.toml @@ -12,12 +12,12 @@ graphics-server = { path = "../graphics-server" } ime-plugin-api = { path = "../ime-plugin-api" } keyboard = { path = "../keyboard" } log = "0.4.14" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous = "0.9.58" +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous = "0.9.59" locales = { path = "../../locales" } -xous-ipc = "0.9.58" -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous-ipc = "0.9.59" +xous-names = { package = "xous-api-names", version = "0.9.57" } num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } diff --git a/services/ime-plugin-api/Cargo.toml b/services/ime-plugin-api/Cargo.toml index 1f571d5e2..f535e6d53 100644 --- a/services/ime-plugin-api/Cargo.toml +++ b/services/ime-plugin-api/Cargo.toml @@ -9,9 +9,9 @@ version = "0.1.0" [dependencies] graphics-server = { path = "../graphics-server" } # this is used by the IMEF portion of the API log = "0.4.14" -xous = "0.9.58" -xous-ipc = "0.9.58" -xous-names = { package = "xous-api-names", version = "0.9.56" } # used by the IMEF for registering listeners +xous = "0.9.59" +xous-ipc = "0.9.59" +xous-names = { package = "xous-api-names", version = "0.9.57" } # used by the IMEF for registering listeners num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } diff --git a/services/ime-plugin-shell/Cargo.toml b/services/ime-plugin-shell/Cargo.toml index 6c43cb0cf..54d8a3d60 100644 --- a/services/ime-plugin-shell/Cargo.toml +++ b/services/ime-plugin-shell/Cargo.toml @@ -9,11 +9,11 @@ version = "0.1.0" [dependencies] ime-plugin-api = { path = "../ime-plugin-api" } log = "0.4.14" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous = "0.9.58" -xous-ipc = "0.9.58" -xous-names = { package = "xous-api-names", version = "0.9.56" } +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous = "0.9.59" +xous-ipc = "0.9.59" +xous-names = { package = "xous-api-names", version = "0.9.57" } num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } diff --git a/services/ime-plugin-tts/Cargo.toml b/services/ime-plugin-tts/Cargo.toml index d54d0dea4..ab06ebc18 100644 --- a/services/ime-plugin-tts/Cargo.toml +++ b/services/ime-plugin-tts/Cargo.toml @@ -9,11 +9,11 @@ version = "0.1.0" [dependencies] ime-plugin-api = { path = "../ime-plugin-api" } log = "0.4.14" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous = "0.9.58" -xous-ipc = "0.9.58" -xous-names = { package = "xous-api-names", version = "0.9.56" } +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous = "0.9.59" +xous-ipc = "0.9.59" +xous-names = { package = "xous-api-names", version = "0.9.57" } num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } diff --git a/services/jtag/Cargo.toml b/services/jtag/Cargo.toml index e221f7cdc..95983b6e4 100644 --- a/services/jtag/Cargo.toml +++ b/services/jtag/Cargo.toml @@ -7,16 +7,16 @@ description = "JTAG port server" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } -susres = { package = "xous-api-susres", version = "0.9.54" } +susres = { package = "xous-api-susres", version = "0.9.55" } -xous-ipc = "0.9.58" +xous-ipc = "0.9.59" rkyv = { version = "0.4.3", default-features = false, features = [ "const_generics", ] } diff --git a/services/kernel-test/Cargo.toml b/services/kernel-test/Cargo.toml index 7742d1190..01c297ba5 100644 --- a/services/kernel-test/Cargo.toml +++ b/services/kernel-test/Cargo.toml @@ -7,9 +7,9 @@ description = "Program to test various aspects of the kernel" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } +xous = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } log = "0.4.14" utralib = { version = "0.1.24", optional = true, default-features = false } diff --git a/services/keyboard/Cargo.toml b/services/keyboard/Cargo.toml index acf9dc872..9fe27543b 100644 --- a/services/keyboard/Cargo.toml +++ b/services/keyboard/Cargo.toml @@ -11,13 +11,13 @@ log = { version = "0.4", features = [ "max_level_trace", "release_max_level_trace", ] } -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous = "0.9.58" -xous-ipc = "0.9.58" -xous-names = { package = "xous-api-names", version = "0.9.56" } +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous = "0.9.59" +xous-ipc = "0.9.59" +xous-names = { package = "xous-api-names", version = "0.9.57" } llio = { path = "../llio" } -susres = { package = "xous-api-susres", version = "0.9.54" } +susres = { package = "xous-api-susres", version = "0.9.55" } spinor = { path = "../spinor" } num-derive = { version = "0.3.3", default-features = false } diff --git a/services/libstd-test/Cargo.toml b/services/libstd-test/Cargo.toml index c6fd795cb..9c6ab0f20 100644 --- a/services/libstd-test/Cargo.toml +++ b/services/libstd-test/Cargo.toml @@ -7,10 +7,10 @@ description = "libstd test stub" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } diff --git a/services/llio/Cargo.toml b/services/llio/Cargo.toml index 68c052b2a..fab6dd00d 100644 --- a/services/llio/Cargo.toml +++ b/services/llio/Cargo.toml @@ -8,12 +8,12 @@ version = "0.1.0" # Dependency versions enforced by Cargo.lock. [dependencies] log = "0.4.14" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous = "0.9.58" -xous-ipc = "0.9.58" -xous-names = { package = "xous-api-names", version = "0.9.56" } -susres = { package = "xous-api-susres", version = "0.9.54" } +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous = "0.9.59" +xous-ipc = "0.9.59" +xous-names = { package = "xous-api-names", version = "0.9.57" } +susres = { package = "xous-api-susres", version = "0.9.55" } # RTC dependencies bitflags = "1.2.1" diff --git a/services/log-test-client/Cargo.toml b/services/log-test-client/Cargo.toml index d9d4ac44f..becf315f5 100644 --- a/services/log-test-client/Cargo.toml +++ b/services/log-test-client/Cargo.toml @@ -7,7 +7,7 @@ version = "0.1.0" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.58" +xous = "0.9.59" [features] default = [] diff --git a/services/modals/Cargo.toml b/services/modals/Cargo.toml index 560311512..695deb3cc 100644 --- a/services/modals/Cargo.toml +++ b/services/modals/Cargo.toml @@ -7,14 +7,14 @@ description = "Ux modals server" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous-ipc = "0.9.58" +xous-ipc = "0.9.59" rkyv = { version = "0.4.3", features = [ "const_generics", ], default-features = false } diff --git a/services/net/Cargo.toml b/services/net/Cargo.toml index 803c81ed9..3a1193509 100644 --- a/services/net/Cargo.toml +++ b/services/net/Cargo.toml @@ -7,15 +7,15 @@ description = "Network middleware" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.58" -xous-ipc = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +xous-ipc = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } -susres = { package = "xous-api-susres", version = "0.9.54" } +susres = { package = "xous-api-susres", version = "0.9.55" } #rkyv = "0.7.18" rkyv = { version = "0.4.3", features = [ "const_generics", diff --git a/services/pddb/Cargo.toml b/services/pddb/Cargo.toml index 2f839d483..fa571222c 100644 --- a/services/pddb/Cargo.toml +++ b/services/pddb/Cargo.toml @@ -8,12 +8,12 @@ description = "Plausibly Deniable Database" # Dependency versions enforced by Cargo.lock. [dependencies] bitflags = { version = "1" } -xous = "0.9.58" -xous-ipc = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } -susres = { package = "xous-api-susres", version = "0.9.54" } +xous = "0.9.59" +xous-ipc = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } +susres = { package = "xous-api-susres", version = "0.9.55" } log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } diff --git a/services/root-keys/Cargo.toml b/services/root-keys/Cargo.toml index 72f4b0fb0..bce7c1b84 100644 --- a/services/root-keys/Cargo.toml +++ b/services/root-keys/Cargo.toml @@ -7,12 +7,12 @@ description = "Xous root keys server" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } log = "0.4.14" -susres = { package = "xous-api-susres", version = "0.9.54" } +susres = { package = "xous-api-susres", version = "0.9.55" } trng = { path = "../trng" } spinor = { path = "../spinor" } llio = { path = "../llio" } @@ -20,7 +20,7 @@ com = { path = "../com" } xous-semver = "0.1.2" utralib = { version = "0.1.24", optional = true, default-features = false } -xous-ipc = "0.9.58" +xous-ipc = "0.9.59" num-derive = { version = "0.4.1", default-features = false } num-traits = { version = "0.2.14", default-features = false } rkyv = { version = "0.4.3", default-features = false, features = [ diff --git a/services/shellchat/Cargo.toml b/services/shellchat/Cargo.toml index ef5c20dc7..922aac7ca 100644 --- a/services/shellchat/Cargo.toml +++ b/services/shellchat/Cargo.toml @@ -16,13 +16,13 @@ ime-plugin-shell = { path = "../ime-plugin-shell" } ime-plugin-tts = { path = "../ime-plugin-tts" } llio = { path = "../llio" } log = "0.4.14" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous = "0.9.58" -xous-ipc = "0.9.58" -xous-names = { package = "xous-api-names", version = "0.9.56" } +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous = "0.9.59" +xous-ipc = "0.9.59" +xous-names = { package = "xous-api-names", version = "0.9.57" } keyboard = { path = "../keyboard" } -susres = { package = "xous-api-susres", version = "0.9.54" } +susres = { package = "xous-api-susres", version = "0.9.55" } codec = { path = "../codec" } sha2 = { version = "0.10.8" } digest = "0.10.7" diff --git a/services/skeleton/Cargo.toml b/services/skeleton/Cargo.toml index cb5686993..5a597f98f 100644 --- a/services/skeleton/Cargo.toml +++ b/services/skeleton/Cargo.toml @@ -7,14 +7,14 @@ description = "Audio CODEC server" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } -susres = { package = "xous-api-susres", version = "0.9.54" } +susres = { package = "xous-api-susres", version = "0.9.55" } utralib = { version = "0.1.24", optional = true, default-features = false } diff --git a/services/spinor/Cargo.toml b/services/spinor/Cargo.toml index bfe67c58e..718245b16 100644 --- a/services/spinor/Cargo.toml +++ b/services/spinor/Cargo.toml @@ -7,12 +7,12 @@ description = "SPINOR ROM operations server" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } log = "0.4.14" -susres = { package = "xous-api-susres", version = "0.9.54" } +susres = { package = "xous-api-susres", version = "0.9.55" } trng = { path = "../trng" } com = { path = "../com" } llio = { path = "../llio" } @@ -20,7 +20,7 @@ llio = { path = "../llio" } rkyv = { version = "0.4.3", default-features = false, features = [ "const_generics", ] } -xous-ipc = "0.9.58" +xous-ipc = "0.9.59" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } diff --git a/services/status/Cargo.toml b/services/status/Cargo.toml index 60afffdb2..9435b8e4f 100644 --- a/services/status/Cargo.toml +++ b/services/status/Cargo.toml @@ -10,17 +10,17 @@ version = "0.1.0" com = { path = "../com" } content-plugin-api = { path = "../content-plugin-api" } log = "0.4.14" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } trng = { path = "../trng" } llio = { path = "../llio" } -xous = "0.9.58" -xous-ipc = "0.9.58" -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +xous-ipc = "0.9.59" +xous-names = { package = "xous-api-names", version = "0.9.57" } graphics-server = { path = "../graphics-server" } gam = { path = "../gam" } locales = { path = "../../locales" } -susres = { package = "xous-api-susres", version = "0.9.54" } +susres = { package = "xous-api-susres", version = "0.9.55" } root-keys = { path = "../root-keys" } modals = { path = "../modals" } pddb = { path = "../pddb" } diff --git a/services/test-spawn/Cargo.toml b/services/test-spawn/Cargo.toml index 359112f47..919835545 100644 --- a/services/test-spawn/Cargo.toml +++ b/services/test-spawn/Cargo.toml @@ -6,4 +6,4 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -xous = "0.9.58" +xous = "0.9.59" diff --git a/services/test-spawn/spawn/Cargo.toml b/services/test-spawn/spawn/Cargo.toml index 1073b71b6..9f96516dc 100644 --- a/services/test-spawn/spawn/Cargo.toml +++ b/services/test-spawn/spawn/Cargo.toml @@ -6,4 +6,4 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -xous = "0.9.58" +xous = "0.9.59" diff --git a/services/test-swapper/Cargo.toml b/services/test-swapper/Cargo.toml index 47262edd4..b00f57f9a 100644 --- a/services/test-swapper/Cargo.toml +++ b/services/test-swapper/Cargo.toml @@ -10,11 +10,11 @@ homepage = "https://betrusted.io/xous-book/" # Dependency versions enforced by Cargo.lock. [dependencies] -xous-api-susres = "0.9.54" -xous-names = { package = "xous-api-names", version = "0.9.56" } -log-server = { package = "xous-api-log", version = "0.1.54" } -xous = "0.9.58" -xous-ipc = "0.9.58" +xous-api-susres = "0.9.55" +xous-names = { package = "xous-api-names", version = "0.9.57" } +log-server = { package = "xous-api-log", version = "0.1.55" } +xous = "0.9.59" +xous-ipc = "0.9.59" log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } diff --git a/services/ticktimer-test-client/Cargo.toml b/services/ticktimer-test-client/Cargo.toml index 5c0a76111..33b5572e3 100644 --- a/services/ticktimer-test-client/Cargo.toml +++ b/services/ticktimer-test-client/Cargo.toml @@ -7,11 +7,11 @@ version = "0.1.0" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.58" +xous = "0.9.59" log = "0.4.14" -log-server = { package = "xous-api-log", version = "0.1.54" } -susres = { package = "xous-api-susres", version = "0.9.54", optional = true } -xous-names = { package = "xous-api-names", version = "0.9.56", optional = true } +log-server = { package = "xous-api-log", version = "0.1.55" } +susres = { package = "xous-api-susres", version = "0.9.55", optional = true } +xous-names = { package = "xous-api-names", version = "0.9.57", optional = true } [features] susres-testing = ["susres", "xous-names"] diff --git a/services/trng/Cargo.toml b/services/trng/Cargo.toml index e9539bbf9..809faf253 100644 --- a/services/trng/Cargo.toml +++ b/services/trng/Cargo.toml @@ -7,18 +7,18 @@ description = "TRNG server" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } log = "0.4.14" num-derive = { version = "0.4.1", default-features = false } num-traits = { version = "0.2.14", default-features = false } -susres = { package = "xous-api-susres", version = "0.9.54" } +susres = { package = "xous-api-susres", version = "0.9.55" } rkyv = { version = "0.4.3", default-features = false, features = [ "const_generics", ] } -xous-ipc = "0.9.58" +xous-ipc = "0.9.59" rand_core = "0.6.4" # the 0.6.4 API is necessary for compatibility with curve25519-dalek crates utralib = { version = "0.1.24", optional = true, default-features = false } diff --git a/services/tts/Cargo.toml b/services/tts/Cargo.toml index e6fc7cce5..f5a13b6e8 100644 --- a/services/tts/Cargo.toml +++ b/services/tts/Cargo.toml @@ -7,11 +7,11 @@ description = "Text to speech integration server" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.58" -xous-ipc = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +xous-ipc = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } diff --git a/services/usb-device-xous/Cargo.toml b/services/usb-device-xous/Cargo.toml index a716b43ee..1603058fd 100644 --- a/services/usb-device-xous/Cargo.toml +++ b/services/usb-device-xous/Cargo.toml @@ -7,11 +7,11 @@ description = "Xous USB device drivers" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.58" -xous-ipc = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +xous-ipc = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } log = "0.4.14" llio = { path = "../llio" } num-derive = { version = "0.3.3", default-features = false } @@ -19,7 +19,7 @@ num-traits = { version = "0.2.14", default-features = false } rkyv = { version = "0.4.3", default-features = false, features = [ "const_generics", ] } -susres = { package = "xous-api-susres", version = "0.9.54" } +susres = { package = "xous-api-susres", version = "0.9.55" } modals = { path = "../modals" } keyboard = { path = "../keyboard", features = ["inject-api"] } bitfield = "0.13.2" diff --git a/services/usb-test/Cargo.toml b/services/usb-test/Cargo.toml index f0800e65a..5317a8a01 100644 --- a/services/usb-test/Cargo.toml +++ b/services/usb-test/Cargo.toml @@ -7,14 +7,14 @@ description = "USB test & development stub" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.58" -log-server = { package = "xous-api-log", version = "0.1.54" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.54" } -xous-names = { package = "xous-api-names", version = "0.9.56" } +xous = "0.9.59" +log-server = { package = "xous-api-log", version = "0.1.55" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.55" } +xous-names = { package = "xous-api-names", version = "0.9.57" } log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } -susres = { package = "xous-api-susres", version = "0.9.54" } +susres = { package = "xous-api-susres", version = "0.9.55" } keyboard = { path = "../keyboard" } bitfield = "0.13.2" vcell = "0.1.3" diff --git a/services/xous-log/Cargo.toml b/services/xous-log/Cargo.toml index d2ce94aac..15ab1fb7f 100644 --- a/services/xous-log/Cargo.toml +++ b/services/xous-log/Cargo.toml @@ -10,9 +10,9 @@ homepage = "https://betrusted.io/xous-book/" # Dependency versions enforced by Cargo.lock. [dependencies] -xous-api-log = { package = "xous-api-log", version = "0.1.54" } -xous = "0.9.58" -xous-ipc = "0.9.58" +xous-api-log = { package = "xous-api-log", version = "0.1.55" } +xous = "0.9.59" +xous-ipc = "0.9.59" log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } diff --git a/services/xous-names/Cargo.toml b/services/xous-names/Cargo.toml index ea3079526..08ce1c829 100644 --- a/services/xous-names/Cargo.toml +++ b/services/xous-names/Cargo.toml @@ -10,10 +10,10 @@ homepage = "https://betrusted.io/" # Dependency versions enforced by Cargo.lock. [dependencies] -xous-api-names = "0.9.56" -log-server = { package = "xous-api-log", version = "0.1.54" } -xous = "0.9.58" -xous-ipc = "0.9.58" +xous-api-names = "0.9.57" +log-server = { package = "xous-api-log", version = "0.1.55" } +xous = "0.9.59" +xous-ipc = "0.9.59" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } log = "0.4.14" diff --git a/services/xous-susres/Cargo.toml b/services/xous-susres/Cargo.toml index 24a8dc95b..4b60a81da 100644 --- a/services/xous-susres/Cargo.toml +++ b/services/xous-susres/Cargo.toml @@ -10,11 +10,11 @@ homepage = "https://betrusted.io/xous-book/" # Dependency versions enforced by Cargo.lock. [dependencies] -xous-api-susres = "0.9.54" -xous-names = { package = "xous-api-names", version = "0.9.56" } -log-server = { package = "xous-api-log", version = "0.1.54" } -xous = "0.9.58" -xous-ipc = "0.9.58" +xous-api-susres = "0.9.55" +xous-names = { package = "xous-api-names", version = "0.9.57" } +log-server = { package = "xous-api-log", version = "0.1.55" } +xous = "0.9.59" +xous-ipc = "0.9.59" log = "0.4.14" num-derive = { version = "0.3.3", default-features = false } diff --git a/services/xous-swapper/Cargo.toml b/services/xous-swapper/Cargo.toml index e62433c55..6024de75c 100644 --- a/services/xous-swapper/Cargo.toml +++ b/services/xous-swapper/Cargo.toml @@ -10,10 +10,10 @@ homepage = "https://betrusted.io/" # Dependency versions enforced by Cargo.lock. [dependencies] -xous-api-names = "0.9.56" -log-server = { package = "xous-api-log", version = "0.1.54" } -xous = { version = "0.9.58", features = ["swap"] } -xous-ipc = "0.9.58" +xous-api-names = "0.9.57" +log-server = { package = "xous-api-log", version = "0.1.55" } +xous = { version = "0.9.59", features = ["swap"] } +xous-ipc = "0.9.59" num-derive = { version = "0.3.3", default-features = false } num-traits = { version = "0.2.14", default-features = false } log = "0.4.14" diff --git a/services/xous-ticktimer/Cargo.toml b/services/xous-ticktimer/Cargo.toml index bf38987fe..9b7e65c56 100644 --- a/services/xous-ticktimer/Cargo.toml +++ b/services/xous-ticktimer/Cargo.toml @@ -10,12 +10,12 @@ homepage = "https://betrusted.io/xous-book/" # Dependency versions enforced by Cargo.lock. [dependencies] -xous-api-ticktimer = "0.9.54" -xous = "0.9.58" -xous-ipc = "0.9.58" -xous-names = { package = "xous-api-names", version = "0.9.56" } -log-server = { package = "xous-api-log", version = "0.1.54" } -susres = { package = "xous-api-susres", version = "0.9.54" } +xous-api-ticktimer = "0.9.55" +xous = "0.9.59" +xous-ipc = "0.9.59" +xous-names = { package = "xous-api-names", version = "0.9.57" } +log-server = { package = "xous-api-log", version = "0.1.55" } +susres = { package = "xous-api-susres", version = "0.9.55" } log = "0.4.14" rkyv = { version = "0.4.3", default-features = false, features = [ "const_generics", diff --git a/xous-ipc/Cargo.toml b/xous-ipc/Cargo.toml index 98fe52487..c98a75db7 100644 --- a/xous-ipc/Cargo.toml +++ b/xous-ipc/Cargo.toml @@ -4,13 +4,13 @@ description = "System call interface for Xous" edition = "2018" license = "MIT OR Apache-2.0" name = "xous-ipc" -version = "0.9.58" +version = "0.9.59" repository = "https://github.com/betrusted-io/xous-core/" homepage = "https://betrusted.io/" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.58" +xous = "0.9.59" bitflags = { version = "1" } rkyv = { version = "0.4.3", features = [ "const_generics", diff --git a/xous-rs/Cargo.toml b/xous-rs/Cargo.toml index e21b8f3e9..a872ba6e3 100644 --- a/xous-rs/Cargo.toml +++ b/xous-rs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xous" -version = "0.9.58" +version = "0.9.59" authors = ["Sean Cross "] edition = "2021" license = "MIT OR Apache-2.0" diff --git a/xous-rs/src/arch/hosted/mod.rs b/xous-rs/src/arch/hosted/mod.rs index c2228cc06..45fc7e639 100644 --- a/xous-rs/src/arch/hosted/mod.rs +++ b/xous-rs/src/arch/hosted/mod.rs @@ -5,7 +5,8 @@ use std::mem::size_of; use std::net::{IpAddr, Ipv4Addr, SocketAddr, TcpStream, ToSocketAddrs}; use std::sync::{Arc, Condvar, Mutex}; -use crate::{Result, SysCall, SysCallResult, PID, TID}; +pub use crate::PID; +use crate::{Result, SysCall, SysCallResult, TID}; mod mem; pub use mem::*; diff --git a/xous-rs/src/arch/hosted/process.rs b/xous-rs/src/arch/hosted/process.rs index 42072dda1..1c757e5bb 100644 --- a/xous-rs/src/arch/hosted/process.rs +++ b/xous-rs/src/arch/hosted/process.rs @@ -1,7 +1,6 @@ use core::convert::{TryFrom, TryInto}; use super::CHILD_PROCESS_ADDRESS; -pub use crate::PID; /// A 16-byte random nonce that identifies this process to the kernel. This /// is usually provided through the environment variable `XOUS_PROCESS_KEY`. diff --git a/xous-rs/src/definitions.rs b/xous-rs/src/definitions.rs index 4e6705ae7..5a99c8309 100644 --- a/xous-rs/src/definitions.rs +++ b/xous-rs/src/definitions.rs @@ -307,18 +307,18 @@ impl core::fmt::Display for MemoryType { #[repr(C)] #[derive(Debug, PartialEq)] pub enum Result { - // 0 + /// 0 Ok, - // 1 + /// 1 Error(Error), - // 2 + /// 2 MemoryAddress(MemoryAddress), - // 3 + /// 3 MemoryRange(MemoryRange), - // 4 + /// 4 ReadyThreads( usize, /* count */ usize, @@ -329,25 +329,25 @@ pub enum Result { /* pid2 */ usize, /* context2 */ ), - // 5 + /// 5 ResumeProcess, - // 6 + /// 6 ServerID(SID), - // 7 + /// 7 ConnectionID(CID), - // 8 + /// 8 NewServerID(SID, CID), - // 9 + /// 9 MessageEnvelope(MessageEnvelope), - // 10 + /// 10 ThreadID(TID), - // 11 + /// 11 ProcessID(PID), /// 12: The requested system call is unimplemented @@ -381,9 +381,10 @@ pub enum Result { /// 20: A scalar with five values Scalar5(usize, usize, usize, usize, usize), - // 21: A message is returned as part of `send_message()` when the result is blocking + /// 21: A message is returned as part of `send_message()` when the result is blocking Message(Message), + /// Reserved: do not rely on the argument numbering for this variant. UnknownResult(usize, usize, usize, usize, usize, usize, usize), } diff --git a/xtask/src/verifier.rs b/xtask/src/verifier.rs index 8e8c256c7..0a955a8b3 100644 --- a/xtask/src/verifier.rs +++ b/xtask/src/verifier.rs @@ -12,12 +12,12 @@ pub fn check_project_consistency() -> Result<(), DynError> { // TODO: retire utralib/svd2utra from publication as well let check_pkgs = [ // this set updates with kernel API changes - "xous^0.9.58", - "xous-ipc^0.9.58", - "xous-api-log^0.1.54", - "xous-api-names^0.9.56", - "xous-api-susres^0.9.54", - "xous-api-ticktimer^0.9.54", + "xous^0.9.59", + "xous-ipc^0.9.59", + "xous-api-log^0.1.55", + "xous-api-names^0.9.57", + "xous-api-susres^0.9.55", + "xous-api-ticktimer^0.9.55", ]; // utra/svd2utra changes are downgraded to warnings because these now prefer to pull // from the local patch version, so any inconsistency simply indicates we forgot to