diff --git a/Cargo.lock b/Cargo.lock index ad0062288..c1a4a5730 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -31,7 +31,7 @@ dependencies = [ "cipher 0.4.3", "hex-literal", "log", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", ] @@ -65,7 +65,7 @@ version = "0.1.0" dependencies = [ "hex-literal", "log", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", ] @@ -175,11 +175,11 @@ dependencies = [ "num-derive", "num-traits", "trng", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -532,12 +532,12 @@ dependencies = [ "rkyv", "trng", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -553,12 +553,12 @@ dependencies = [ "trng", "typenum", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -611,7 +611,7 @@ dependencies = [ "graphics-server", "log", "rkyv", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-names", ] @@ -1046,11 +1046,11 @@ dependencies = [ "rkyv", "trng", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1168,12 +1168,12 @@ dependencies = [ "num-traits", "rkyv", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1285,7 +1285,7 @@ dependencies = [ "num-derive", "num-traits", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", @@ -1503,12 +1503,12 @@ dependencies = [ "trng", "tts-frontend", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1545,9 +1545,9 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", "wasm-bindgen", "wasm-bindgen-test", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-names", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1567,12 +1567,12 @@ dependencies = [ "num-traits", "rkyv", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1657,10 +1657,10 @@ dependencies = [ "num-derive", "num-traits", "tts-frontend", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1794,11 +1794,11 @@ dependencies = [ "rkyv", "tts-frontend", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1810,9 +1810,9 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-names", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1825,11 +1825,11 @@ dependencies = [ "num-traits", "rkyv", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1844,11 +1844,11 @@ dependencies = [ "rkyv", "tts-frontend", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1928,12 +1928,12 @@ dependencies = [ "num-traits", "rkyv", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1948,7 +1948,7 @@ version = "0.1.0" dependencies = [ "log", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-ticktimer", ] @@ -1964,12 +1964,12 @@ dependencies = [ "rkyv", "spinor", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2020,7 +2020,7 @@ dependencies = [ "num-derive", "num-traits", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", @@ -2038,12 +2038,12 @@ dependencies = [ "num-traits", "rkyv", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -2203,11 +2203,11 @@ dependencies = [ "trng", "tts-frontend", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2230,11 +2230,11 @@ dependencies = [ "serde", "trng", "ureq", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2270,12 +2270,12 @@ dependencies = [ "smoltcp", "trng", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -2543,12 +2543,12 @@ dependencies = [ "trng", "tts-frontend", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "zeroize", "zeroize_derive", ] @@ -2576,7 +2576,7 @@ version = "0.1.0" dependencies = [ "log", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3018,11 +3018,11 @@ dependencies = [ "num-derive", "num-traits", "trng", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3060,9 +3060,9 @@ dependencies = [ "spin 0.5.2", "untrusted", "winapi", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-names", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3143,12 +3143,12 @@ dependencies = [ "tts-frontend", "usb-device-xous", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", "zeroize", ] @@ -3418,12 +3418,12 @@ dependencies = [ "rkyv", "trng", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3501,12 +3501,12 @@ dependencies = [ "utralib", "webpki-roots", "x25519-dalek", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3557,7 +3557,7 @@ dependencies = [ name = "spawn" version = "0.1.0" dependencies = [ - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3600,12 +3600,12 @@ dependencies = [ "rkyv", "trng", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3664,12 +3664,12 @@ dependencies = [ "trng", "usb-device-xous", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -3701,7 +3701,7 @@ dependencies = [ [[package]] name = "svd2utra" -version = "0.1.7" +version = "0.1.8" dependencies = [ "convert_case", "quick-xml", @@ -3709,9 +3709,9 @@ dependencies = [ [[package]] name = "svd2utra" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a65cf81cff9ec9ad564103468224386dc7443afd1c2037de148bd2c51ca006dd" +checksum = "eb7e91b601f902ab3b99a58e9b8530493723e6c83b79c335c78ac8ce428a8743" dependencies = [ "convert_case", "quick-xml", @@ -3773,7 +3773,7 @@ dependencies = [ name = "test-spawn" version = "0.1.0" dependencies = [ - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3886,7 +3886,7 @@ dependencies = [ "log", "pem", "ring", - "svd2utra 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "svd2utra 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "xmas-elf", "xous-semver", ] @@ -3970,12 +3970,12 @@ dependencies = [ "rand_chacha 0.3.1", "rkyv", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3988,11 +3988,11 @@ dependencies = [ "num-traits", "rkyv", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-tts-backend", ] @@ -4139,12 +4139,12 @@ dependencies = [ "usbd-human-interface-device 0.2.1", "utralib", "vcell", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -4164,7 +4164,7 @@ dependencies = [ "usbd-human-interface-device 0.1.1", "utralib", "vcell", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", @@ -4213,11 +4213,11 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "utralib" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2981d46c235f61d0ff7905f3c7b982f5cbf8f0b87b9bf5fa87d296f62ab3ac" +checksum = "4590cd5e8fe4673f0c67c9dd346c118bc6a0756bdf8ed4efd4ed363084e03589" dependencies = [ - "svd2utra 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "svd2utra 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4268,12 +4268,12 @@ dependencies = [ "usb-device-xous", "usbd-human-interface-device 0.2.1", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4717,7 +4717,7 @@ checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" [[package]] name = "xous" -version = "0.9.24" +version = "0.9.25" dependencies = [ "compiler_builtins", "lazy_static", @@ -4726,99 +4726,99 @@ dependencies = [ [[package]] name = "xous" -version = "0.9.24" +version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51eaec3e40494097174d60a93d2c77569208246783066cee0e270771a923e730" +checksum = "0aea89e46724a1988103ca924a786122b3a7c7a397339e042ea2477383aa569d" dependencies = [ "lazy_static", ] [[package]] name = "xous-api-log" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "880fb22905cdaf24cd359f49c9532bee32b126b923f5f9e72a17cb60812d30ac" +checksum = "aa7612f84085a96f4899fa8117c1279d651bd1bf43390d5ed3f771f7d388285c" dependencies = [ "log", "num-derive", "num-traits", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "xous-api-names" -version = "0.9.20" +version = "0.9.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5809ddc9958b57d2fbf7981b5d129ea244e8aff2f4dda79ca68d19310c0df0b1" +checksum = "fe765421d2834ac77598ba6b4a8b860c9291ddcbe00911e78a1d5e95fe207049" dependencies = [ "log", "num-derive", "num-traits", "rkyv", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "xous-api-susres" -version = "0.9.18" +version = "0.9.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692689670c9661470c26dab75af629e34acd9779049c17762a46935ac04deef8" +checksum = "9620e359c86568ed3a78b0ce3b1351132ce796925c202219b8f3391c96e8d0dd" dependencies = [ "log", "num-derive", "num-traits", "rkyv", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "xous-api-ticktimer" -version = "0.9.18" +version = "0.9.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec08c3120ceba64928718ba4ed6a55d20b62a3b3108cb80188280e615619c627" +checksum = "c616cfe83f2b1b796dca170ca82c7819f1dd64a734f678591ef2f6a10605022c" dependencies = [ "log", "num-derive", "num-traits", "rkyv", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] [[package]] name = "xous-ipc" -version = "0.9.24" +version = "0.9.25" dependencies = [ "bitflags", "rkyv", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "xous-ipc" -version = "0.9.24" +version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f82fff59dab2eb19e27349d8d8e32e98c4ea20fb6ab3d020a033ad3b286b55c" +checksum = "723a2badcaa5b4a699c79237c9810783c13d2298bed7b05bf9c1c8fa9efa7ace" dependencies = [ "bitflags", "rkyv", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "xous-kernel" -version = "0.9.20" +version = "0.9.21" dependencies = [ "bitflags", "crossbeam-channel", @@ -4828,36 +4828,36 @@ dependencies = [ "rand_chacha 0.3.1", "stats_alloc", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-riscv", ] [[package]] name = "xous-log" -version = "0.1.15" +version = "0.1.16" dependencies = [ "log", "num-derive", "num-traits", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "xous-names" -version = "0.9.24" +version = "0.9.25" dependencies = [ "log", "num-derive", "num-traits", "rkyv", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4878,6 +4878,22 @@ checksum = "6ed3278bb4e7be4895c1c597434e5269f7357ffb800ebc644f0398bb008a15ad" [[package]] name = "xous-susres" +version = "0.1.21" +dependencies = [ + "log", + "num-derive", + "num-traits", + "rkyv", + "utralib", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-api-log", + "xous-api-names", + "xous-api-susres", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "xous-ticktimer" version = "0.1.20" dependencies = [ "log", @@ -4885,28 +4901,12 @@ dependencies = [ "num-traits", "rkyv", "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-api-log", - "xous-api-names", - "xous-api-susres", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "xous-ticktimer" -version = "0.1.19" -dependencies = [ - "log", - "num-derive", - "num-traits", - "rkyv", - "utralib", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -4920,9 +4920,9 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "xous 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-names", - "xous-ipc 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4935,7 +4935,7 @@ dependencies = [ "rustc_version 0.4.0", "serde", "serde_json", - "svd2utra 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "svd2utra 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile", "ureq", "zip", diff --git a/precursors/soc_csr-7447604.bin b/precursors/soc_csr-7447604.bin new file mode 100644 index 000000000..a0c53c36f Binary files /dev/null and b/precursors/soc_csr-7447604.bin differ diff --git a/precursors/soc_csr-b414f2b.bin b/precursors/soc_csr-b414f2b.bin deleted file mode 100644 index f5b220f85..000000000 Binary files a/precursors/soc_csr-b414f2b.bin and /dev/null differ diff --git a/utralib/Cargo.lock b/utralib/Cargo.lock index d21e29e7c..b506a47df 100644 --- a/utralib/Cargo.lock +++ b/utralib/Cargo.lock @@ -25,9 +25,9 @@ dependencies = [ [[package]] name = "svd2utra" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a65cf81cff9ec9ad564103468224386dc7443afd1c2037de148bd2c51ca006dd" +checksum = "eb7e91b601f902ab3b99a58e9b8530493723e6c83b79c335c78ac8ce428a8743" dependencies = [ "convert_case", "quick-xml", @@ -35,7 +35,7 @@ dependencies = [ [[package]] name = "utralib" -version = "0.1.9" +version = "0.1.10" dependencies = [ "svd2utra", ] diff --git a/utralib/Cargo.toml b/utralib/Cargo.toml index 12e1d7516..01e6aba2e 100644 --- a/utralib/Cargo.toml +++ b/utralib/Cargo.toml @@ -34,7 +34,7 @@ precursor-c809403 = [] precursor-a0912d6 = [] precursor-c809403-perflib = [] precursor-2753c12-dvt = [] -precursor-b414f2b = [] # based on 2020.08 litex +precursor-7447604 = [] # based on 2020.08 litex # The SVD gitrev as specified above is only invoked to track fine-grained # changes between target revisions. Below is the overall target switch, @@ -47,4 +47,4 @@ hosted = [] renode = [] # Specify a Precusor default so that we can pass packaging CI tests. -default = ["precursor-b414f2b", "precursor"] +default = ["precursor-7447604", "precursor"] diff --git a/utralib/build.rs b/utralib/build.rs index 1db18c152..687b9efdb 100644 --- a/utralib/build.rs +++ b/utralib/build.rs @@ -91,7 +91,7 @@ fn main() { "precursor-c809403-perflib", "precursor-2753c12-dvt", "precursor-a0912d6", - "precursor-b414f2b" + "precursor-7447604" ); // ----- select an SVD file based on a specific revision ----- @@ -120,10 +120,10 @@ fn main() { #[cfg(feature = "precursor-2753c12-dvt")] let generated_filename = "src/generated/precursor_dvt_2753c12.rs"; - #[cfg(feature = "precursor-b414f2b")] - let svd_filename = "precursor/soc-b414f2b.svd"; - #[cfg(feature = "precursor-b414f2b")] - let generated_filename = "src/generated/precursor_b414f2b.rs"; + #[cfg(feature = "precursor-7447604")] + let svd_filename = "precursor/soc-7447604.svd"; + #[cfg(feature = "precursor-7447604")] + let generated_filename = "src/generated/precursor_7447604.rs"; // ----- control file generation and rebuild sequence ----- // check and see if the configuration has changed since the last build. This should be diff --git a/utralib/precursor/soc-b414f2b.svd b/utralib/precursor/soc-7447604.svd similarity index 98% rename from utralib/precursor/soc-b414f2b.svd rename to utralib/precursor/soc-7447604.svd index 5636005cb..22a04e602 100644 --- a/utralib/precursor/soc-b414f2b.svd +++ b/utralib/precursor/soc-7447604.svd @@ -3,7 +3,7 @@ litex SOC - + 8 32 @@ -1222,10 +1222,10 @@ register to disable individual events.]]> GIT_GITREV 0x0014 - 0xb414f2b5 + 0x74476049 32 @@ -1242,7 +1242,7 @@ the exact git version used to build this firmware.]]> is ``1``, then the repository this was built from has one additional commit beyond the tag indicated in `MAJOR`, `MINOR`, and `REVISION`.]]> 0x0018 - 0x06 + 0x07 32 @@ -2283,10 +2283,62 @@ other requests.]]> + + EV_STATUS + + 0x0014 + 0x00 + 32 + + + alarm + 0 + [0:0] + 0 + + + + + + EV_PENDING + + 0x0018 + 0x00 + 32 + + + alarm + 0 + [0:0] + 0 + + + + + + EV_ENABLE + + 0x001c + 0x00 + 32 + + + alarm + 0 + [0:0] + 0 + + + + 0 - 0x14 + 0x20 registers @@ -2472,10 +2524,62 @@ suspend/resume from an interrupt context.]]> + + EV_STATUS + + 0x0028 + 0x00 + 32 + + + soft_int + 0 + [0:0] + 0 + + + + + + EV_PENDING + + 0x002c + 0x00 + 32 + + + soft_int + 0 + [0:0] + 0 + + + + + + EV_ENABLE + + 0x0030 + 0x00 + 32 + + + soft_int + 0 + [0:0] + 0 + + + + 0 - 0x28 + 0x34 registers @@ -3473,7 +3577,7 @@ inject too fast.]]> SEED1 0x0000 - 0x37de9f06 + 0x4163b882 32 @@ -3488,7 +3592,7 @@ inject too fast.]]> SEED0 0x0004 - 0x51857265 + 0xb32b62f 32 diff --git a/utralib/src/generated.rs b/utralib/src/generated.rs index f59f012c6..b765032f5 100644 --- a/utralib/src/generated.rs +++ b/utralib/src/generated.rs @@ -26,10 +26,10 @@ mod renode; #[cfg(feature="renode")] pub use renode::*; -#[cfg(feature="precursor-b414f2b")] -mod precursor_b414f2b; -#[cfg(feature="precursor-b414f2b")] -pub use precursor_b414f2b::*; +#[cfg(feature="precursor-7447604")] +mod precursor_7447604; +#[cfg(feature="precursor-7447604")] +pub use precursor_7447604::*; // Hosted mode includes nothing, as it relies on the abstract host // architecture for I/O; so this file is empty when the "hosted" diff --git a/utralib/src/generated/precursor_b414f2b.rs b/utralib/src/generated/precursor_7447604.rs similarity index 98% rename from utralib/src/generated/precursor_b414f2b.rs rename to utralib/src/generated/precursor_7447604.rs index 8bc9e7839..a0f7114ca 100644 --- a/utralib/src/generated/precursor_b414f2b.rs +++ b/utralib/src/generated/precursor_7447604.rs @@ -946,8 +946,11 @@ pub mod utra { Time0 = 8, MsleepTarget1 = 12, MsleepTarget0 = 16, + EvStatus = 20, + EvPending = 24, + EvEnable = 28, } - pub const TICKTIMER_NUMREGS: usize = 5; + pub const TICKTIMER_NUMREGS: usize = 8; pub const CONTROL: crate::Register = crate::Register::new(0, 0x1); pub const CONTROL_RESET: crate::Field = crate::Field::new(1, 0, CONTROL); @@ -964,6 +967,15 @@ pub mod utra { pub const MSLEEP_TARGET0: crate::Register = crate::Register::new(4, 0xffffffff); pub const MSLEEP_TARGET0_MSLEEP_TARGET: crate::Field = crate::Field::new(32, 0, MSLEEP_TARGET0); + pub const EV_STATUS: crate::Register = crate::Register::new(5, 0x1); + pub const EV_STATUS_ALARM: crate::Field = crate::Field::new(1, 0, EV_STATUS); + + pub const EV_PENDING: crate::Register = crate::Register::new(6, 0x1); + pub const EV_PENDING_ALARM: crate::Field = crate::Field::new(1, 0, EV_PENDING); + + pub const EV_ENABLE: crate::Register = crate::Register::new(7, 0x1); + pub const EV_ENABLE_ALARM: crate::Field = crate::Field::new(1, 0, EV_ENABLE); + pub const TICKTIMER_IRQ: usize = 8; pub const HW_TICKTIMER_BASE: usize = 0xf0012000; } @@ -982,8 +994,11 @@ pub mod utra { Powerdown = 28, Wfi = 32, Interrupt = 36, + EvStatus = 40, + EvPending = 44, + EvEnable = 48, } - pub const SUSRES_NUMREGS: usize = 10; + pub const SUSRES_NUMREGS: usize = 13; pub const CONTROL: crate::Register = crate::Register::new(0, 0x3); pub const CONTROL_PAUSE: crate::Field = crate::Field::new(1, 0, CONTROL); @@ -1017,6 +1032,15 @@ pub mod utra { pub const INTERRUPT: crate::Register = crate::Register::new(9, 0x1); pub const INTERRUPT_INTERRUPT: crate::Field = crate::Field::new(1, 0, INTERRUPT); + pub const EV_STATUS: crate::Register = crate::Register::new(10, 0x1); + pub const EV_STATUS_SOFT_INT: crate::Field = crate::Field::new(1, 0, EV_STATUS); + + pub const EV_PENDING: crate::Register = crate::Register::new(11, 0x1); + pub const EV_PENDING_SOFT_INT: crate::Field = crate::Field::new(1, 0, EV_PENDING); + + pub const EV_ENABLE: crate::Register = crate::Register::new(12, 0x1); + pub const EV_ENABLE_SOFT_INT: crate::Field = crate::Field::new(1, 0, EV_ENABLE); + pub const SUSRES_IRQ: usize = 9; pub const HW_SUSRES_BASE: usize = 0xf0013000; } @@ -3435,6 +3459,30 @@ mod tests { let mut baz = ticktimer_csr.zf(utra::ticktimer::MSLEEP_TARGET0_MSLEEP_TARGET, bar); baz |= ticktimer_csr.ms(utra::ticktimer::MSLEEP_TARGET0_MSLEEP_TARGET, 1); ticktimer_csr.wfo(utra::ticktimer::MSLEEP_TARGET0_MSLEEP_TARGET, baz); + + let foo = ticktimer_csr.r(utra::ticktimer::EV_STATUS); + ticktimer_csr.wo(utra::ticktimer::EV_STATUS, foo); + let bar = ticktimer_csr.rf(utra::ticktimer::EV_STATUS_ALARM); + ticktimer_csr.rmwf(utra::ticktimer::EV_STATUS_ALARM, bar); + let mut baz = ticktimer_csr.zf(utra::ticktimer::EV_STATUS_ALARM, bar); + baz |= ticktimer_csr.ms(utra::ticktimer::EV_STATUS_ALARM, 1); + ticktimer_csr.wfo(utra::ticktimer::EV_STATUS_ALARM, baz); + + let foo = ticktimer_csr.r(utra::ticktimer::EV_PENDING); + ticktimer_csr.wo(utra::ticktimer::EV_PENDING, foo); + let bar = ticktimer_csr.rf(utra::ticktimer::EV_PENDING_ALARM); + ticktimer_csr.rmwf(utra::ticktimer::EV_PENDING_ALARM, bar); + let mut baz = ticktimer_csr.zf(utra::ticktimer::EV_PENDING_ALARM, bar); + baz |= ticktimer_csr.ms(utra::ticktimer::EV_PENDING_ALARM, 1); + ticktimer_csr.wfo(utra::ticktimer::EV_PENDING_ALARM, baz); + + let foo = ticktimer_csr.r(utra::ticktimer::EV_ENABLE); + ticktimer_csr.wo(utra::ticktimer::EV_ENABLE, foo); + let bar = ticktimer_csr.rf(utra::ticktimer::EV_ENABLE_ALARM); + ticktimer_csr.rmwf(utra::ticktimer::EV_ENABLE_ALARM, bar); + let mut baz = ticktimer_csr.zf(utra::ticktimer::EV_ENABLE_ALARM, bar); + baz |= ticktimer_csr.ms(utra::ticktimer::EV_ENABLE_ALARM, 1); + ticktimer_csr.wfo(utra::ticktimer::EV_ENABLE_ALARM, baz); } #[test] @@ -3532,6 +3580,30 @@ mod tests { let mut baz = susres_csr.zf(utra::susres::INTERRUPT_INTERRUPT, bar); baz |= susres_csr.ms(utra::susres::INTERRUPT_INTERRUPT, 1); susres_csr.wfo(utra::susres::INTERRUPT_INTERRUPT, baz); + + let foo = susres_csr.r(utra::susres::EV_STATUS); + susres_csr.wo(utra::susres::EV_STATUS, foo); + let bar = susres_csr.rf(utra::susres::EV_STATUS_SOFT_INT); + susres_csr.rmwf(utra::susres::EV_STATUS_SOFT_INT, bar); + let mut baz = susres_csr.zf(utra::susres::EV_STATUS_SOFT_INT, bar); + baz |= susres_csr.ms(utra::susres::EV_STATUS_SOFT_INT, 1); + susres_csr.wfo(utra::susres::EV_STATUS_SOFT_INT, baz); + + let foo = susres_csr.r(utra::susres::EV_PENDING); + susres_csr.wo(utra::susres::EV_PENDING, foo); + let bar = susres_csr.rf(utra::susres::EV_PENDING_SOFT_INT); + susres_csr.rmwf(utra::susres::EV_PENDING_SOFT_INT, bar); + let mut baz = susres_csr.zf(utra::susres::EV_PENDING_SOFT_INT, bar); + baz |= susres_csr.ms(utra::susres::EV_PENDING_SOFT_INT, 1); + susres_csr.wfo(utra::susres::EV_PENDING_SOFT_INT, baz); + + let foo = susres_csr.r(utra::susres::EV_ENABLE); + susres_csr.wo(utra::susres::EV_ENABLE, foo); + let bar = susres_csr.rf(utra::susres::EV_ENABLE_SOFT_INT); + susres_csr.rmwf(utra::susres::EV_ENABLE_SOFT_INT, bar); + let mut baz = susres_csr.zf(utra::susres::EV_ENABLE_SOFT_INT, bar); + baz |= susres_csr.ms(utra::susres::EV_ENABLE_SOFT_INT, 1); + susres_csr.wfo(utra::susres::EV_ENABLE_SOFT_INT, baz); } #[test] diff --git a/xtask/src/main.rs b/xtask/src/main.rs index afd438208..dcbc58647 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -12,7 +12,7 @@ use std::env; /// gitrev of the current precursor SoC version targeted by this build. This must /// be manually updated every time the SoC version is bumped. -const PRECURSOR_SOC_VERSION: &str = "b414f2b"; +const PRECURSOR_SOC_VERSION: &str = "7447604"; /* Some notes on kernel versions versus backups.