update utralib reference

This commit is contained in:
bunnie 2022-09-29 22:22:33 +08:00
parent 3ff1b66d2f
commit df96605531
2 changed files with 49 additions and 51 deletions

96
Cargo.lock generated
View file

@ -533,7 +533,7 @@ dependencies = [
"susres", "susres",
"ticktimer-server", "ticktimer-server",
"trng", "trng",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -554,7 +554,7 @@ dependencies = [
"ticktimer-server", "ticktimer-server",
"trng", "trng",
"typenum", "typenum",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -927,7 +927,7 @@ dependencies = [
"serde", "serde",
"sha2-loader", "sha2-loader",
"subtle", "subtle",
"utralib 0.1.2", "utralib 0.1.3",
"zeroize", "zeroize",
] ]
@ -1046,7 +1046,7 @@ dependencies = [
"rkyv", "rkyv",
"ticktimer-server", "ticktimer-server",
"trng", "trng",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1169,7 +1169,7 @@ dependencies = [
"rkyv", "rkyv",
"susres", "susres",
"ticktimer-server", "ticktimer-server",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1286,7 +1286,7 @@ dependencies = [
"num-traits", "num-traits",
"susres", "susres",
"ticktimer-server", "ticktimer-server",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-names", "xous-names",
@ -1504,7 +1504,7 @@ dependencies = [
"ticktimer-server", "ticktimer-server",
"trng", "trng",
"tts-frontend", "tts-frontend",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1569,7 +1569,7 @@ dependencies = [
"susres", "susres",
"ticktimer-server", "ticktimer-server",
"trng", "trng",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1795,7 +1795,7 @@ dependencies = [
"rkyv", "rkyv",
"ticktimer-server", "ticktimer-server",
"tts-frontend", "tts-frontend",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1826,7 +1826,7 @@ dependencies = [
"num-traits", "num-traits",
"rkyv", "rkyv",
"ticktimer-server", "ticktimer-server",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1845,7 +1845,7 @@ dependencies = [
"rkyv", "rkyv",
"ticktimer-server", "ticktimer-server",
"tts-frontend", "tts-frontend",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1930,7 +1930,7 @@ dependencies = [
"rkyv", "rkyv",
"susres", "susres",
"ticktimer-server", "ticktimer-server",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1949,7 +1949,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"log", "log",
"ticktimer-server", "ticktimer-server",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
] ]
@ -1966,7 +1966,7 @@ dependencies = [
"spinor", "spinor",
"susres", "susres",
"ticktimer-server", "ticktimer-server",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2021,7 +2021,7 @@ dependencies = [
"num-derive", "num-derive",
"num-traits", "num-traits",
"ticktimer-server", "ticktimer-server",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-names", "xous-names",
@ -2040,7 +2040,7 @@ dependencies = [
"rkyv", "rkyv",
"susres", "susres",
"ticktimer-server", "ticktimer-server",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2056,7 +2056,7 @@ dependencies = [
"curve25519-dalek-loader", "curve25519-dalek-loader",
"ed25519-dalek-loader", "ed25519-dalek-loader",
"lazy_static", "lazy_static",
"utralib 0.1.2", "utralib 0.1.3",
] ]
[[package]] [[package]]
@ -2097,7 +2097,7 @@ dependencies = [
"log", "log",
"num-derive", "num-derive",
"num-traits", "num-traits",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2217,7 +2217,7 @@ dependencies = [
"ticktimer-server", "ticktimer-server",
"trng", "trng",
"tts-frontend", "tts-frontend",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2258,7 +2258,7 @@ dependencies = [
"susres", "susres",
"ticktimer-server", "ticktimer-server",
"trng", "trng",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2530,7 +2530,7 @@ dependencies = [
"ticktimer-server", "ticktimer-server",
"trng", "trng",
"tts-frontend", "tts-frontend",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2561,7 +2561,7 @@ name = "perflib"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"log", "log",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -3130,7 +3130,7 @@ dependencies = [
"trng", "trng",
"tts-frontend", "tts-frontend",
"usb-device-xous", "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 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3399,7 +3399,7 @@ dependencies = [
"susres", "susres",
"ticktimer-server", "ticktimer-server",
"trng", "trng",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3413,7 +3413,7 @@ dependencies = [
"block-buffer 0.9.0", "block-buffer 0.9.0",
"digest 0.9.0", "digest 0.9.0",
"opaque-debug", "opaque-debug",
"utralib 0.1.2", "utralib 0.1.3",
] ]
[[package]] [[package]]
@ -3479,7 +3479,7 @@ dependencies = [
"tungstenite", "tungstenite",
"url", "url",
"usb-device-xous", "usb-device-xous",
"utralib 0.1.2", "utralib 0.1.3",
"webpki-roots", "webpki-roots",
"x25519-dalek", "x25519-dalek",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3580,7 +3580,7 @@ dependencies = [
"susres", "susres",
"ticktimer-server", "ticktimer-server",
"trng", "trng",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3644,7 +3644,7 @@ dependencies = [
"ticktimer-server", "ticktimer-server",
"trng", "trng",
"usb-device-xous", "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 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3678,7 +3678,7 @@ dependencies = [
"num-derive", "num-derive",
"num-traits", "num-traits",
"rkyv", "rkyv",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3697,7 +3697,7 @@ dependencies = [
[[package]] [[package]]
name = "svd2utra" name = "svd2utra"
version = "0.1.0" version = "0.1.1"
dependencies = [ dependencies = [
"convert_case", "convert_case",
"quick-xml", "quick-xml",
@ -3705,12 +3705,10 @@ dependencies = [
[[package]] [[package]]
name = "svd2utra" name = "svd2utra"
version = "0.1.0" version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d43b83067e415e08dc4c31f88f58b0445a5ff18d3bc8e73e75900205db968ea" checksum = "febce5fedefca45dd6d3596751bd1b55b968eb633539badd1bda52d21bc62e09"
dependencies = [ dependencies = [
"anyhow",
"clap 2.34.0",
"convert_case", "convert_case",
"quick-xml", "quick-xml",
] ]
@ -3836,7 +3834,7 @@ dependencies = [
"num-traits", "num-traits",
"rkyv", "rkyv",
"susres", "susres",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3901,7 +3899,7 @@ dependencies = [
"log", "log",
"pem", "pem",
"ring", "ring",
"svd2utra 0.1.0", "svd2utra 0.1.1",
"xmas-elf", "xmas-elf",
"xous-semver", "xous-semver",
] ]
@ -3986,7 +3984,7 @@ dependencies = [
"rkyv", "rkyv",
"susres", "susres",
"ticktimer-server", "ticktimer-server",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -4003,7 +4001,7 @@ dependencies = [
"num-traits", "num-traits",
"rkyv", "rkyv",
"ticktimer-server", "ticktimer-server",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -4154,7 +4152,7 @@ dependencies = [
"ticktimer-server", "ticktimer-server",
"usb-device", "usb-device",
"usbd-human-interface-device 0.2.1", "usbd-human-interface-device 0.2.1",
"utralib 0.1.2", "utralib 0.1.3",
"vcell", "vcell",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
@ -4179,7 +4177,7 @@ dependencies = [
"ticktimer-server", "ticktimer-server",
"usb-device", "usb-device",
"usbd-human-interface-device 0.1.1", "usbd-human-interface-device 0.1.1",
"utralib 0.1.2", "utralib 0.1.3",
"vcell", "vcell",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
@ -4228,18 +4226,18 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
[[package]] [[package]]
name = "utralib" name = "utralib"
version = "0.1.2" version = "0.1.3"
dependencies = [ 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]] [[package]]
name = "utralib" name = "utralib"
version = "0.1.2" version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4924cada1c443fda702e7068dfcdf0e4e7f1321a6b1b9daac4411e301f6080a3" checksum = "99d971fbaf8c63df988891d895a14edcc4b2fafb2e4ceaf815bf9a329870a579"
dependencies = [ 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]] [[package]]
@ -4788,7 +4786,7 @@ dependencies = [
[[package]] [[package]]
name = "xous-kernel" name = "xous-kernel"
version = "0.9.0" version = "0.9.1"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"crossbeam-channel", "crossbeam-channel",
@ -4797,7 +4795,7 @@ dependencies = [
"rand 0.7.3", "rand 0.7.3",
"rand_chacha 0.3.1", "rand_chacha 0.3.1",
"stats_alloc", "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 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-riscv", "xous-riscv",
] ]
@ -4810,7 +4808,7 @@ dependencies = [
"num-derive", "num-derive",
"num-traits", "num-traits",
"rkyv", "rkyv",
"utralib 0.1.2", "utralib 0.1.3",
"xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log-server", "xous-api-log-server",
"xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "xous-ipc 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -4857,7 +4855,7 @@ dependencies = [
"rustc_version 0.4.0", "rustc_version 0.4.0",
"serde", "serde",
"serde_json", "serde_json",
"svd2utra 0.1.0", "svd2utra 0.1.1",
"tempfile", "tempfile",
"ureq", "ureq",
"zip", "zip",

View file

@ -4,7 +4,7 @@ description = "Core kernel for Xous, including task switching and memory managem
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2018" edition = "2018"
name = "xous-kernel" name = "xous-kernel"
version = "0.9.0" version = "0.9.1"
resolver = "2" resolver = "2"
# Dependency versions enforced by Cargo.lock. # 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] [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] [target.'cfg(target_arch = "riscv32")'.dependencies]
riscv = { version = "0.5.6", package = "xous-riscv" } # source is in "../imports/riscv-0.5.6" riscv = { version = "0.5.6", package = "xous-riscv" } # source is in "../imports/riscv-0.5.6"