diff --git a/Cargo.lock b/Cargo.lock index 69a234787..ad20b0cfd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -533,7 +533,7 @@ dependencies = [ "susres", "ticktimer-server", "trng", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -554,7 +554,7 @@ dependencies = [ "ticktimer-server", "trng", "typenum", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -927,7 +927,7 @@ dependencies = [ "serde", "sha2-loader", "subtle", - "utralib 0.1.2", + "utralib 0.1.3", "zeroize", ] @@ -1046,7 +1046,7 @@ dependencies = [ "rkyv", "ticktimer-server", "trng", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1169,7 +1169,7 @@ dependencies = [ "rkyv", "susres", "ticktimer-server", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1286,7 +1286,7 @@ dependencies = [ "num-traits", "susres", "ticktimer-server", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-names", @@ -1504,7 +1504,7 @@ dependencies = [ "ticktimer-server", "trng", "tts-frontend", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1569,7 +1569,7 @@ dependencies = [ "susres", "ticktimer-server", "trng", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1795,7 +1795,7 @@ dependencies = [ "rkyv", "ticktimer-server", "tts-frontend", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1826,7 +1826,7 @@ dependencies = [ "num-traits", "rkyv", "ticktimer-server", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1845,7 +1845,7 @@ dependencies = [ "rkyv", "ticktimer-server", "tts-frontend", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1930,7 +1930,7 @@ dependencies = [ "rkyv", "susres", "ticktimer-server", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1949,7 +1949,7 @@ version = "0.1.0" dependencies = [ "log", "ticktimer-server", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", ] @@ -1966,7 +1966,7 @@ dependencies = [ "spinor", "susres", "ticktimer-server", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2021,7 +2021,7 @@ dependencies = [ "num-derive", "num-traits", "ticktimer-server", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-names", @@ -2040,7 +2040,7 @@ dependencies = [ "rkyv", "susres", "ticktimer-server", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2056,7 +2056,7 @@ dependencies = [ "curve25519-dalek-loader", "ed25519-dalek-loader", "lazy_static", - "utralib 0.1.2", + "utralib 0.1.3", ] [[package]] @@ -2097,7 +2097,7 @@ dependencies = [ "log", "num-derive", "num-traits", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2217,7 +2217,7 @@ dependencies = [ "ticktimer-server", "trng", "tts-frontend", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2258,7 +2258,7 @@ dependencies = [ "susres", "ticktimer-server", "trng", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2530,7 +2530,7 @@ dependencies = [ "ticktimer-server", "trng", "tts-frontend", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2561,7 +2561,7 @@ name = "perflib" version = "0.1.0" dependencies = [ "log", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3130,7 +3130,7 @@ dependencies = [ "trng", "tts-frontend", "usb-device-xous", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3399,7 +3399,7 @@ dependencies = [ "susres", "ticktimer-server", "trng", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3413,7 +3413,7 @@ dependencies = [ "block-buffer 0.9.0", "digest 0.9.0", "opaque-debug", - "utralib 0.1.2", + "utralib 0.1.3", ] [[package]] @@ -3479,7 +3479,7 @@ dependencies = [ "tungstenite", "url", "usb-device-xous", - "utralib 0.1.2", + "utralib 0.1.3", "webpki-roots", "x25519-dalek", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3580,7 +3580,7 @@ dependencies = [ "susres", "ticktimer-server", "trng", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3644,7 +3644,7 @@ dependencies = [ "ticktimer-server", "trng", "usb-device-xous", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3678,7 +3678,7 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3697,7 +3697,7 @@ dependencies = [ [[package]] name = "svd2utra" -version = "0.1.0" +version = "0.1.1" dependencies = [ "convert_case", "quick-xml", @@ -3705,12 +3705,10 @@ dependencies = [ [[package]] name = "svd2utra" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d43b83067e415e08dc4c31f88f58b0445a5ff18d3bc8e73e75900205db968ea" +checksum = "febce5fedefca45dd6d3596751bd1b55b968eb633539badd1bda52d21bc62e09" dependencies = [ - "anyhow", - "clap 2.34.0", "convert_case", "quick-xml", ] @@ -3836,7 +3834,7 @@ dependencies = [ "num-traits", "rkyv", "susres", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3901,7 +3899,7 @@ dependencies = [ "log", "pem", "ring", - "svd2utra 0.1.0", + "svd2utra 0.1.1", "xmas-elf", "xous-semver", ] @@ -3986,7 +3984,7 @@ dependencies = [ "rkyv", "susres", "ticktimer-server", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4003,7 +4001,7 @@ dependencies = [ "num-traits", "rkyv", "ticktimer-server", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4154,7 +4152,7 @@ dependencies = [ "ticktimer-server", "usb-device", "usbd-human-interface-device 0.2.1", - "utralib 0.1.2", + "utralib 0.1.3", "vcell", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", @@ -4179,7 +4177,7 @@ dependencies = [ "ticktimer-server", "usb-device", "usbd-human-interface-device 0.1.1", - "utralib 0.1.2", + "utralib 0.1.3", "vcell", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", @@ -4228,18 +4226,18 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "utralib" -version = "0.1.2" +version = "0.1.3" dependencies = [ - "svd2utra 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "svd2utra 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "utralib" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4924cada1c443fda702e7068dfcdf0e4e7f1321a6b1b9daac4411e301f6080a3" +checksum = "99d971fbaf8c63df988891d895a14edcc4b2fafb2e4ceaf815bf9a329870a579" dependencies = [ - "svd2utra 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "svd2utra 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4788,7 +4786,7 @@ dependencies = [ [[package]] name = "xous-kernel" -version = "0.9.0" +version = "0.9.1" dependencies = [ "bitflags", "crossbeam-channel", @@ -4797,7 +4795,7 @@ dependencies = [ "rand 0.7.3", "rand_chacha 0.3.1", "stats_alloc", - "utralib 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "utralib 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-riscv", ] @@ -4810,7 +4808,7 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "utralib 0.1.2", + "utralib 0.1.3", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log-server", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4857,7 +4855,7 @@ dependencies = [ "rustc_version 0.4.0", "serde", "serde_json", - "svd2utra 0.1.0", + "svd2utra 0.1.1", "tempfile", "ureq", "zip", diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index b77a60eb9..2ef5411dd 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -4,7 +4,7 @@ description = "Core kernel for Xous, including task switching and memory managem license = "MIT OR Apache-2.0" edition = "2018" name = "xous-kernel" -version = "0.9.0" +version = "0.9.1" resolver = "2" # Dependency versions enforced by Cargo.lock. @@ -22,7 +22,7 @@ xous-kernel = { package = "xous", version = "0.9.9", features = [ ] } [target.'cfg(not(any(windows, unix)))'.dependencies] -utralib = { version = "0.1.2", default_features = false } +utralib = { version = "0.1.3", default_features = false } [target.'cfg(target_arch = "riscv32")'.dependencies] riscv = { version = "0.5.6", package = "xous-riscv" } # source is in "../imports/riscv-0.5.6"