diff --git a/Cargo.lock b/Cargo.lock index e04eb5ba5..23340e59c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -57,7 +57,7 @@ dependencies = [ "aes", "hex-literal 0.3.4", "log", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", ] @@ -132,11 +132,11 @@ dependencies = [ "ureq", "url", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -331,11 +331,11 @@ dependencies = [ "num-derive 0.4.2", "num-traits", "trng", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -355,9 +355,9 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "usb-bao1x", - "utralib 0.1.25", + "utralib 0.1.26", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", @@ -384,13 +384,13 @@ dependencies = [ "num-traits", "rkyv 0.8.8", "rqrr", - "utralib 0.1.25", + "utralib 0.1.26", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -402,9 +402,9 @@ dependencies = [ "num-derive 0.4.2", "num-traits", "rkyv 0.8.8", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-names", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -416,8 +416,8 @@ dependencies = [ "critical-section", "linked_list_allocator", "riscv", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-riscv", ] @@ -435,9 +435,9 @@ dependencies = [ "riscv", "sha2", "simple-fatfs", - "utralib 0.1.25", + "utralib 0.1.26", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-bio-bdma", "xous-riscv", ] @@ -455,10 +455,10 @@ dependencies = [ "rand_core 0.6.4", "rkyv 0.8.8", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -480,9 +480,9 @@ dependencies = [ "rkyv 0.8.8", "sha2-bao1x", "usb-device", - "utralib 0.1.25", + "utralib 0.1.26", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-names", "xous-api-ticktimer", "xous-riscv", @@ -501,12 +501,12 @@ dependencies = [ "rand_chacha 0.3.1", "rand_core 0.6.4", "rkyv 0.8.8", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -517,8 +517,8 @@ dependencies = [ "log", "num-derive 0.4.2", "num-traits", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", @@ -531,8 +531,8 @@ dependencies = [ "log", "num-derive 0.4.2", "num-traits", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", @@ -562,9 +562,9 @@ dependencies = [ "riscv", "sha2", "sha2-bao1x", - "utralib 0.1.25", + "utralib 0.1.26", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-bio-bdma", "xous-riscv", ] @@ -745,8 +745,8 @@ dependencies = [ "num-derive 0.4.2", "num-traits", "rkyv 0.8.8", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -915,11 +915,11 @@ dependencies = [ "rkyv 0.8.8", "trng", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -949,11 +949,11 @@ dependencies = [ "trng", "ureq", "url", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1102,13 +1102,13 @@ dependencies = [ "num-traits", "rkyv 0.8.8", "trng", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1133,13 +1133,13 @@ dependencies = [ "rkyv 0.8.8", "trng", "typenum", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -1197,7 +1197,7 @@ dependencies = [ "log", "rkyv 0.8.8", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-names", ] @@ -1239,13 +1239,13 @@ dependencies = [ "num-derive 0.4.2", "num-traits", "usb-device-xous", - "utralib 0.1.25", + "utralib 0.1.26", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", "xous-swapper", ] @@ -1514,7 +1514,7 @@ dependencies = [ [[package]] name = "curve25519-dalek" version = "4.1.2" -source = "git+https://github.com/betrusted-io/curve25519-dalek.git?branch=main#bef542a781348054c32a9beaf6bd1195814cace2" +source = "git+https://github.com/betrusted-io/curve25519-dalek.git?branch=main#8725c509f25ab1a390f7f12ee2863ec1d8d0c595" dependencies = [ "cfg-if", "cpufeatures", @@ -1525,8 +1525,8 @@ dependencies = [ "log", "rustc_version 0.4.0", "subtle", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "zeroize", ] @@ -1567,7 +1567,7 @@ dependencies = [ [[package]] name = "curve25519-dalek-derive" version = "0.1.1" -source = "git+https://github.com/betrusted-io/curve25519-dalek.git?branch=main#bef542a781348054c32a9beaf6bd1195814cace2" +source = "git+https://github.com/betrusted-io/curve25519-dalek.git?branch=main#8725c509f25ab1a390f7f12ee2863ec1d8d0c595" dependencies = [ "proc-macro2", "quote", @@ -1593,7 +1593,7 @@ dependencies = [ "serde", "sha2-loader", "subtle", - "utralib 0.1.25", + "utralib 0.1.26", "zeroize", ] @@ -1610,8 +1610,8 @@ dependencies = [ "num-derive 0.4.2", "num-traits", "usb-bao1x", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", @@ -1894,13 +1894,13 @@ dependencies = [ "sntpc", "trng", "userprefs", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1920,13 +1920,13 @@ dependencies = [ "precursor-hal", "rkyv 0.8.8", "spinor", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2005,7 +2005,7 @@ dependencies = [ "signature 2.2.0", "subtle", "toml 0.7.8", - "utralib 0.1.25", + "utralib 0.1.26", "x25519-dalek", "zeroize", ] @@ -2280,8 +2280,8 @@ dependencies = [ "log", "num-derive 0.4.2", "num-traits", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", @@ -2339,7 +2339,7 @@ name = "flatipc" version = "0.1.0" dependencies = [ "flatipc-derive", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2577,14 +2577,14 @@ dependencies = [ "sha2", "trng", "tts-frontend", - "utralib 0.1.25", + "utralib 0.1.26", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2652,7 +2652,7 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", "wasm-bindgen", "wasm-bindgen-test", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-names", ] @@ -2688,14 +2688,14 @@ dependencies = [ "num-derive 0.4.2", "num-traits", "rkyv 0.8.8", - "utralib 0.1.25", + "utralib 0.1.26", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2818,10 +2818,10 @@ dependencies = [ "num-traits", "tts-frontend", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2831,11 +2831,11 @@ dependencies = [ "log", "num-derive 0.4.2", "num-traits", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2908,10 +2908,10 @@ dependencies = [ "tts-frontend", "usb-device-xous", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3059,13 +3059,13 @@ dependencies = [ "num-traits", "rkyv 0.8.8", "tts-frontend", - "utralib 0.1.25", + "utralib 0.1.26", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3077,9 +3077,9 @@ dependencies = [ "num-traits", "rkyv 0.8.8", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-names", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3091,12 +3091,12 @@ dependencies = [ "num-derive 0.4.2", "num-traits", "rkyv 0.8.8", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3110,12 +3110,12 @@ dependencies = [ "num-traits", "rkyv 0.8.8", "tts-frontend", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3224,13 +3224,13 @@ dependencies = [ "num-derive 0.4.2", "num-traits", "rkyv 0.8.8", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3247,8 +3247,8 @@ name = "kernel-test" version = "0.1.0" dependencies = [ "log", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-ticktimer", ] @@ -3264,13 +3264,13 @@ dependencies = [ "num-traits", "rkyv 0.8.8", "spinor", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3300,13 +3300,13 @@ dependencies = [ "rkyv 0.8.8", "sha2", "subtle", - "utralib 0.1.25", + "utralib 0.1.26", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", "zeroize", ] @@ -3321,9 +3321,9 @@ dependencies = [ "num-traits", "precursor-hal", "rkyv 0.8.8", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-names", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", "zeroize", ] @@ -3427,8 +3427,8 @@ dependencies = [ "net", "num-derive 0.4.2", "num-traits", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", @@ -3460,13 +3460,13 @@ dependencies = [ "num-derive 0.4.2", "num-traits", "rkyv 0.8.8", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -3500,9 +3500,9 @@ dependencies = [ "sha2-bao1x", "sha2-loader", "simple-fatfs", - "utralib 0.1.25", + "utralib 0.1.26", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-pl230", "xous-riscv", ] @@ -3545,7 +3545,7 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" name = "log-test-client" version = "0.1.0" dependencies = [ - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3688,11 +3688,11 @@ dependencies = [ "trng", "tts-frontend", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3724,11 +3724,11 @@ dependencies = [ "ureq", "url", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3755,11 +3755,11 @@ dependencies = [ "trng", "ureq", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3829,13 +3829,13 @@ dependencies = [ "rkyv 0.8.8", "smoltcp", "trng", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -4286,14 +4286,14 @@ dependencies = [ "subtle", "trng", "tts-frontend", - "utralib 0.1.25", + "utralib 0.1.26", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", "xous-swapper", "zeroize", "zeroize_derive", @@ -4339,8 +4339,8 @@ name = "perflib" version = "0.1.0" dependencies = [ "log", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4957,11 +4957,11 @@ dependencies = [ "num-traits", "trng", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5000,7 +5000,7 @@ dependencies = [ "spin", "untrusted 0.9.0", "windows-sys 0.52.0", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-names", "xous-ipc 0.9.63", ] @@ -5121,14 +5121,14 @@ dependencies = [ "trng", "tts-frontend", "usb-device-xous", - "utralib 0.1.25", + "utralib 0.1.26", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", "zeroize", ] @@ -5440,7 +5440,7 @@ dependencies = [ [[package]] name = "sha2" version = "0.10.8" -source = "git+https://github.com/betrusted-io/hashes.git?branch=sha2-v0.10.8-xous#aba98c8b071194cc782461ccc5bd2c1a8056e58c" +source = "git+https://github.com/betrusted-io/hashes.git?branch=sha2-v0.10.8-xous#70db704d2d9b791f436fe68b6e70dc5df3757a15" dependencies = [ "cfg-if", "cpufeatures", @@ -5451,12 +5451,12 @@ dependencies = [ "num-traits", "rand 0.8.5", "rkyv 0.8.8", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5465,7 +5465,7 @@ version = "0.10.9" dependencies = [ "bao1x-api", "digest 0.10.7", - "utralib 0.1.25", + "utralib 0.1.26", ] [[package]] @@ -5475,7 +5475,7 @@ dependencies = [ "block-buffer 0.9.0", "digest 0.9.0", "opaque-debug", - "utralib 0.1.25", + "utralib 0.1.26", ] [[package]] @@ -5554,16 +5554,16 @@ dependencies = [ "tungstenite", "url", "usb-device-xous", - "utralib 0.1.25", + "utralib 0.1.26", "ux-api", "webpki-roots", "x25519-dalek", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5666,7 +5666,7 @@ name = "spawn" version = "0.1.0" dependencies = [ "log", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", ] @@ -5702,13 +5702,13 @@ dependencies = [ "rand 0.8.5", "rkyv 0.8.8", "trng", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5785,14 +5785,14 @@ dependencies = [ "trng", "usb-device-xous", "userprefs", - "utralib 0.1.25", + "utralib 0.1.26", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -5847,7 +5847,7 @@ dependencies = [ [[package]] name = "svd2utra" -version = "0.1.23" +version = "0.1.24" dependencies = [ "quick-xml", ] @@ -5928,7 +5928,7 @@ dependencies = [ name = "test-spawn" version = "0.1.0" dependencies = [ - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5939,12 +5939,12 @@ dependencies = [ "num-derive 0.4.2", "num-traits", "rkyv 0.8.8", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", "xous-swapper", ] @@ -6007,7 +6007,7 @@ name = "ticktimer-test-client" version = "0.1.0" dependencies = [ "log", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", @@ -6098,11 +6098,11 @@ dependencies = [ "ureq", "webpki-roots", "x509-parser", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -6175,7 +6175,7 @@ dependencies = [ "rand 0.8.5", "ring", "sha2", - "svd2utra 0.1.23", + "svd2utra 0.1.24", "xmas-elf", "xous-semver", ] @@ -6258,10 +6258,10 @@ dependencies = [ "num-traits", "usb-device-xous", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -6277,13 +6277,13 @@ dependencies = [ "rand_chacha 0.3.1", "rand_core 0.6.4", "rkyv 0.8.8", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -6295,12 +6295,12 @@ dependencies = [ "num-derive 0.4.2", "num-traits", "rkyv 0.8.8", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", "xous-tts-backend", ] @@ -6442,12 +6442,12 @@ dependencies = [ "rkyv 0.8.8", "usb-device", "usbd-serial 0.1.1 (git+https://github.com/betrusted-io/usbd-serial.git?branch=v0.1.1-betrusted)", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", "xous-riscv", "xous-usb-hid", ] @@ -6488,14 +6488,14 @@ dependencies = [ "usbd-serial 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "usbd_mass_storage 0.1.0", "usbd_scsi 0.1.1", - "utralib 0.1.25", + "utralib 0.1.26", "vcell", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", "xous-usb-hid", ] @@ -6513,9 +6513,9 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "usb-device", - "utralib 0.1.25", + "utralib 0.1.26", "vcell", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", @@ -6555,7 +6555,7 @@ dependencies = [ "typenum", "usb-device", "usbd_mass_storage 0.1.0", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-ticktimer", ] @@ -6629,7 +6629,7 @@ dependencies = [ "usb-device", "usbd_bulk_only_transport 0.1.0", "usbd_mass_storage 0.1.0", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-ticktimer", ] @@ -6660,9 +6660,9 @@ dependencies = [ [[package]] name = "utralib" -version = "0.1.25" +version = "0.1.26" dependencies = [ - "svd2utra 0.1.23", + "svd2utra 0.1.24", ] [[package]] @@ -6687,9 +6687,9 @@ dependencies = [ "qrcode", "rkyv 0.8.8", "sha2", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-names", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", "zeroize", ] @@ -6742,14 +6742,14 @@ dependencies = [ "tts-frontend", "usb-device-xous", "userprefs", - "utralib 0.1.25", + "utralib 0.1.26", "ux-api", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", "xous-usb-hid", ] @@ -7297,7 +7297,7 @@ checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[package]] name = "xous" -version = "0.9.66" +version = "0.9.67" dependencies = [ "compiler_builtins", "lazy_static", @@ -7306,73 +7306,73 @@ dependencies = [ [[package]] name = "xous" -version = "0.9.66" +version = "0.9.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52ea640cc9fc209ff7ab36fc0ec0a6f549ff688a094ce076f80fcd352680941" +checksum = "9fb2954670da82bb4be335f2f576d48d33475145d9d0c83c725f395cf3284a12" dependencies = [ "lazy_static", ] [[package]] name = "xous-api-log" -version = "0.1.65" +version = "0.1.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3ce562e9fe69a21901bfcf79b5c483be0fab334820dd07913826777a9a91e5" +checksum = "192e15fa639d4e88da58e000dd050c5dbf2fda043b01d02c27ae4333c5787b40" dependencies = [ "log", "num-derive 0.4.2", "num-traits", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "xous-api-names" -version = "0.9.67" +version = "0.9.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16a395520c07fa9851cb2372b7022be6802a21893b5d70963d4b2fec4540c6fd" +checksum = "c4e4e39e3810953c7e6c05ad42fc92fced2c42ba83d2436cde5cf4dcfefc7fcf" dependencies = [ "log", "num-derive 0.4.2", "num-traits", "rkyv 0.8.8", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "xous-api-susres" -version = "0.9.65" +version = "0.9.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2099df1b7e67f49bf3013c9f46f97e1f945132e49e4fab09a6211a190298e25c" +checksum = "d2ddfc013eee2369efd105e67d23bd2749114a40c4c3164529e240e308d25168" dependencies = [ "log", "num-derive 0.4.2", "num-traits", "rkyv 0.8.8", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "xous-api-ticktimer" -version = "0.9.65" +version = "0.9.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "033f7c2e99be732f306635541de965b93affc7923f31055eea2c9b85fdd0c478" +checksum = "970197189e2a5dbba243ff9bb43225dfeca76031497f15789597fbfe4aa7c9f6" dependencies = [ "log", "num-derive 0.4.2", "num-traits", "rkyv 0.8.8", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -7382,8 +7382,8 @@ version = "0.1.0" dependencies = [ "defmt", "log", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7392,8 +7392,8 @@ version = "0.1.0" dependencies = [ "defmt", "log", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7404,27 +7404,27 @@ checksum = "47c88158f43d35c03454af8eba9d6f85ad140a71c150512cdbe68bf54bd8dc34" dependencies = [ "bitflags 1.3.2", "rkyv 0.4.3", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "xous-ipc" -version = "0.10.6" +version = "0.10.7" dependencies = [ "bitflags 1.3.2", "rkyv 0.8.8", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "xous-ipc" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d9abc799609a9b06ce4ea137276f964c36b80ef19967ba8c657af3cf6fcf754" +checksum = "dd409e8f0837f6bb8d31b325cf2c4af7a046b0fb227088dfb7a4cbc2bcfbac88" dependencies = [ "bitflags 1.3.2", "rkyv 0.8.8", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7445,8 +7445,8 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "stats_alloc", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-riscv", ] @@ -7459,10 +7459,10 @@ dependencies = [ "num-derive 0.4.2", "num-traits", "rkyv 0.8.8", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7473,11 +7473,11 @@ dependencies = [ "num-derive 0.4.2", "num-traits", "rkyv 0.8.8", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7489,8 +7489,8 @@ dependencies = [ "log", "pio", "pio-proc", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7505,9 +7505,9 @@ dependencies = [ [[package]] name = "xous-semver" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b79d97eaeab0fdf766f7f2c8d3b88bdae67ad36fac9694e2857defca345178c" +checksum = "906500be0c4ed13afc3c8743e4d40337bfbe08e7dadfa216c39907aaa06cc8c2" [[package]] name = "xous-susres" @@ -7519,12 +7519,12 @@ dependencies = [ "num-traits", "precursor-hal", "rkyv 0.8.8", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7540,11 +7540,11 @@ dependencies = [ "num-derive 0.4.2", "num-traits", "precursor-hal", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7556,13 +7556,13 @@ dependencies = [ "num-derive 0.4.2", "num-traits", "rkyv 0.8.8", - "utralib 0.1.25", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.26", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -7576,9 +7576,9 @@ dependencies = [ "num-derive 0.3.3", "num-traits", "rkyv 0.8.8", - "xous 0.9.66 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.67 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-names", - "xous-ipc 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -7607,7 +7607,7 @@ dependencies = [ "rustc_version 0.4.0", "serde", "serde_json", - "svd2utra 0.1.23", + "svd2utra 0.1.24", "tempfile", "ureq", "zip", diff --git a/api/xous-api-log/Cargo.toml b/api/xous-api-log/Cargo.toml index 5100b34c4..6926ba590 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.65" +version = "0.1.66" 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.66" -xous-ipc = "0.10.6" +xous = "0.9.67" +xous-ipc = "0.10.7" log = "0.4.14" num-derive = { version = "0.4.2", 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 c1338f306..5ecccb709 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.67" +version = "0.9.68" 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.65" } -xous = "0.9.66" -xous-ipc = "0.10.6" +log-server = { package = "xous-api-log", version = "0.1.66" } +xous = "0.9.67" +xous-ipc = "0.10.7" num-derive = { version = "0.4.2", 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 132b2e05c..09d8418ab 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.65" +version = "0.9.66" 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.66" -xous-ipc = "0.10.6" -log-server = { package = "xous-api-log", version = "0.1.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +xous-ipc = "0.10.7" +log-server = { package = "xous-api-log", version = "0.1.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } log = "0.4.14" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } @@ -22,7 +22,7 @@ rkyv = { version = "0.8.8", default-features = false, features = [ "alloc", ] } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } [features] precursor = ["utralib/precursor"] diff --git a/api/xous-api-ticktimer/Cargo.toml b/api/xous-api-ticktimer/Cargo.toml index 973b8af95..a24220fe3 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.65" +version = "0.9.66" 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.66" -xous-ipc = "0.10.6" -log-server = { package = "xous-api-log", version = "0.1.65" } -susres = { package = "xous-api-susres", version = "0.9.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +xous-ipc = "0.10.7" +log-server = { package = "xous-api-log", version = "0.1.66" } +susres = { package = "xous-api-susres", version = "0.9.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } log = "0.4.14" rkyv = { version = "0.8.8", default-features = false, features = [ "std", @@ -22,7 +22,7 @@ rkyv = { version = "0.8.8", default-features = false, features = [ ] } num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous-semver = "0.1.2" +xous-semver = "0.1.5" [features] debug-print = [] diff --git a/api/xous-api-ticktimer/src/lib.rs b/api/xous-api-ticktimer/src/lib.rs index b7ecc0eba..4e44b045c 100644 --- a/api/xous-api-ticktimer/src/lib.rs +++ b/api/xous-api-ticktimer/src/lib.rs @@ -2,6 +2,8 @@ pub mod api; +use std::str::FromStr; + use num_traits::ToPrimitive; use xous::{CID, Error, send_message}; use xous_semver::SemVer; diff --git a/apps-dabao/dabao-console/Cargo.toml b/apps-dabao/dabao-console/Cargo.toml index d999e368a..600aaa6f9 100644 --- a/apps-dabao/dabao-console/Cargo.toml +++ b/apps-dabao/dabao-console/Cargo.toml @@ -4,11 +4,11 @@ version = "0.1.0" edition = "2021" [dependencies] -utralib = { version = "0.1.25", optional = true, default-features = false } -xous-names = { package = "xous-api-names", version = "0.9.67" } -ticktimer = { package = "xous-api-ticktimer", version = "0.9.65" } -xous = "0.9.66" -log-server = { package = "xous-api-log", version = "0.1.65" } +utralib = { version = "0.1.26", optional = true, default-features = false } +xous-names = { package = "xous-api-names", version = "0.9.68" } +ticktimer = { package = "xous-api-ticktimer", version = "0.9.66" } +xous = "0.9.67" +log-server = { package = "xous-api-log", version = "0.1.66" } log = "0.4.14" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } diff --git a/apps-dabao/helloworld/Cargo.toml b/apps-dabao/helloworld/Cargo.toml index 21f29096e..8f105e6e1 100644 --- a/apps-dabao/helloworld/Cargo.toml +++ b/apps-dabao/helloworld/Cargo.toml @@ -7,11 +7,11 @@ edition = "2021" log = "0.4.14" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous = "0.9.66" -xous-ipc = "0.10.6" -log-server = { package = "xous-api-log", version = "0.1.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } -utralib = { version = "0.1.25", optional = true, default-features = false } +xous = "0.9.67" +xous-ipc = "0.10.7" +log-server = { package = "xous-api-log", version = "0.1.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } +utralib = { version = "0.1.26", optional = true, default-features = false } [features] bao1x = ["utralib/bao1x"] diff --git a/apps/app-loader/Cargo.toml b/apps/app-loader/Cargo.toml index d5b19fec1..574fc020d 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.66" -xous-ipc = "0.10.6" -log-server = { package = "xous-api-log", version = "0.1.65" } +xous = "0.9.67" +xous-ipc = "0.10.7" +log-server = { package = "xous-api-log", version = "0.1.66" } log = "0.4.14" -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous-names = { package = "xous-api-names", version = "0.9.68" } gam = { path = "../../services/gam" } ux-api = { path = "../../libs/ux-api" } modals = { path = "../../services/modals" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } locales = { path = "../../locales" } num-derive = { version = "0.4.2", default-features = false } diff --git a/apps/app-loader/spawn/Cargo.toml b/apps/app-loader/spawn/Cargo.toml index 89e940055..47a51e86e 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.66" -log-server = { package = "xous-api-log", version = "0.1.65", features = ["nostd"] } +xous = "0.9.67" +log-server = { package = "xous-api-log", version = "0.1.66", features = ["nostd"] } log = "0.4.17" diff --git a/apps/ball/Cargo.toml b/apps/ball/Cargo.toml index c0a64dc5e..fbc2007ce 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.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous = "0.9.66" -xous-ipc = "0.10.6" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +xous-ipc = "0.10.7" +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } 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 dca43eac3..b1218aecd 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.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous = "0.9.66" -xous-ipc = "0.10.6" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +xous-ipc = "0.10.7" +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } gam = { path = "../../services/gam" } trng = { path = "../../services/trng" } locales = { path = "../../locales" } diff --git a/apps/hello/Cargo.toml b/apps/hello/Cargo.toml index 05b7409ff..1f0a080f6 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.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous = "0.9.66" -xous-ipc = "0.10.6" -log-server = { package = "xous-api-log", version = "0.1.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +xous-ipc = "0.10.7" +log-server = { package = "xous-api-log", version = "0.1.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } gam = { path = "../../services/gam" } ux-api = { path = "../../libs/ux-api" } blitstr2 = { path = "../../libs/blitstr2" } diff --git a/apps/hidv2/Cargo.toml b/apps/hidv2/Cargo.toml index 51d27ab19..18dda46ed 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.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous = "0.9.66" -xous-ipc = "0.10.6" -log-server = { package = "xous-api-log", version = "0.1.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +xous-ipc = "0.10.7" +log-server = { package = "xous-api-log", version = "0.1.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } gam = { path = "../../services/gam" } ux-api = { path = "../../libs/ux-api" } blitstr2 = { path = "../../libs/blitstr2" } diff --git a/apps/mtxchat/Cargo.toml b/apps/mtxchat/Cargo.toml index bf9477eb1..f1ee39cc6 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.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous = "0.9.66" -xous-ipc = "0.10.6" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +xous-ipc = "0.10.7" +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } gam = { path = "../../services/gam" } ux-api = { path = "../../libs/ux-api" } blitstr2 = { path = "../../libs/blitstr2" } diff --git a/apps/mtxcli/Cargo.toml b/apps/mtxcli/Cargo.toml index 0d324ca31..308f4725b 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.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous = "0.9.66" -xous-ipc = "0.10.6" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +xous-ipc = "0.10.7" +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } gam = { path = "../../services/gam" } ux-api = { path = "../../libs/ux-api" } blitstr2 = { path = "../../libs/blitstr2" } diff --git a/apps/repl/Cargo.toml b/apps/repl/Cargo.toml index 47a8dd6e1..1774544a4 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.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous = "0.9.66" -xous-ipc = "0.10.6" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +xous-ipc = "0.10.7" +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } gam = { path = "../../services/gam" } ux-api = { path = "../../libs/ux-api" } blitstr2 = { path = "../../libs/blitstr2" } diff --git a/apps/transientdisk/Cargo.toml b/apps/transientdisk/Cargo.toml index a56d2a772..2be882bdf 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.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous = "0.9.66" -xous-ipc = "0.10.6" -log-server = { package = "xous-api-log", version = "0.1.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +xous-ipc = "0.10.7" +log-server = { package = "xous-api-log", version = "0.1.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } gam = { path = "../../services/gam" } usb-device-xous = { path = "../../services/usb-device-xous" } ux-api = { path = "../../libs/ux-api" } diff --git a/apps/vault/Cargo.toml b/apps/vault/Cargo.toml index 56a783cce..c68ea7bc4 100644 --- a/apps/vault/Cargo.toml +++ b/apps/vault/Cargo.toml @@ -7,14 +7,14 @@ edition = "2018" log = "0.4.14" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous = "0.9.66" -xous-ipc = "0.10.6" +xous = "0.9.67" +xous-ipc = "0.10.7" rkyv = { version = "0.8.8", default-features = false, features = [ "std", "alloc", ] } -log-server = { package = "xous-api-log", version = "0.1.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +log-server = { package = "xous-api-log", version = "0.1.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } gam = { path = "../../services/gam" } locales = { path = "../../locales" } tts-frontend = { path = "../../services/tts" } @@ -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.65" } +susres = { package = "xous-api-susres", version = "0.9.66" } 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.65" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } userprefs = { path = "../../libs/userprefs" } ux-api = { path = "../../libs/ux-api", default-features = false } precursor-hal = { path = "../../libs/precursor-hal" } @@ -62,7 +62,7 @@ com_rs = { git = "https://github.com/betrusted-io/com_rs", rev = "891bdd3ca8e41f # performance profiling perflib = { path = "../../libs/perflib", optional = true } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } # testing random-pick = { version = "1.2.15", optional = true } diff --git a/apps/vault/libraries/crypto/Cargo.toml b/apps/vault/libraries/crypto/Cargo.toml index 4346cd660..f19d2ec74 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.67" } +xous-names = { package = "xous-api-names", version = "0.9.68" } rand_core = "0.6.3" p256 = { version = "0.11.1", default-features = false, features = [ "ecdsa", diff --git a/bao1x-boot/boot0/Cargo.toml b/bao1x-boot/boot0/Cargo.toml index 241b2ef18..479f6cd8d 100644 --- a/bao1x-boot/boot0/Cargo.toml +++ b/bao1x-boot/boot0/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" description = "Boot0 partition" [dependencies] -xous = "0.9.66" -utralib = { version = "0.1.25", optional = true, default-features = false } +xous = "0.9.67" +utralib = { version = "0.1.26", optional = true, default-features = false } bao1x-hal = { path = "../../libs/bao1x-hal", optional = true, default-features = false } bao1x-api = { path = "../../libs/bao1x-api", optional = true, default-features = false } vexriscv = { version = "0.5.6", package = "xous-riscv" } diff --git a/bao1x-boot/boot1/Cargo.toml b/bao1x-boot/boot1/Cargo.toml index 07fc522df..ed9a1f58d 100644 --- a/bao1x-boot/boot1/Cargo.toml +++ b/bao1x-boot/boot1/Cargo.toml @@ -6,8 +6,8 @@ edition = "2018" description = "Boot1 partition" [dependencies] -xous = "0.9.66" -utralib = { version = "0.1.25", optional = true, default-features = false } +xous = "0.9.67" +utralib = { version = "0.1.26", optional = true, default-features = false } bao1x-hal = { path = "../../libs/bao1x-hal", optional = true, default-features = false } bao1x-api = { path = "../../libs/bao1x-api", optional = true, default-features = false } vexriscv = { version = "0.5.6", package = "xous-riscv" } diff --git a/bao1x-boot/ed25519-dalek-bao1x/Cargo.toml b/bao1x-boot/ed25519-dalek-bao1x/Cargo.toml index 0d5098112..7d21d7a8a 100644 --- a/bao1x-boot/ed25519-dalek-bao1x/Cargo.toml +++ b/bao1x-boot/ed25519-dalek-bao1x/Cargo.toml @@ -45,7 +45,7 @@ serde = { version = "1.0", default-features = false, optional = true } zeroize = { version = "1.5", default-features = false, optional = true } # HW interface for print debugging -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } [dev-dependencies] curve25519-dalek = { package = "curve25519-dalek-bao1x", path = "../curve25519-dalek-bao1x", default-features = false, features = [ diff --git a/bao1x-boot/sha2-bao1x/Cargo.toml b/bao1x-boot/sha2-bao1x/Cargo.toml index 662b38cdf..6fecc93f6 100644 --- a/bao1x-boot/sha2-bao1x/Cargo.toml +++ b/bao1x-boot/sha2-bao1x/Cargo.toml @@ -11,7 +11,7 @@ description = "sha2 hardware accelerator engine - specific to bao1x" # Rust-standard digest API dependencies digest = "^0.10.7" -utralib = { version = "0.1.25", default-features = false } +utralib = { version = "0.1.26", default-features = false } bao1x-api = { path = "../../libs/bao1x-api" } [features] diff --git a/baremetal/Cargo.toml b/baremetal/Cargo.toml index 591d47a89..27bd492de 100644 --- a/baremetal/Cargo.toml +++ b/baremetal/Cargo.toml @@ -6,8 +6,8 @@ edition = "2018" description = "Baremetal target" [dependencies] -xous = "0.9.66" -utralib = { version = "0.1.25", optional = true, default-features = false } +xous = "0.9.67" +utralib = { version = "0.1.26", optional = true, default-features = false } bao1x-hal = { path = "../libs/bao1x-hal", optional = true, default-features = false } bao1x-api = { path = "../libs/bao1x-api", optional = true, default-features = false } vexriscv = { version = "0.5.6", package = "xous-riscv" } diff --git a/imports/getrandom/Cargo.toml b/imports/getrandom/Cargo.toml index 9f3d49541..007b7b3dd 100644 --- a/imports/getrandom/Cargo.toml +++ b/imports/getrandom/Cargo.toml @@ -30,8 +30,8 @@ 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.67" } -xous = "0.9.66" +xous-names = { package = "xous-api-names", version = "0.9.68" } +xous = "0.9.67" rkyv = { version = "0.8.8", default-features = false, features = [ "std", "alloc", diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 6a43c0629..73cc64e06 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -11,17 +11,17 @@ resolver = "2" [dependencies] bitflags = "1.2.1" stats_alloc = { version = "0.1.8", optional = true } -xous-kernel = { package = "xous", version = "0.9.66", features = [ +xous-kernel = { package = "xous", version = "0.9.67", features = [ "forget-memory-messages", ] } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } rand_chacha = { version = "0.3.1", optional = true, default-features = false } bao1x-hal = { path = "../libs/bao1x-hal", optional = true, default-features = false } loader = { path = "../loader", optional = true, features = ["swap"] } aes = { path = "../services/aes", default-features = false, optional = true } [target.'cfg(any(windows,unix))'.dev-dependencies] -xous-kernel = { package = "xous", version = "0.9.66", features = [ +xous-kernel = { package = "xous", version = "0.9.67", features = [ "forget-memory-messages", "processes-as-threads", ] } @@ -38,7 +38,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.66", features = ["v2p"] } +xous-kernel = { package = "xous", version = "0.9.67", features = ["v2p"] } critical-section = "1.1.1" [lints.rust] diff --git a/libs/bao1x-api/Cargo.toml b/libs/bao1x-api/Cargo.toml index 14486ea38..39c5dc95f 100644 --- a/libs/bao1x-api/Cargo.toml +++ b/libs/bao1x-api/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.0" edition = "2021" [dependencies] -xous = "0.9.66" -xous-ipc = { version = "0.10.6", optional = true } -xous-names = { package = "xous-api-names", version = "0.9.67", optional = true } +xous = "0.9.67" +xous-ipc = { version = "0.10.7", optional = true } +xous-names = { package = "xous-api-names", version = "0.9.68", optional = true } num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } rkyv = { version = "0.8.8", default-features = false, features = [ diff --git a/libs/bao1x-hal/Cargo.toml b/libs/bao1x-hal/Cargo.toml index 1966c374c..c3b080c92 100644 --- a/libs/bao1x-hal/Cargo.toml +++ b/libs/bao1x-hal/Cargo.toml @@ -6,10 +6,10 @@ 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.67", optional = true } -xous-api-ticktimer = { version = "0.9.65", optional = true } +xous-api-names = { version = "0.9.68", optional = true } +xous-api-ticktimer = { version = "0.9.66", optional = true } log = { version = "0.4.14", optional = true } -utralib = { version = "0.1.25", default-features = false, optional = true } +utralib = { version = "0.1.26", default-features = false, optional = true } rkyv = { version = "0.8.8", default-features = false, features = [ "std", "alloc", @@ -42,7 +42,7 @@ sha2-bao1x = { path = "../../bao1x-boot/sha2-bao1x", optional = true, default-fe linked_list_allocator = { version = "0.10.5", optional = true } # [target.'cfg(target_os = "xous")'.dependencies] -xous = { version = "0.9.66", features = ["v2p"] } +xous = { version = "0.9.67", features = ["v2p"] } bitflags = "1.2.1" # TODO: migrate from bitflags to this crate diff --git a/libs/blitstr2/Cargo.toml b/libs/blitstr2/Cargo.toml index 52ed08099..9199520d4 100644 --- a/libs/blitstr2/Cargo.toml +++ b/libs/blitstr2/Cargo.toml @@ -8,9 +8,9 @@ version = "0.1.0" # Dependency versions enforced by Cargo.lock. [dependencies] log = "0.4.14" -xous = "0.9.66" +xous = "0.9.67" -xous-ipc = "0.10.6" +xous-ipc = "0.10.7" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } rkyv = { version = "0.8.8", default-features = false, features = [ diff --git a/libs/chat/Cargo.toml b/libs/chat/Cargo.toml index 32fae5b60..7ebf3056a 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.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous = "0.9.66" -xous-ipc = "0.10.6" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +xous-ipc = "0.10.7" +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } gam = { path = "../../services/gam" } ux-api = { path = "../../libs/ux-api" } blitstr2 = { path = "../blitstr2" } diff --git a/libs/keystore-api/Cargo.toml b/libs/keystore-api/Cargo.toml index 67a93df48..87100f4c7 100644 --- a/libs/keystore-api/Cargo.toml +++ b/libs/keystore-api/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.0" edition = "2021" [dependencies] -xous = "0.9.66" -xous-ipc = { version = "0.10.6", optional = true } -xous-names = { package = "xous-api-names", version = "0.9.67", optional = true } +xous = "0.9.67" +xous-ipc = { version = "0.10.7", optional = true } +xous-names = { package = "xous-api-names", version = "0.9.68", optional = true } num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } rkyv = { version = "0.8.8", default-features = false, features = [ diff --git a/libs/mass-storage/usbd_bulk_only_transport/Cargo.toml b/libs/mass-storage/usbd_bulk_only_transport/Cargo.toml index 09a14cd58..73ab5a0b8 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.66" -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } +xous = "0.9.67" +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } [features] diff --git a/libs/mass-storage/usbd_scsi/Cargo.toml b/libs/mass-storage/usbd_scsi/Cargo.toml index 7bc902b77..0de9603c2 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.66" -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } +xous = "0.9.67" +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } [features] diff --git a/libs/perflib/Cargo.toml b/libs/perflib/Cargo.toml index d5958669d..e3581ca46 100644 --- a/libs/perflib/Cargo.toml +++ b/libs/perflib/Cargo.toml @@ -7,9 +7,9 @@ description = "Performance counter tooling" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.66" +xous = "0.9.67" log = "0.4.14" -utralib = { version = "0.1.25", default-features = false } +utralib = { version = "0.1.26", default-features = false } [features] precursor = ["utralib/precursor"] diff --git a/libs/tls/Cargo.toml b/libs/tls/Cargo.toml index 05f88e5b3..c6dfd91d6 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.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous = "0.9.66" -xous-ipc = "0.10.6" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +xous-ipc = "0.10.7" +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } modals = { path = "../../services/modals" } net = { path = "../../services/net" } diff --git a/libs/userprefs/Cargo.toml b/libs/userprefs/Cargo.toml index 759f4765c..c77da0bc4 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.67" } +xous-names = { package = "xous-api-names", version = "0.9.68" } pddb = { path = "../../services/pddb" } keyboard = { path = "../../services/keyboard" } bincode = { version = "2.0.0-rc.2" } diff --git a/libs/ux-api/Cargo.toml b/libs/ux-api/Cargo.toml index 918119a65..9c3a0da77 100644 --- a/libs/ux-api/Cargo.toml +++ b/libs/ux-api/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.0" edition = "2021" [dependencies] -xous = "0.9.66" -xous-ipc = { version = "0.10.6", optional = true } -xous-names = { package = "xous-api-names", version = "0.9.67", optional = true } +xous = "0.9.67" +xous-ipc = { version = "0.10.7", optional = true } +xous-names = { package = "xous-api-names", version = "0.9.68", optional = true } log = "0.4.14" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } diff --git a/libs/xous-bio-bdma/Cargo.toml b/libs/xous-bio-bdma/Cargo.toml index d96c0785f..a5fef7a6a 100644 --- a/libs/xous-bio-bdma/Cargo.toml +++ b/libs/xous-bio-bdma/Cargo.toml @@ -8,10 +8,10 @@ edition = "2021" [dependencies] log = "0.4.14" defmt = { version = "0.3", optional = true } -utralib = { version = "0.1.25", default-features = false } +utralib = { version = "0.1.26", default-features = false } [target.'cfg(target_os = "xous")'.dependencies] -xous = "0.9.66" +xous = "0.9.67" [features] bao1x = ["utralib/bao1x"] diff --git a/libs/xous-bio/Cargo.toml b/libs/xous-bio/Cargo.toml index 451d0bcbb..f6664b479 100644 --- a/libs/xous-bio/Cargo.toml +++ b/libs/xous-bio/Cargo.toml @@ -8,10 +8,10 @@ edition = "2021" [dependencies] log = "0.4.14" defmt = { version = "0.3", optional = true } -utralib = { version = "0.1.25", default-features = false, features = ["bao1x"] } +utralib = { version = "0.1.26", default-features = false, features = ["bao1x"] } [target.'cfg(target_os = "xous")'.dependencies] -xous = "0.9.66" +xous = "0.9.67" [features] bao1x = ["utralib/bao1x"] diff --git a/libs/xous-pio/Cargo.toml b/libs/xous-pio/Cargo.toml index 9026d782a..8af168451 100644 --- a/libs/xous-pio/Cargo.toml +++ b/libs/xous-pio/Cargo.toml @@ -10,10 +10,10 @@ log = "0.4.14" pio-proc = "0.2.2" pio = "0.2.1" defmt = { version = "0.3", optional = true } -utralib = { version = "0.1.25", default-features = false } +utralib = { version = "0.1.26", default-features = false } [target.'cfg(target_os = "xous")'.dependencies] -xous = "0.9.66" +xous = "0.9.67" [features] bao1x = ["utralib/bao1x"] diff --git a/libs/xous-pl230/Cargo.toml b/libs/xous-pl230/Cargo.toml index c3d961bdb..e072e6a3f 100644 --- a/libs/xous-pl230/Cargo.toml +++ b/libs/xous-pl230/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] log = "0.4.14" -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } bitfield = "0.13.2" # xous-pio = { path = "../xous-pio", optional = true, default-features = false } pio-proc = "0.2.2" @@ -15,7 +15,7 @@ pio = "0.2.1" bao1x-hal = { path = "../bao1x-hal", optional = true, default-features = false } [target.'cfg(target_os = "xous")'.dependencies] -xous = "0.9.66" +xous = "0.9.67" [features] bao1x = ["utralib/bao1x"] diff --git a/loader/Cargo.toml b/loader/Cargo.toml index 94ab0efbb..baf89d4b7 100644 --- a/loader/Cargo.toml +++ b/loader/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" description = "Initial kernel loader for Xous" [dependencies] -xous = "0.9.66" +xous = "0.9.67" ed25519-dalek-loader = { path = "ed25519-dalek-loader", default-features = false, optional = true } curve25519-dalek-loader = { path = "curve25519-dalek-loader", default-features = false, features = [ "u32e_backend", @@ -18,7 +18,7 @@ ed25519-dalek-bao1x = { path = "../bao1x-boot/ed25519-dalek-bao1x", default-feat "digest", ], optional = true } sha2-bao1x = { path = "../bao1x-boot/sha2-bao1x", optional = true, default-features = false } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } armv7 = { git = "https://github.com/Foundation-Devices/armv7.git", branch = "update", optional = true } atsama5d27 = { git = "https://github.com/Foundation-Devices/atsama5d27.git", branch = "master", optional = true } sha2-loader = { path = "./sha2-loader", default-features = false, optional = true } diff --git a/loader/curve25519-dalek-loader/Cargo.toml b/loader/curve25519-dalek-loader/Cargo.toml index eed9d9a06..1f501fa12 100644 --- a/loader/curve25519-dalek-loader/Cargo.toml +++ b/loader/curve25519-dalek-loader/Cargo.toml @@ -56,7 +56,7 @@ packed_simd = { version = "0.3.4", package = "packed_simd_2", features = [ ], optional = true } zeroize = { version = "1", default-features = false } fiat-crypto = { version = "0.1.6", optional = true } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } # Betrusted/Precursor dependency set log = { version = "0.4", optional = true } diff --git a/loader/sha2-loader/Cargo.toml b/loader/sha2-loader/Cargo.toml index 7d990274c..9d9d0b974 100644 --- a/loader/sha2-loader/Cargo.toml +++ b/loader/sha2-loader/Cargo.toml @@ -12,7 +12,7 @@ description = "sha2 hardware accelerator engine" digest = "0.9.0" block-buffer = "0.9.0" opaque-debug = "0.3.0" # prevents internal hash state leakage from debug structures -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } [features] precursor = ["utralib/precursor"] diff --git a/loader/src/phase1.rs b/loader/src/phase1.rs index 560e9b0ab..3e2241300 100644 --- a/loader/src/phase1.rs +++ b/loader/src/phase1.rs @@ -60,13 +60,13 @@ pub fn phase_1(cfg: &mut BootConfig, detached_app: bool) { } if VDBG { let check_iter = cfg.args.iter(); - for a in check_iter { + for _a in check_iter { crate::println!( "{}: base {:x} size {:x} data {:x?}", - core::str::from_utf8(&a.name.to_le_bytes()).unwrap_or("invalid name"), - a.this as usize, - a.size, - a.data + core::str::from_utf8(&_a.name.to_le_bytes()).unwrap_or("invalid name"), + _a.this as usize, + _a.size, + _a.data ); } } diff --git a/planning/rkyv-migration1/Cargo.toml b/planning/rkyv-migration1/Cargo.toml index 73aee32f6..e21ea87a2 100644 --- a/planning/rkyv-migration1/Cargo.toml +++ b/planning/rkyv-migration1/Cargo.toml @@ -8,4 +8,4 @@ rkyv = { version = "0.8.8", default-features = false, features = [ "std", "alloc", ] } -xous = "0.9.66" +xous = "0.9.67" diff --git a/planning/rkyv-migration2/Cargo.toml b/planning/rkyv-migration2/Cargo.toml index 0d1d6ff3f..952b7ac16 100644 --- a/planning/rkyv-migration2/Cargo.toml +++ b/planning/rkyv-migration2/Cargo.toml @@ -9,6 +9,6 @@ rkyv = { version = "0.8.8", default-features = false, features = [ "alloc", "bytecheck", ] } -xous = { version = "0.9.66", features = ["forget-memory-messages"] } +xous = { version = "0.9.67", features = ["forget-memory-messages"] } num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } diff --git a/services/aes-test/Cargo.toml b/services/aes-test/Cargo.toml index 1c8a522bb..d43f35573 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.65" } -xous = "0.9.66" +log-server = { package = "xous-api-log", version = "0.1.66" } +xous = "0.9.67" [features] default = [] diff --git a/services/bao-console/Cargo.toml b/services/bao-console/Cargo.toml index 2b799411d..5ace7c826 100644 --- a/services/bao-console/Cargo.toml +++ b/services/bao-console/Cargo.toml @@ -4,11 +4,11 @@ version = "0.1.0" edition = "2021" [dependencies] -utralib = { version = "0.1.25", optional = true, default-features = false } -xous-names = { package = "xous-api-names", version = "0.9.67" } -ticktimer = { package = "xous-api-ticktimer", version = "0.9.65" } -xous = "0.9.66" -log-server = { package = "xous-api-log", version = "0.1.65" } +utralib = { version = "0.1.26", optional = true, default-features = false } +xous-names = { package = "xous-api-names", version = "0.9.68" } +ticktimer = { package = "xous-api-ticktimer", version = "0.9.66" } +xous = "0.9.67" +log-server = { package = "xous-api-log", version = "0.1.66" } log = "0.4.14" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } diff --git a/services/bao-video/Cargo.toml b/services/bao-video/Cargo.toml index c64c245be..b9001f681 100644 --- a/services/bao-video/Cargo.toml +++ b/services/bao-video/Cargo.toml @@ -7,11 +7,11 @@ edition = "2021" bao1x-hal = { path = "../../libs/bao1x-hal", features = [ "std", ], optional = true, default-features = false } -utralib = { version = "0.1.25", optional = true, default-features = false } -xous-names = { package = "xous-api-names", version = "0.9.67" } -ticktimer = { package = "xous-api-ticktimer", version = "0.9.65" } -xous = "0.9.66" -log-server = { package = "xous-api-log", version = "0.1.65" } +utralib = { version = "0.1.26", optional = true, default-features = false } +xous-names = { package = "xous-api-names", version = "0.9.68" } +ticktimer = { package = "xous-api-ticktimer", version = "0.9.66" } +xous = "0.9.67" +log-server = { package = "xous-api-log", version = "0.1.66" } log = "0.4.14" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } @@ -20,7 +20,7 @@ ux-api = { path = "../../libs/ux-api" } bao1x-emu = { path = "../bao1x-emu", optional = true } bao1x-api = { path = "../../libs/bao1x-api" } blitstr2 = { path = "../../libs/blitstr2" } -xous-ipc = "0.10.6" +xous-ipc = "0.10.7" rkyv = { version = "0.8.8", default-features = false, features = [ "std", "alloc", diff --git a/services/bao1x-emu/Cargo.toml b/services/bao1x-emu/Cargo.toml index f1daf48be..fc30dd5d8 100644 --- a/services/bao1x-emu/Cargo.toml +++ b/services/bao1x-emu/Cargo.toml @@ -4,14 +4,14 @@ version = "0.1.0" edition = "2021" [dependencies] -xous = "0.9.66" -xous-ipc = "0.10.6" -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +xous-ipc = "0.10.7" +xous-names = { package = "xous-api-names", version = "0.9.68" } "ux-api" = { path = "../../libs/ux-api" } "rand" = "0.8" rand_core = "0.6.4" log = "0.4.14" -log-server = { package = "xous-api-log", version = "0.1.65" } +log-server = { package = "xous-api-log", version = "0.1.66" } num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } rkyv = { version = "0.8.8", default-features = false, features = [ diff --git a/services/bao1x-hal-service/Cargo.toml b/services/bao1x-hal-service/Cargo.toml index 2b2bcd2e1..f5b9f8857 100644 --- a/services/bao1x-hal-service/Cargo.toml +++ b/services/bao1x-hal-service/Cargo.toml @@ -6,14 +6,14 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -utralib = { version = "0.1.25", optional = true, default-features = false, features = [ +utralib = { version = "0.1.26", optional = true, default-features = false, features = [ "bao1x", ] } -xous-names = { package = "xous-api-names", version = "0.9.67" } -ticktimer = { package = "xous-api-ticktimer", version = "0.9.65" } -xous = { version = "0.9.66", features = ["raw-trng"] } -xous-ipc = "0.10.6" -log-server = { package = "xous-api-log", version = "0.1.65" } +xous-names = { package = "xous-api-names", version = "0.9.68" } +ticktimer = { package = "xous-api-ticktimer", version = "0.9.66" } +xous = { version = "0.9.67", features = ["raw-trng"] } +xous-ipc = "0.10.7" +log-server = { package = "xous-api-log", version = "0.1.66" } log = "0.4.14" bao1x-hal = { path = "../../libs/bao1x-hal", default-features = false } bao1x-api = { path = "../../libs/bao1x-api", features = [ diff --git a/services/bao1x-mbox1/Cargo.toml b/services/bao1x-mbox1/Cargo.toml index 2c60a667b..1fbafa5a2 100644 --- a/services/bao1x-mbox1/Cargo.toml +++ b/services/bao1x-mbox1/Cargo.toml @@ -6,11 +6,11 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -utralib = { version = "0.1.25", optional = true, default-features = false } -xous-api-names = "0.9.67" -xous-api-ticktimer = "0.9.65" -xous = "0.9.66" -log-server = { package = "xous-api-log", version = "0.1.65" } +utralib = { version = "0.1.26", optional = true, default-features = false } +xous-api-names = "0.9.68" +xous-api-ticktimer = "0.9.66" +xous = "0.9.67" +log-server = { package = "xous-api-log", version = "0.1.66" } log = "0.4.14" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } diff --git a/services/bao1x-mbox2/Cargo.toml b/services/bao1x-mbox2/Cargo.toml index d4482e79d..2c470ac7b 100644 --- a/services/bao1x-mbox2/Cargo.toml +++ b/services/bao1x-mbox2/Cargo.toml @@ -6,11 +6,11 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -utralib = { version = "0.1.25", optional = true, default-features = false } -xous-api-names = "0.9.67" -xous-api-ticktimer = "0.9.65" -xous = "0.9.66" -log-server = { package = "xous-api-log", version = "0.1.65" } +utralib = { version = "0.1.26", optional = true, default-features = false } +xous-api-names = "0.9.68" +xous-api-ticktimer = "0.9.66" +xous = "0.9.67" +log-server = { package = "xous-api-log", version = "0.1.66" } log = "0.4.14" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } diff --git a/services/codec/Cargo.toml b/services/codec/Cargo.toml index 0b0a6af8d..d7d225be9 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.66" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } log = "0.4.14" -susres = { package = "xous-api-susres", version = "0.9.65" } +susres = { package = "xous-api-susres", version = "0.9.66" } llio = { path = "../llio" } trng = { path = "../trng" } -xous-ipc = "0.10.6" +xous-ipc = "0.10.7" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } rkyv = { version = "0.8.8", default-features = false, features = [ @@ -24,7 +24,7 @@ rkyv = { version = "0.8.8", default-features = false, features = [ "alloc", ] } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } [features] precursor = ["utralib/precursor"] diff --git a/services/com/Cargo.toml b/services/com/Cargo.toml index a27d248b3..082c0ee66 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.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -susres = { package = "xous-api-susres", version = "0.9.65" } +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +susres = { package = "xous-api-susres", version = "0.9.66" } typenum = "1.12" -xous = "0.9.66" -xous-ipc = "0.10.6" -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +xous-ipc = "0.10.7" +xous-names = { package = "xous-api-names", version = "0.9.68" } trng = { path = "../trng" } llio = { path = "../llio" } @@ -26,9 +26,9 @@ rkyv = { version = "0.8.8", default-features = false, features = [ "alloc", ] } -xous-semver = "0.1.2" +xous-semver = "0.1.5" -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } [target.'cfg(any(windows,unix))'.dependencies] diff --git a/services/com/src/main.rs b/services/com/src/main.rs index 8f6583622..a4551d532 100644 --- a/services/com/src/main.rs +++ b/services/com/src/main.rs @@ -1217,6 +1217,8 @@ fn main() -> ! { } fn parse_version(com: &mut crate::implementation::XousCom) -> u32 { + use std::str::FromStr; + use xous_semver::SemVer; // this feature was only introduced since 0.9.6. Unfortunately, there is no good way to figure out diff --git a/services/content-plugin-api/Cargo.toml b/services/content-plugin-api/Cargo.toml index 1e31972a1..1eaca5ae8 100644 --- a/services/content-plugin-api/Cargo.toml +++ b/services/content-plugin-api/Cargo.toml @@ -7,11 +7,11 @@ description = "Content Canvas Plugin Common APIs" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.66" +xous = "0.9.67" rkyv = { version = "0.8.8", default-features = false, features = [ "std", "alloc", ] } ux-api = { path = "../../libs/ux-api" } -xous-names = { package = "xous-api-names", version = "0.9.67" } # used by the IMEF for registering listeners +xous-names = { package = "xous-api-names", version = "0.9.68" } # 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 5db54d03b..c987bd758 100644 --- a/services/cram-console/Cargo.toml +++ b/services/cram-console/Cargo.toml @@ -6,12 +6,12 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -utralib = { version = "0.1.25", optional = true, default-features = false } -xous-names = { package = "xous-api-names", version = "0.9.67" } -ticktimer = { package = "xous-api-ticktimer", version = "0.9.65" } -xous = "0.9.66" -xous-ipc = "0.10.6" -log-server = { package = "xous-api-log", version = "0.1.65" } +utralib = { version = "0.1.26", optional = true, default-features = false } +xous-names = { package = "xous-api-names", version = "0.9.68" } +ticktimer = { package = "xous-api-ticktimer", version = "0.9.66" } +xous = "0.9.67" +xous-ipc = "0.10.7" +log-server = { package = "xous-api-log", version = "0.1.66" } log = "0.4.14" num-derive = { version = "0.4.2", 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 27cab6e99..2f9abb836 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.66" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } log = "0.4.14" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } net = { path = "../net" } -xous-ipc = "0.10.6" +xous-ipc = "0.10.7" rkyv = { version = "0.8.8", default-features = false, features = [ "std", "alloc", @@ -31,12 +31,12 @@ 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.65" } +susres = { package = "xous-api-susres", version = "0.9.66" } userprefs = { path = "../../libs/userprefs" } modals = { path = "../modals" } precursor-hal = { path = "../../libs/precursor-hal" } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } [features] precursor = ["utralib/precursor"] diff --git a/services/early_settings/Cargo.toml b/services/early_settings/Cargo.toml index 5f97fc82e..c13be5b41 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.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous = "0.9.66" -xous-ipc = "0.10.6" -xous-names = { package = "xous-api-names", version = "0.9.67" } -susres = { package = "xous-api-susres", version = "0.9.65" } +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous = "0.9.67" +xous-ipc = "0.10.7" +xous-names = { package = "xous-api-names", version = "0.9.68" } +susres = { package = "xous-api-susres", version = "0.9.66" } spinor = { path = "../../services/spinor" } precursor-hal = { path = "../../libs/precursor-hal" } @@ -27,5 +27,5 @@ rkyv = { version = "0.8.8", default-features = false, features = [ "alloc", ] } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } once_cell = "1.17.1" diff --git a/services/ffi-test/Cargo.toml b/services/ffi-test/Cargo.toml index ae1e6fcfd..bb28f1f80 100644 --- a/services/ffi-test/Cargo.toml +++ b/services/ffi-test/Cargo.toml @@ -7,18 +7,18 @@ description = "FFI test integration" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.66" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } log = "0.4.14" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } -susres = { package = "xous-api-susres", version = "0.9.65" } +susres = { package = "xous-api-susres", version = "0.9.66" } ffi-sys = { path = "sys" } keyboard = { path = "../keyboard" } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } [features] precursor = ["utralib/precursor"] diff --git a/services/gam/Cargo.toml b/services/gam/Cargo.toml index 9f3c1c875..ef92ec350 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", optional = true } log = "0.4.14" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } trng = { path = "../trng", optional = true } -xous = "0.9.66" -xous-ipc = "0.10.6" -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +xous-ipc = "0.10.7" +xous-names = { package = "xous-api-names", version = "0.9.68" } blitstr2 = { path = "../../libs/blitstr2" } ux-api = { path = "../../libs/ux-api", default-features = false } @@ -30,7 +30,7 @@ rkyv = { version = "0.8.8", default-features = false, features = [ "alloc", ] } -susres = { package = "xous-api-susres", version = "0.9.65", optional = true } # used for the sleep now menu item +susres = { package = "xous-api-susres", version = "0.9.66", optional = true } # used for the sleep now menu item bao1x-hal-service = { path = "../bao1x-hal-service", optional = true, default-features = false } enum_dispatch = "0.3.7" # used for trait-based dispatch off of multiple layout objects. @@ -47,7 +47,7 @@ hex = { version = "0.4.3", default-features = false, features = ["alloc"] } sha2 = { version = "0.10.8" } digest = "0.9.0" -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } [features] precursor = [ diff --git a/services/graphics-server/Cargo.toml b/services/graphics-server/Cargo.toml index 258e06077..ea9affd3a 100644 --- a/services/graphics-server/Cargo.toml +++ b/services/graphics-server/Cargo.toml @@ -9,16 +9,16 @@ version = "0.1.0" [dependencies] keyboard = { path = "../keyboard" } log = "0.4.14" -log-server = { package = "xous-api-log", version = "0.1.65" } -xous = "0.9.66" -susres = { package = "xous-api-susres", version = "0.9.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } +log-server = { package = "xous-api-log", version = "0.1.66" } +xous = "0.9.67" +susres = { package = "xous-api-susres", version = "0.9.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } locales = { path = "../../locales" } blitstr2 = { path = "../../libs/blitstr2" } ux-api = { path = "../../libs/ux-api" } -xous-ipc = "0.10.6" -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous-ipc = "0.10.7" +xous-names = { package = "xous-api-names", version = "0.9.68" } num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } rkyv = { version = "0.8.8", default-features = false, features = [ @@ -26,7 +26,7 @@ rkyv = { version = "0.8.8", default-features = false, features = [ "alloc", ] } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } bao1x-hal-service = { path = "../bao1x-hal-service", optional = true, features = [ ] } diff --git a/services/ime-frontend/Cargo.toml b/services/ime-frontend/Cargo.toml index 65503f55c..8d047461f 100644 --- a/services/ime-frontend/Cargo.toml +++ b/services/ime-frontend/Cargo.toml @@ -12,12 +12,12 @@ ux-api = { path = "../../libs/ux-api" } ime-plugin-api = { path = "../ime-plugin-api" } keyboard = { path = "../keyboard" } log = "0.4.14" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous = "0.9.66" +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous = "0.9.67" locales = { path = "../../locales" } -xous-ipc = "0.10.6" -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous-ipc = "0.10.7" +xous-names = { package = "xous-api-names", version = "0.9.68" } num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } @@ -28,7 +28,7 @@ rkyv = { version = "0.8.8", default-features = false, features = [ tts-frontend = { path = "../tts" } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } [features] precursor = ["utralib/precursor"] diff --git a/services/ime-plugin-api/Cargo.toml b/services/ime-plugin-api/Cargo.toml index fb3b82141..71565a3ae 100644 --- a/services/ime-plugin-api/Cargo.toml +++ b/services/ime-plugin-api/Cargo.toml @@ -9,9 +9,9 @@ version = "0.1.0" [dependencies] ux-api = { path = "../../libs/ux-api" } log = "0.4.14" -xous = "0.9.66" -xous-ipc = "0.10.6" -xous-names = { package = "xous-api-names", version = "0.9.67" } # used by the IMEF for registering listeners +xous = "0.9.67" +xous-ipc = "0.10.7" +xous-names = { package = "xous-api-names", version = "0.9.68" } # used by the IMEF for registering listeners num-derive = { version = "0.4.2", 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 d13f22e7d..cb9330629 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.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous = "0.9.66" -xous-ipc = "0.10.6" -xous-names = { package = "xous-api-names", version = "0.9.67" } +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous = "0.9.67" +xous-ipc = "0.10.7" +xous-names = { package = "xous-api-names", version = "0.9.68" } num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } @@ -22,7 +22,7 @@ rkyv = { version = "0.8.8", default-features = false, features = [ "alloc", ] } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } [features] precursor = ["utralib/precursor"] diff --git a/services/ime-plugin-tts/Cargo.toml b/services/ime-plugin-tts/Cargo.toml index 41d603e09..ef71457a9 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.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous = "0.9.66" -xous-ipc = "0.10.6" -xous-names = { package = "xous-api-names", version = "0.9.67" } +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous = "0.9.67" +xous-ipc = "0.10.7" +xous-names = { package = "xous-api-names", version = "0.9.68" } num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } @@ -25,7 +25,7 @@ rkyv = { version = "0.8.8", default-features = false, features = [ tts-frontend = { path = "../tts" } locales = { path = "../../locales" } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } [features] precursor = ["utralib/precursor"] diff --git a/services/jtag/Cargo.toml b/services/jtag/Cargo.toml index 489a1d784..2f7e75f39 100644 --- a/services/jtag/Cargo.toml +++ b/services/jtag/Cargo.toml @@ -7,22 +7,22 @@ description = "JTAG port server" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.66" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } log = "0.4.14" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } -susres = { package = "xous-api-susres", version = "0.9.65" } +susres = { package = "xous-api-susres", version = "0.9.66" } -xous-ipc = "0.10.6" +xous-ipc = "0.10.7" rkyv = { version = "0.8.8", default-features = false, features = [ "std", "alloc", ] } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } [features] precursor = ["utralib/precursor"] diff --git a/services/kernel-test/Cargo.toml b/services/kernel-test/Cargo.toml index 49eb11a27..e626baf9b 100644 --- a/services/kernel-test/Cargo.toml +++ b/services/kernel-test/Cargo.toml @@ -7,12 +7,12 @@ description = "Program to test various aspects of the kernel" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.66" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } +xous = "0.9.67" +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } log = "0.4.14" -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } [features] precursor = ["utralib/precursor"] diff --git a/services/keyboard/Cargo.toml b/services/keyboard/Cargo.toml index 72441a328..aec6333ea 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.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous = "0.9.66" -xous-ipc = "0.10.6" -xous-names = { package = "xous-api-names", version = "0.9.67" } +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous = "0.9.67" +xous-ipc = "0.10.7" +xous-names = { package = "xous-api-names", version = "0.9.68" } llio = { path = "../llio" } -susres = { package = "xous-api-susres", version = "0.9.65" } +susres = { package = "xous-api-susres", version = "0.9.66" } spinor = { path = "../spinor" } num-derive = { version = "0.4.2", default-features = false } @@ -27,7 +27,7 @@ rkyv = { version = "0.8.8", default-features = false, features = [ "alloc", ] } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } early_settings = { path = "../early_settings" } [features] diff --git a/services/keystore/Cargo.toml b/services/keystore/Cargo.toml index 70aeff51f..8e00f1ba0 100644 --- a/services/keystore/Cargo.toml +++ b/services/keystore/Cargo.toml @@ -7,11 +7,11 @@ description = "Keystore server for compact devices" # Dependency versions enforced by Cargo.lock. [dependencies] -utralib = { version = "0.1.25", optional = true, default-features = false } -xous-names = { package = "xous-api-names", version = "0.9.67" } -ticktimer = { package = "xous-api-ticktimer", version = "0.9.65" } -xous = "0.9.66" -log-server = { package = "xous-api-log", version = "0.1.65" } +utralib = { version = "0.1.26", optional = true, default-features = false } +xous-names = { package = "xous-api-names", version = "0.9.68" } +ticktimer = { package = "xous-api-ticktimer", version = "0.9.66" } +xous = "0.9.67" +log-server = { package = "xous-api-log", version = "0.1.66" } log = "0.4.14" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } @@ -22,7 +22,7 @@ bao1x-hal-service = { path = "../bao1x-hal-service", optional = true } ux-api = { path = "../../libs/ux-api" } bao1x-emu = { path = "../bao1x-emu", optional = true } bao1x-api = { path = "../../libs/bao1x-api" } -xous-ipc = "0.10.6" +xous-ipc = "0.10.7" rkyv = { version = "0.8.8", default-features = false, features = [ "std", "alloc", diff --git a/services/libstd-test/Cargo.toml b/services/libstd-test/Cargo.toml index b8faca2d0..e3571531d 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.66" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } log = "0.4.14" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } @@ -18,7 +18,7 @@ net = { path = "../net" } dns = { path = "../dns" } com = { path = "../com" } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } [features] precursor = ["utralib/precursor"] diff --git a/services/llio/Cargo.toml b/services/llio/Cargo.toml index 1e9d50988..42fabb50b 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.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous = "0.9.66" -xous-ipc = "0.10.6" -xous-names = { package = "xous-api-names", version = "0.9.67" } -susres = { package = "xous-api-susres", version = "0.9.65" } +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous = "0.9.67" +xous-ipc = "0.10.7" +xous-names = { package = "xous-api-names", version = "0.9.68" } +susres = { package = "xous-api-susres", version = "0.9.66" } # RTC dependencies bitflags = "1.2.1" @@ -26,9 +26,9 @@ rkyv = { version = "0.8.8", default-features = false, features = [ "alloc", ] } -xous-semver = "0.1.2" +xous-semver = "0.1.5" -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } [target.'cfg(any(windows,unix))'.dependencies] chrono = "0.4.33" diff --git a/services/log-test-client/Cargo.toml b/services/log-test-client/Cargo.toml index 8e18647ae..9e3c9889e 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.66" +xous = "0.9.67" [features] default = [] diff --git a/services/modals/Cargo.toml b/services/modals/Cargo.toml index c701f9055..5dc620a94 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.66" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } log = "0.4.14" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous-ipc = "0.10.6" +xous-ipc = "0.10.7" rkyv = { version = "0.8.8", default-features = false, features = [ "std", "alloc", diff --git a/services/net/Cargo.toml b/services/net/Cargo.toml index 0a5cca3db..5c4ce61cb 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.66" -xous-ipc = "0.10.6" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +xous-ipc = "0.10.7" +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } log = "0.4.14" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } -susres = { package = "xous-api-susres", version = "0.9.65" } +susres = { package = "xous-api-susres", version = "0.9.66" } rkyv = { version = "0.8.8", default-features = false, features = [ "std", "alloc", @@ -29,12 +29,12 @@ modals = { path = "../modals" } locales = { path = "../../locales" } precursor-hal = { path = "../../libs/precursor-hal" } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } # for automatic SSID management and AP list storage pddb = { path = "../pddb" } -xous-semver = "0.1.2" +xous-semver = "0.1.5" [dependencies.smoltcp] version = "0.11.0" diff --git a/services/pddb/Cargo.toml b/services/pddb/Cargo.toml index 4d081cf70..4cd5da9ca 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.66" -xous-ipc = "0.10.6" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } -susres = { package = "xous-api-susres", version = "0.9.65", optional = true } +xous = "0.9.67" +xous-ipc = "0.10.7" +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } +susres = { package = "xous-api-susres", version = "0.9.66", optional = true } log = "0.4.14" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } @@ -56,7 +56,7 @@ ux-api = { path = "../../libs/ux-api" } locales = { path = "../../locales" } modals = { path = "../modals", optional = true } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } # performance profiling perflib = { path = "../../libs/perflib", optional = true } diff --git a/services/root-keys/Cargo.toml b/services/root-keys/Cargo.toml index c6d0f89ac..495c7b135 100644 --- a/services/root-keys/Cargo.toml +++ b/services/root-keys/Cargo.toml @@ -7,23 +7,23 @@ description = "Xous root keys server" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.66" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } log = "0.4.14" -susres = { package = "xous-api-susres", version = "0.9.65" } +susres = { package = "xous-api-susres", version = "0.9.66" } trng = { path = "../trng" } spinor = { path = "../spinor" } llio = { path = "../llio" } com = { path = "../com" } -xous-semver = "0.1.2" -utralib = { version = "0.1.25", optional = true, default-features = false } +xous-semver = "0.1.5" +utralib = { version = "0.1.26", optional = true, default-features = false } blitstr2 = { path = "../../libs/blitstr2" } keystore-api = { path = "../../libs/keystore-api" } precursor-hal = { path = "../../libs/precursor-hal" } -xous-ipc = "0.10.6" +xous-ipc = "0.10.7" num-derive = { version = "0.4.1", default-features = false } num-traits = { version = "0.2.14", default-features = false } rkyv = { version = "0.8.8", default-features = false, features = [ diff --git a/services/root-keys/src/implementation.rs b/services/root-keys/src/implementation.rs index d3512a032..be591a0ca 100644 --- a/services/root-keys/src/implementation.rs +++ b/services/root-keys/src/implementation.rs @@ -3088,6 +3088,8 @@ impl<'a> RootKeys { } pub fn staged_semver(&self) -> SemVer { + use std::str::FromStr; + let staging_meta = self.fetch_gw_metadata(GatewareRegion::Staging); if staging_meta.magic == 0x6174656d { let tag_str = @@ -3112,6 +3114,7 @@ impl<'a> RootKeys { /// The main utility of this function is to simplify the out of the box experience /// before root keys have been added. pub fn try_nokey_soc_update(&mut self, rootkeys_modal: &mut Modal, main_cid: xous::CID) -> bool { + use std::str::FromStr; if self.is_initialized() { log::warn!("No-touch update attempted, but keys are initialized. Aborting."); return false; diff --git a/services/shellchat/Cargo.toml b/services/shellchat/Cargo.toml index 97b6ed54d..c5828f2e3 100644 --- a/services/shellchat/Cargo.toml +++ b/services/shellchat/Cargo.toml @@ -17,13 +17,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.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous = "0.9.66" -xous-ipc = "0.10.6" -xous-names = { package = "xous-api-names", version = "0.9.67" } +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous = "0.9.67" +xous-ipc = "0.10.7" +xous-names = { package = "xous-api-names", version = "0.9.68" } keyboard = { path = "../keyboard" } -susres = { package = "xous-api-susres", version = "0.9.65" } +susres = { package = "xous-api-susres", version = "0.9.66" } codec = { path = "../codec" } sha2 = { version = "0.10.8" } digest = "0.10.7" @@ -40,7 +40,7 @@ modals = { path = "../modals" } usb-device-xous = { path = "../usb-device-xous" } precursor-hal = { path = "../../libs/precursor-hal" } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } tts-frontend = { path = "../tts" } locales = { path = "../../locales" } diff --git a/services/skeleton/Cargo.toml b/services/skeleton/Cargo.toml index 3f537327c..7ed1e5370 100644 --- a/services/skeleton/Cargo.toml +++ b/services/skeleton/Cargo.toml @@ -7,16 +7,16 @@ description = "Audio CODEC server" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.66" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } log = "0.4.14" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } -susres = { package = "xous-api-susres", version = "0.9.65" } +susres = { package = "xous-api-susres", version = "0.9.66" } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } [features] precursor = ["utralib/precursor"] diff --git a/services/spinor/Cargo.toml b/services/spinor/Cargo.toml index f0112561a..46a18b7e1 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.66" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } log = "0.4.14" -susres = { package = "xous-api-susres", version = "0.9.65" } +susres = { package = "xous-api-susres", version = "0.9.66" } trng = { path = "../trng" } com = { path = "../com" } llio = { path = "../llio" } @@ -22,11 +22,11 @@ rkyv = { version = "0.8.8", default-features = false, features = [ "std", "alloc", ] } -xous-ipc = "0.10.6" +xous-ipc = "0.10.7" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } [dev-dependencies] lazy_static = "1.4.0" diff --git a/services/status/Cargo.toml b/services/status/Cargo.toml index 114129f3f..5891ec547 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.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } trng = { path = "../trng" } llio = { path = "../llio" } -xous = "0.9.66" -xous-ipc = "0.10.6" -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +xous-ipc = "0.10.7" +xous-names = { package = "xous-api-names", version = "0.9.68" } ux-api = { path = "../../libs/ux-api" } gam = { path = "../gam" } locales = { path = "../../locales" } -susres = { package = "xous-api-susres", version = "0.9.65" } +susres = { package = "xous-api-susres", version = "0.9.66" } root-keys = { path = "../root-keys" } keystore-api = { path = "../../libs/keystore-api", features = ["gen1"] } modals = { path = "../modals" } @@ -47,10 +47,10 @@ crossbeam = "0.8.2" sha2 = { version = "0.10.8" } digest = "0.10.7" -xous-semver = "0.1.2" +xous-semver = "0.1.5" com_rs = { git = "https://github.com/betrusted-io/com_rs", rev = "891bdd3ca8e41f81510d112483e178aea3e3a921" } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } # short circuit the datetime call on hosted mode [target.'cfg(any(windows,unix))'.dependencies] diff --git a/services/test-spawn/Cargo.toml b/services/test-spawn/Cargo.toml index 1ac4f29b8..352414b70 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.66" +xous = "0.9.67" diff --git a/services/test-spawn/spawn/Cargo.toml b/services/test-spawn/spawn/Cargo.toml index 1f1d80787..ae683f51a 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.66" +xous = "0.9.67" diff --git a/services/test-swapper/Cargo.toml b/services/test-swapper/Cargo.toml index 599e4876c..2ae71326b 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.65" -xous-names = { package = "xous-api-names", version = "0.9.67" } -log-server = { package = "xous-api-log", version = "0.1.65" } -xous = "0.9.66" -xous-ipc = "0.10.6" +xous-api-susres = "0.9.66" +xous-names = { package = "xous-api-names", version = "0.9.68" } +log-server = { package = "xous-api-log", version = "0.1.66" } +xous = "0.9.67" +xous-ipc = "0.10.7" log = "0.4.14" num-derive = { version = "0.4.2", default-features = false } @@ -25,7 +25,7 @@ rkyv = { version = "0.8.8", default-features = false, features = [ ] } xous-swapper = { path = "../xous-swapper" } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } [features] precursor = ["utralib/precursor"] diff --git a/services/ticktimer-test-client/Cargo.toml b/services/ticktimer-test-client/Cargo.toml index 258bd86eb..de8887310 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.66" +xous = "0.9.67" log = "0.4.14" -log-server = { package = "xous-api-log", version = "0.1.65" } -susres = { package = "xous-api-susres", version = "0.9.65", optional = true } -xous-names = { package = "xous-api-names", version = "0.9.67", optional = true } +log-server = { package = "xous-api-log", version = "0.1.66" } +susres = { package = "xous-api-susres", version = "0.9.66", optional = true } +xous-names = { package = "xous-api-names", version = "0.9.68", optional = true } [features] susres-testing = ["susres", "xous-names"] diff --git a/services/trng/Cargo.toml b/services/trng/Cargo.toml index c2ec35e39..693e0a7e8 100644 --- a/services/trng/Cargo.toml +++ b/services/trng/Cargo.toml @@ -7,21 +7,21 @@ description = "TRNG server" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.66" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } 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.65" } +susres = { package = "xous-api-susres", version = "0.9.66" } rkyv = { version = "0.8.8", default-features = false, features = [ "std", "alloc", ] } -xous-ipc = "0.10.6" +xous-ipc = "0.10.7" rand_core = "0.6.4" # the 0.6.4 API is necessary for compatibility with curve25519-dalek crates -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } flatipc = { path = "../../libs/flatipc" } flatipc-derive = { path = "../../libs/flatipc-derive" } diff --git a/services/tts/Cargo.toml b/services/tts/Cargo.toml index fc6f283e2..e11d4caa4 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.66" -xous-ipc = "0.10.6" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +xous-ipc = "0.10.7" +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } log = "0.4.14" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } @@ -22,7 +22,7 @@ rkyv = { version = "0.8.8", default-features = false, features = [ xous-tts-backend = "0.1.6" codec = { path = "../codec" } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } [features] precursor = ["utralib/precursor"] diff --git a/services/usb-bao1x/Cargo.toml b/services/usb-bao1x/Cargo.toml index 2b8bf921b..d3c8c6aea 100644 --- a/services/usb-bao1x/Cargo.toml +++ b/services/usb-bao1x/Cargo.toml @@ -4,12 +4,12 @@ version = "0.1.0" edition = "2021" [dependencies] -utralib = { version = "0.1.25", optional = true, default-features = false } -xous-names = { package = "xous-api-names", version = "0.9.67" } -ticktimer = { package = "xous-api-ticktimer", version = "0.9.65" } -xous = "0.9.66" -xous-ipc = "0.10.6" -log-server = { package = "xous-api-log", version = "0.1.65" } +utralib = { version = "0.1.26", optional = true, default-features = false } +xous-names = { package = "xous-api-names", version = "0.9.68" } +ticktimer = { package = "xous-api-ticktimer", version = "0.9.66" } +xous = "0.9.67" +xous-ipc = "0.10.7" +log-server = { package = "xous-api-log", version = "0.1.66" } log = "0.4.14" num-derive = { version = "0.4.2", 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 487b7bbd9..c6f83d6b7 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.66" -xous-ipc = "0.10.6" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +xous-ipc = "0.10.7" +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } log = "0.4.14" llio = { path = "../llio" } num-derive = { version = "0.4.2", default-features = false } @@ -20,13 +20,13 @@ rkyv = { version = "0.8.8", default-features = false, features = [ "std", "alloc", ] } -susres = { package = "xous-api-susres", version = "0.9.65" } +susres = { package = "xous-api-susres", version = "0.9.66" } modals = { path = "../modals", optional = true } keyboard = { path = "../keyboard", features = ["inject-api"], optional = true } bitfield = "0.13.2" vcell = "0.1.3" -xous-semver = "0.1.2" -utralib = { version = "0.1.25", optional = true, default-features = false } +xous-semver = "0.1.5" +utralib = { version = "0.1.26", optional = true, default-features = false } trng = { path = "../trng", optional = true } precursor-hal = { path = "../../libs/precursor-hal" } diff --git a/services/usb-test/Cargo.toml b/services/usb-test/Cargo.toml index 09d464f0e..0d2896d17 100644 --- a/services/usb-test/Cargo.toml +++ b/services/usb-test/Cargo.toml @@ -7,18 +7,18 @@ description = "USB test & development stub" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.66" -log-server = { package = "xous-api-log", version = "0.1.65" } -ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.65" } -xous-names = { package = "xous-api-names", version = "0.9.67" } +xous = "0.9.67" +log-server = { package = "xous-api-log", version = "0.1.66" } +ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.66" } +xous-names = { package = "xous-api-names", version = "0.9.68" } log = "0.4.14" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } -susres = { package = "xous-api-susres", version = "0.9.65" } +susres = { package = "xous-api-susres", version = "0.9.66" } keyboard = { path = "../keyboard" } bitfield = "0.13.2" vcell = "0.1.3" -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } xous-usb-hid = { git = "https://github.com/betrusted-io/xous-usb-hid.git", branch = "main" } embedded-time = "0.12.1" # required by the keyboard interface diff --git a/services/xous-log/Cargo.toml b/services/xous-log/Cargo.toml index ba747df7c..1c8580c91 100644 --- a/services/xous-log/Cargo.toml +++ b/services/xous-log/Cargo.toml @@ -10,14 +10,14 @@ homepage = "https://betrusted.io/xous-book/" # Dependency versions enforced by Cargo.lock. [dependencies] -xous-api-log = { package = "xous-api-log", version = "0.1.65" } -xous = "0.9.66" -xous-ipc = "0.10.6" +xous-api-log = { package = "xous-api-log", version = "0.1.66" } +xous = "0.9.67" +xous-ipc = "0.10.7" log = "0.4.14" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } # for USB serial logging rkyv = { version = "0.8.8", default-features = false, features = [ diff --git a/services/xous-names/Cargo.toml b/services/xous-names/Cargo.toml index 78dfa378b..4d6a2abc2 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.67" -log-server = { package = "xous-api-log", version = "0.1.65" } -xous = "0.9.66" -xous-ipc = "0.10.6" +xous-api-names = "0.9.68" +log-server = { package = "xous-api-log", version = "0.1.66" } +xous = "0.9.67" +xous-ipc = "0.10.7" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } log = "0.4.14" @@ -22,7 +22,7 @@ rkyv = { version = "0.8.8", default-features = false, features = [ "alloc", ] } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } [target.'cfg(any(windows,unix))'.dependencies] diff --git a/services/xous-susres/Cargo.toml b/services/xous-susres/Cargo.toml index 9e5e6e942..dfe3c3c6b 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.65" -xous-names = { package = "xous-api-names", version = "0.9.67" } -log-server = { package = "xous-api-log", version = "0.1.65" } -xous = "0.9.66" -xous-ipc = "0.10.6" +xous-api-susres = "0.9.66" +xous-names = { package = "xous-api-names", version = "0.9.68" } +log-server = { package = "xous-api-log", version = "0.1.66" } +xous = "0.9.67" +xous-ipc = "0.10.7" log = "0.4.14" precursor-hal = { path = "../../libs/precursor-hal" } @@ -26,7 +26,7 @@ rkyv = { version = "0.8.8", default-features = false, features = [ ] } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } [target.'cfg(target_arch = "riscv32")'.dependencies] loader = { path = "../../loader", default-features = false } diff --git a/services/xous-swapper/Cargo.toml b/services/xous-swapper/Cargo.toml index be15c48b4..e640777e8 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.67" -log-server = { package = "xous-api-log", version = "0.1.65" } -xous = { version = "0.9.66", features = ["swap"] } -xous-ipc = "0.10.6" +xous-api-names = "0.9.68" +log-server = { package = "xous-api-log", version = "0.1.66" } +xous = { version = "0.9.67", features = ["swap"] } +xous-ipc = "0.10.7" num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } log = "0.4.14" @@ -26,7 +26,7 @@ bao1x-hal = { path = "../../libs/bao1x-hal", optional = true, default-features = precursor-hal = { path = "../../libs/precursor-hal", optional = true, default-features = false } bao1x-api = { path = "../../libs/bao1x-api", optional = true, default-features = false } -utralib = { version = "0.1.25", optional = true, default-features = false } +utralib = { version = "0.1.26", optional = true, default-features = false } [target.'cfg(any(windows,unix))'.dependencies] diff --git a/services/xous-ticktimer/Cargo.toml b/services/xous-ticktimer/Cargo.toml index 536a0a19b..82183f79a 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.65" -xous = "0.9.66" -xous-ipc = "0.10.6" -xous-names = { package = "xous-api-names", version = "0.9.67" } -log-server = { package = "xous-api-log", version = "0.1.65" } -susres = { package = "xous-api-susres", version = "0.9.65" } +xous-api-ticktimer = "0.9.66" +xous = "0.9.67" +xous-ipc = "0.10.7" +xous-names = { package = "xous-api-names", version = "0.9.68" } +log-server = { package = "xous-api-log", version = "0.1.66" } +susres = { package = "xous-api-susres", version = "0.9.66" } log = "0.4.14" rkyv = { version = "0.8.8", default-features = false, features = [ "std", @@ -23,8 +23,8 @@ rkyv = { version = "0.8.8", default-features = false, features = [ ] } num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } -xous-semver = "0.1.2" -utralib = { version = "0.1.25", optional = true, default-features = false } +xous-semver = "0.1.5" +utralib = { version = "0.1.26", optional = true, default-features = false } loader = { path = "../../loader", optional = true } # TODO: fix this diff --git a/svd2utra/Cargo.toml b/svd2utra/Cargo.toml index 57cb40a3c..c60318871 100644 --- a/svd2utra/Cargo.toml +++ b/svd2utra/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "svd2utra" -version = "0.1.23" +version = "0.1.24" authors = ["Sean Cross ", "bunnie "] description = "SVD to UTRA library generator" edition = "2018" diff --git a/tools/Cargo.toml b/tools/Cargo.toml index d0b74d214..c4b9b31dd 100644 --- a/tools/Cargo.toml +++ b/tools/Cargo.toml @@ -17,9 +17,9 @@ ring = "0.17.7" env_logger = "0.7.1" log = "0.4.14" pem = "0.8.3" -svd2utra = "0.1.23" +svd2utra = "0.1.24" xmas-elf = "0.9.0" -xous-semver = "0.1.3" +xous-semver = "0.1.5" ed25519-dalek = { version = "2.1.0", features = ["digest"] } sha2 = { version = "0.10.8" } pkcs8 = { version = "0.8.0", features = ["pem"] } diff --git a/tools/src/bin/sign-image.rs b/tools/src/bin/sign-image.rs index 8787df260..1e89a425b 100644 --- a/tools/src/bin/sign-image.rs +++ b/tools/src/bin/sign-image.rs @@ -5,6 +5,8 @@ use tools::sign_image::{convert_to_uf2, load_pem, sign_file}; const DEVKEY_PATH: &str = "devkey/dev.key"; +use std::str::FromStr; + use xous_semver::SemVer; fn main() -> Result<(), Box> { diff --git a/utralib/Cargo.lock b/utralib/Cargo.lock index 961a1cb42..294edb0b6 100644 --- a/utralib/Cargo.lock +++ b/utralib/Cargo.lock @@ -19,16 +19,16 @@ dependencies = [ [[package]] name = "svd2utra" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39cd1364c764d8850b69b610c303bf715836dabf08025e72bdff782b2c696462" +checksum = "37f2da1577e5540036150df73056685b130dbf0ab2a043173acd3309c49458d4" dependencies = [ "quick-xml", ] [[package]] name = "utralib" -version = "0.1.25" +version = "0.1.26" dependencies = [ "svd2utra", ] diff --git a/utralib/Cargo.toml b/utralib/Cargo.toml index ceef0ab20..cc6c7019a 100644 --- a/utralib/Cargo.toml +++ b/utralib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "utralib" -version = "0.1.25" +version = "0.1.26" authors = ["Sean Cross ", "bunnie "] edition = "2018" license = "MIT OR Apache-2.0" @@ -12,7 +12,7 @@ homepage = "https://betrusted.io/xous-book/" [dependencies] [build-dependencies] -svd2utra = "0.1.23" +svd2utra = "0.1.24" # UTRA pre-generated version tracker [features] diff --git a/xous-ipc/Cargo.toml b/xous-ipc/Cargo.toml index a96dbc06d..4886b4345 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.10.6" +version = "0.10.7" repository = "https://github.com/betrusted-io/xous-core/" homepage = "https://betrusted.io/" # Dependency versions enforced by Cargo.lock. [dependencies] -xous = "0.9.66" +xous = "0.9.67" bitflags = { version = "1" } rkyv = { version = "0.8.8", default-features = false, features = [ "std", diff --git a/xous-rs/Cargo.toml b/xous-rs/Cargo.toml index ebb8a750f..3db524d78 100644 --- a/xous-rs/Cargo.toml +++ b/xous-rs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xous" -version = "0.9.66" +version = "0.9.67" authors = ["Sean Cross "] edition = "2021" license = "MIT OR Apache-2.0" diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index 5f39187a3..c091b46d8 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -17,7 +17,7 @@ serde_json = "1.0.41" serde = { version = "1.0.130", features = ["derive"] } tempfile = "3.3.0" ureq = { version = "2.9.0", features = ["json"] } -svd2utra = "0.1.23" +svd2utra = "0.1.24" lazy_static = "1.4.0" # toml_edit = "0.14.4" # would be used to verify Cargo.toml files, but it's too hard to do this right now. bao1x-api = { path = "../libs/bao1x-api" } diff --git a/xtask/src/verifier.rs b/xtask/src/verifier.rs index 8bd7ecdd4..0fdece9c2 100644 --- a/xtask/src/verifier.rs +++ b/xtask/src/verifier.rs @@ -12,20 +12,20 @@ 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.64", - "xous-ipc^0.10.4", - "xous-api-log^0.1.63", - "xous-api-names^0.9.65", - "xous-api-susres^0.9.63", - "xous-api-ticktimer^0.9.63", + "xous^0.9.65", + "xous-ipc^0.10.5", + "xous-api-log^0.1.64", + "xous-api-names^0.9.66", + "xous-api-susres^0.9.64", + "xous-api-ticktimer^0.9.64", ]; // 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 // publish the packages, rather than something nefarious has happened. let warn_pkgs = [ // this set is only updated if the utralib changes - "utralib^0.1.25", - "svd2utra^0.1.23", + "utralib^0.1.26", + "svd2utra^0.1.24", ]; for pkg in check_pkgs { verify(pkg.into(), true)?;