Merge branch 'main' into feat/user-preferences

This commit is contained in:
Gianguido Sorà 2022-10-20 11:42:44 +02:00
commit d1e700058c
70 changed files with 461 additions and 404 deletions

230
Cargo.lock generated
View file

@ -31,7 +31,7 @@ dependencies = [
"cipher 0.4.3",
"hex-literal",
"log",
"xous",
"xous 0.9.18 (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",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
]
@ -175,11 +175,11 @@ dependencies = [
"num-derive",
"num-traits",
"trng",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -551,12 +551,12 @@ dependencies = [
"rkyv",
"trng",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -572,12 +572,12 @@ dependencies = [
"trng",
"typenum",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
]
@ -630,7 +630,7 @@ dependencies = [
"graphics-server",
"log",
"rkyv",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-names",
]
@ -1065,11 +1065,11 @@ dependencies = [
"rkyv",
"trng",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1187,12 +1187,12 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1304,7 +1304,7 @@ dependencies = [
"num-derive",
"num-traits",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
@ -1522,12 +1522,12 @@ dependencies = [
"trng",
"tts-frontend",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1564,9 +1564,9 @@ dependencies = [
"wasi 0.11.0+wasi-snapshot-preview1",
"wasm-bindgen",
"wasm-bindgen-test",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-names",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1586,12 +1586,12 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1676,10 +1676,10 @@ dependencies = [
"num-derive",
"num-traits",
"tts-frontend",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1813,11 +1813,11 @@ dependencies = [
"rkyv",
"tts-frontend",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1829,9 +1829,9 @@ dependencies = [
"num-derive",
"num-traits",
"rkyv",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-names",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1844,11 +1844,11 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1863,11 +1863,11 @@ dependencies = [
"rkyv",
"tts-frontend",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1947,12 +1947,12 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1967,7 +1967,7 @@ version = "0.1.0"
dependencies = [
"log",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-ticktimer",
]
@ -1983,12 +1983,12 @@ dependencies = [
"rkyv",
"spinor",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -2039,7 +2039,7 @@ dependencies = [
"num-derive",
"num-traits",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
@ -2057,12 +2057,12 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
]
@ -2222,11 +2222,11 @@ dependencies = [
"trng",
"tts-frontend",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -2246,11 +2246,11 @@ dependencies = [
"num-derive",
"num-traits",
"trng",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -2286,12 +2286,12 @@ dependencies = [
"smoltcp",
"trng",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
]
@ -2558,12 +2558,12 @@ dependencies = [
"trng",
"tts-frontend",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"zeroize",
"zeroize_derive",
]
@ -2591,7 +2591,7 @@ version = "0.1.0"
dependencies = [
"log",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -3043,11 +3043,11 @@ dependencies = [
"num-derive",
"num-traits",
"trng",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -3086,9 +3086,9 @@ dependencies = [
"untrusted",
"web-sys",
"winapi",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-names",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -3168,12 +3168,12 @@ dependencies = [
"tts-frontend",
"usb-device-xous",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
"zeroize",
]
@ -3437,12 +3437,12 @@ dependencies = [
"rkyv",
"trng",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -3519,12 +3519,12 @@ dependencies = [
"utralib",
"webpki-roots",
"x25519-dalek",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -3575,7 +3575,7 @@ dependencies = [
name = "spawn"
version = "0.1.0"
dependencies = [
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -3618,12 +3618,12 @@ dependencies = [
"rkyv",
"trng",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -3683,12 +3683,12 @@ dependencies = [
"usb-device-xous",
"userprefs",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
]
@ -3726,6 +3726,16 @@ dependencies = [
"quick-xml",
]
[[package]]
name = "svd2utra"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7b52e9cbca407889227d214ccce70f5d9c7eb5fb6a3ccb26229655047f32637"
dependencies = [
"convert_case",
"quick-xml",
]
[[package]]
name = "syn"
version = "1.0.102"
@ -3782,7 +3792,7 @@ dependencies = [
name = "test-spawn"
version = "0.1.0"
dependencies = [
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -3895,7 +3905,7 @@ dependencies = [
"log",
"pem",
"ring",
"svd2utra",
"svd2utra 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"xmas-elf",
"xous-semver",
]
@ -3979,12 +3989,12 @@ dependencies = [
"rand_chacha 0.3.1",
"rkyv",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -3997,11 +4007,11 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-tts-backend",
]
@ -4148,12 +4158,12 @@ dependencies = [
"usbd-human-interface-device 0.2.1",
"utralib",
"vcell",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
]
@ -4173,7 +4183,7 @@ dependencies = [
"usbd-human-interface-device 0.1.1",
"utralib",
"vcell",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
@ -4233,8 +4243,10 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
[[package]]
name = "utralib"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3d0e47713f2981cf45347a1ee6576802b6024d89f8cd0293cf1047225ffe14c"
dependencies = [
"svd2utra",
"svd2utra 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -4283,12 +4295,12 @@ dependencies = [
"tts-frontend",
"usb-device-xous",
"usbd-human-interface-device 0.2.1",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -4745,58 +4757,75 @@ dependencies = [
"rustc-std-workspace-core",
]
[[package]]
name = "xous"
version = "0.9.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a36c2ad37cec8fc1ed0c4115b017c765b6a1b86a42c84f1b7a101d1684092d5f"
dependencies = [
"lazy_static",
]
[[package]]
name = "xous-api-log"
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aaf7893636b7a91c10c455a38ec3a1fbf82b3ad88ccaba2d43fc17ed55667208"
dependencies = [
"log",
"num-derive",
"num-traits",
"xous",
"xous-ipc",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "xous-api-names"
version = "0.9.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0bf643f37af8b461c37046b3cd70851241850811e05b6f6af5d97243d65a14dc"
dependencies = [
"log",
"num-derive",
"num-traits",
"rkyv",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "xous-api-susres"
version = "0.9.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98d2219885df83256573366255ca720fc8a73f518d323926e9307c98be309515"
dependencies = [
"log",
"num-derive",
"num-traits",
"rkyv",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "xous-api-ticktimer"
version = "0.9.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a499676e67ba05ebaea20c9f03b7663b0ca0945dda961c6785bdc1e662610eef"
dependencies = [
"log",
"num-derive",
"num-traits",
"rkyv",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
]
@ -4806,7 +4835,18 @@ version = "0.9.18"
dependencies = [
"bitflags",
"rkyv",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "xous-ipc"
version = "0.9.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db5a8370040fef4aba0d6301c2338fdb17c1a7fab4b9735b81ea29b9ec928f09"
dependencies = [
"bitflags",
"rkyv",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -4821,7 +4861,7 @@ dependencies = [
"rand_chacha 0.3.1",
"stats_alloc",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-riscv",
]
@ -4833,9 +4873,9 @@ dependencies = [
"num-derive",
"num-traits",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -4847,10 +4887,10 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -4878,11 +4918,11 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -4894,12 +4934,12 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
]
@ -4913,9 +4953,9 @@ dependencies = [
"num-derive",
"num-traits",
"rkyv",
"xous",
"xous 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-names",
"xous-ipc",
"xous-ipc 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -4928,7 +4968,7 @@ dependencies = [
"rustc_version 0.4.0",
"serde",
"serde_json",
"svd2utra",
"svd2utra 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"tempfile",
"ureq",
"zip",

View file

@ -115,13 +115,6 @@ incremental = true
#panic = "abort" # Remove panic output, which can reduce file size
#opt-level = 1 # z,s: Optimize for size instead of performance; 1 for easier debugging
# Activate these patches to use local versions of xous kernel core files instead of crates.io sourced versions.
# Activating these also reduces your dependency on crates.io for critical source APIs, if that's part of your
# threat model; but for now we're favoring sources from crates.io to facility third party adoption of Xous.
# [patch.crates-io]
# xous = {path = "xous-rs"}
# xous-ipc = {path = "xous-ipc"}
# prefer hardware-accelerated versions of services
[patch.crates-io.sha2]
path = "services/engine-sha512"
@ -143,9 +136,8 @@ engine-25519 = {path = "services/engine-25519"}
[patch.crates-io.usb-device]
git="https://github.com/betrusted-io/usb-device.git"
branch="main"
# local dev shortcuts
#path = "../usb-device"
# for local dev
#[patch.crates-io.usbd-human-interface-device]
#path = "../usbd-human-interface-device"
@ -158,14 +150,27 @@ git="https://github.com/betrusted-io/ring-xous"
rev="09207048c393d524a34f63cf65c85a973012a21d" # use the commitref because we're still updating the branch
#branch="0.16.20-cleanup"
# required for ring-xous
[patch.crates-io.xous]
path = "./xous-rs"
[patch.crates-io.xous-ipc]
path = "./xous-ipc"
[patch.crates-io.xous-api-names]
path = "./api/xous-api-names"
######################################################
### PATCHES TO DEV/TEST XOUS KERNEL CODE
###
### The kernel is published to crates.io, and all the packages in Xous are configured to get
### the kernel from crates.io and NOT the local tree.
###
### When making changes to the kernel, you must activate some or all of the patches below
### for the local sources to "see" the changes.
### You will also need to compile with `--no-verify` to acknowledge that you are doing local
### source development and accept that what's on crates.io doesn't match what's inside this tree.
#######################################################
### Minimum recommended patch set: this causes xous-ring to behave correctly when doing local dev
# [patch.crates-io.xous]
# path = "./xous-rs"
# [patch.crates-io.xous-ipc]
# path = "./xous-ipc"
# [patch.crates-io.xous-api-names]
# path = "./api/xous-api-names"
### Selectively patch in these crates, or more, as needed depending on your dev activity
# [patch.crates-io.utralib]
# path = "./utralib"
# [patch.crates-io.svd2utra]

View file

@ -283,6 +283,8 @@ perform the Xous firmware upgrade. This requires running manual update commands,
- "Lock device" feature added; PDDB unmount before reboots
- Successive failed PIN attempts will re-suspend the device if it is suspendable, or reboot if not
- Fix bug in device auto-shutdown; COM/LLIO method deprecated as susres method does the correct sequencing. This should help with some of the "insert paperclip" scenarios after updating SoC, hopefully.
- Updated VexRiscv core to the latest version. STATIC branch prediction enabled and slightly faster I$ gives a small performance bump. Also fixes a bug with cache flushing that was causing coherence problems with the PDDB.
- Fix tricky loader bug that was causing subtle issues with various build configurations
## Roadmap
- Lots of testing and bug fixes

View file

@ -10,8 +10,8 @@ homepage = "https://betrusted.io/xous-book/"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
xous = "0.9.18"
xous-ipc = "0.9.18"
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -10,9 +10,9 @@ homepage = "https://betrusted.io/"
# Dependency versions enforced by Cargo.lock.
[dependencies]
log-server = {package = "xous-api-log", path = "../../api/xous-api-log"}
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
log-server = {package = "xous-api-log", version = "0.1.12"}
xous = "0.9.18"
xous-ipc = "0.9.18"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
log = "0.4.14"

View file

@ -10,16 +10,16 @@ homepage = "https://betrusted.io/xous-book/"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
xous-names = { package = "xous-api-names", path = "../../api/xous-api-names" }
xous = "0.9.18"
xous-ipc = "0.9.18"
log-server = { package = "xous-api-log", version = "0.1.12" }
xous-names = { package = "xous-api-names", version = "0.9.13" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
utralib = { path = "../../utralib", optional = true, default-features = false }
utralib = { version = "0.1.6", optional = true, default-features = false }
[features]
precursor = ["utralib/precursor", "xous/precursor"]

View file

@ -10,11 +10,11 @@ homepage = "https://betrusted.io/xous-book/"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
log-server = {package = "xous-api-log", path = "../../api/xous-api-log"}
susres = {package = "xous-api-susres", path = "../../api/xous-api-susres"}
xous-names = {package = "xous-api-names", path = "../../api/xous-api-names"}
xous = "0.9.18"
xous-ipc = "0.9.18"
log-server = {package = "xous-api-log", version = "0.1.12"}
susres = {package = "xous-api-susres", version = "0.9.11"}
xous-names = {package = "xous-api-names", version = "0.9.13"}
log = "0.4.14"
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
num-derive = {version = "0.3.3", default-features = false}

View file

@ -10,11 +10,11 @@ description = "Ball demo app"
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
ticktimer-server = { package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer" }
xous-names = { package = "xous-api-names", path = "../../api/xous-api-names" }
xous = "0.9.18"
xous-ipc = "0.9.18"
log-server = { package = "xous-api-log", version = "0.1.12" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.11" }
xous-names = { package = "xous-api-names", version = "0.9.13" }
gam = {path = "../../services/gam" }
trng = {path = "../../services/trng"}
modals = {path = "../../services/modals"}

View file

@ -7,10 +7,10 @@ edition = "2021"
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
xous-names = { package = "xous-api-names", path = "../../api/xous-api-names" }
xous = "0.9.18"
xous-ipc = "0.9.18"
log-server = { package = "xous-api-log", version = "0.1.12" }
xous-names = { package = "xous-api-names", version = "0.9.13" }
gam = {path = "../../services/gam" }
graphics-server = {path = "../../services/graphics-server" }
locales = {path = "../../locales"}

View file

@ -10,11 +10,11 @@ description = "Matrix chat"
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
ticktimer-server = { package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer" }
xous-names = { package = "xous-api-names", path = "../../api/xous-api-names" }
xous = "0.9.18"
xous-ipc = "0.9.18"
log-server = { package = "xous-api-log", version = "0.1.12" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.11" }
xous-names = { package = "xous-api-names", version = "0.9.13" }
gam = {path = "../../services/gam" }
graphics-server = {path = "../../services/graphics-server" }
trng = {path = "../../services/trng"}

View file

@ -10,11 +10,11 @@ description = "REPL demo app"
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
ticktimer-server = { package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer" }
xous-names = { package = "xous-api-names", path = "../../api/xous-api-names" }
xous = "0.9.18"
xous-ipc = "0.9.18"
log-server = { package = "xous-api-log", version = "0.1.12" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.11" }
xous-names = { package = "xous-api-names", version = "0.9.13" }
gam = {path = "../../services/gam" }
graphics-server = {path = "../../services/graphics-server" }
trng = {path = "../../services/trng"}

View file

@ -7,11 +7,11 @@ edition = "2018"
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
xous = "0.9.18"
xous-ipc = "0.9.18"
rkyv = {version = "0.4.3", features = ["const_generics"], default-features = false}
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
xous-names = { package = "xous-api-names", path = "../../api/xous-api-names" }
log-server = { package = "xous-api-log", version = "0.1.12" }
xous-names = { package = "xous-api-names", version = "0.9.13" }
gam = {path = "../../services/gam" }
graphics-server = {path = "../../services/graphics-server" }
locales = {path = "../../locales"}
@ -21,7 +21,7 @@ usbd-human-interface-device = "0.2.1"
pddb = {path = "../../services/pddb" }
modals = {path = "../../services/modals" }
trng = {path="../../services/trng"}
susres = {package = "xous-api-susres", path = "../../api/xous-api-susres"}
susres = {package = "xous-api-susres", version = "0.9.11"}
ime-plugin-api = {path = "../../services/ime-plugin-api"}
content-plugin-api = {path = "../../services/content-plugin-api"} # all content canvas providers must provide this API
ctap-crypto = {path = "libraries/crypto"}
@ -31,7 +31,7 @@ byteorder = { version = "1.4.3", default-features = false }
arrayref = "0.3.6"
subtle = { version = "2.2.3", default-features = false, features = ["nightly"] }
rand_core = "0.6.3"
ticktimer-server = {package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.11"}
# ux formatting
hex = { version = "0.4.3", default-features = false, features = ["alloc"] }

View file

@ -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", path = "../../../../api/xous-api-names"}
xous-names = {package = "xous-api-names", version = "0.9.13"}
rand_core = "0.6.3"
p256 = {version = "0.10.1", default-features = false, features = ["ecdsa", "ecdh", "std"]}
cbc = "0.1.2"

View file

@ -30,9 +30,9 @@ js-sys = { version = "0.3", optional = true }
wasm-bindgen-test = "0.3.18"
[target.'cfg(target_os = "xous")'.dependencies]
xous-names = {package = "xous-api-names", path = "../../api/xous-api-names"}
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
xous-names = {package = "xous-api-names", version = "0.9.13"}
xous = "0.9.18"
xous-ipc = "0.9.18"
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}

View file

@ -11,13 +11,13 @@ resolver = "2"
[dependencies]
bitflags = "1.2.1"
stats_alloc = { version = "0.1.8", optional = true }
xous-kernel = { package = "xous", path = "../xous-rs", features = [
xous-kernel = { package = "xous", version = "0.9.18", features = [
"forget-memory-messages",
] }
utralib = { path = "../utralib", optional = true, default_features = false }
utralib = { version = "0.1.6", optional = true, default_features = false }
[target.'cfg(any(windows,unix))'.dev-dependencies]
xous-kernel = { package = "xous", path = "../xous-rs", features = [
xous-kernel = { package = "xous", version = "0.9.18", features = [
"forget-memory-messages",
"processes-as-threads",
] }

View file

@ -8,7 +8,7 @@ description = "Initial kernel loader for Xous"
[dependencies]
ed25519-dalek-loader = { path = "ed25519-dalek-loader", default-features = false }
curve25519-dalek-loader = { path = "curve25519-dalek-loader", default-features = false, features = ["u32e_backend"] }
utralib = { path = "../utralib", optional = true, default-features = false }
utralib = { version = "0.1.6", optional = true, default-features = false }
[dependencies.com_rs]
git = "https://github.com/betrusted-io/com_rs"

View file

@ -55,7 +55,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 = { path = "../../utralib", optional = true, default-features = false }
utralib = { version = "0.1.6", optional = true, default-features = false }
# Betrusted/Precursor dependency set
log = { version = "0.4", optional = true }

View file

@ -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 = { path = "../../utralib", optional = true, default-features = false }
utralib = { version = "0.1.6", optional = true, default-features = false }
[features]
precursor = ["utralib/precursor"]

View file

@ -8,9 +8,9 @@ version = "0.1.0"
# Dependency versions enforced by Cargo.lock.
[dependencies]
log = "0.4.14"
log-server = {package = "xous-api-log", path = "../../api/xous-api-log"}
log-server = {package = "xous-api-log", version = "0.1.12"}
hex-literal = "0.3.1"
xous = { path = "../../xous-rs" }
xous = "0.9.18"
[features]
default = []

View file

@ -7,8 +7,8 @@ description = "AES library for Xous"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../../xous-rs" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
xous = "0.9.18"
log-server = { package = "xous-api-log", version = "0.1.12" }
log = "0.4.14"
hex-literal = "0.3.1"
cipher = "0.4.2"

View file

@ -7,21 +7,21 @@ description = "Audio CODEC server"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../../xous-rs" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
ticktimer-server = { package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer" }
xous-names = { package = "xous-api-names", path = "../../api/xous-api-names" }
xous = "0.9.18"
log-server = { package = "xous-api-log", version = "0.1.12" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.11" }
xous-names = { package = "xous-api-names", version = "0.9.13" }
log = "0.4.14"
susres = {package = "xous-api-susres", path = "../../api/xous-api-susres"}
susres = {package = "xous-api-susres", version = "0.9.11"}
llio = {path = "../llio"}
trng = {path = "../trng"}
xous-ipc = { path = "../../xous-ipc" }
xous-ipc = "0.9.18"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
utralib = { path = "../../utralib", optional = true, default-features = false }
utralib = { version = "0.1.6", optional = true, default-features = false }
[features]
precursor = ["utralib/precursor", "xous/precursor"]

View file

@ -9,13 +9,13 @@ version = "0.1.0"
[dependencies]
com_rs-ref = {path = "../../imports/com_rs-ref"}
log = "0.4.14"
log-server = {package = "xous-api-log", path = "../../api/xous-api-log"}
ticktimer-server = {package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer"}
susres = {package = "xous-api-susres", path = "../../api/xous-api-susres"}
log-server = {package = "xous-api-log", version = "0.1.12"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.11"}
susres = {package = "xous-api-susres", version = "0.9.11"}
typenum = "1.12"
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
xous-names = {package = "xous-api-names", path = "../../api/xous-api-names"}
xous = "0.9.18"
xous-ipc = "0.9.18"
xous-names = {package = "xous-api-names", version = "0.9.13"}
trng = {path = "../trng"}
llio = {path = "../llio"}
@ -25,7 +25,7 @@ rkyv = {version = "0.4.3", default-features = false, features = ["const_generics
xous-semver = "0.1.2"
utralib = {path = "../../utralib", optional = true, default-features = false }
utralib = {version = "0.1.6", optional = true, default-features = false }
[target.'cfg(any(windows,unix))'.dependencies]

View file

@ -7,9 +7,9 @@ description = "Content Canvas Plugin Common APIs"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../../xous-rs" }
xous = "0.9.18"
rkyv = { version = "0.4.3", default_features = false }
graphics-server = { path="../graphics-server"} # this is used by the IMEF portion of the API
xous-names = {package = "xous-api-names", path = "../../api/xous-api-names"} # used by the IMEF for registering listeners
xous-names = {package = "xous-api-names", version = "0.9.13"} # used by the IMEF for registering listeners
log = "0.4.14"

View file

@ -7,19 +7,19 @@ description = "Xous DNS resolver"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../../xous-rs" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
ticktimer-server = { package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer" }
xous-names = { package = "xous-api-names", path = "../../api/xous-api-names" }
xous = "0.9.18"
log-server = { package = "xous-api-log", version = "0.1.12" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.11" }
xous-names = { package = "xous-api-names", version = "0.9.13" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
net = {path = "../net"}
xous-ipc = { path = "../../xous-ipc" }
xous-ipc = "0.9.18"
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
trng = {path = "../trng"}
utralib = { path = "../../utralib", optional = true, default-features = false }
utralib = { version = "0.1.6", optional = true, default-features = false }
[features]
precursor = ["utralib/precursor", "xous/precursor"]

View file

@ -7,16 +7,16 @@ description = "Curve25519 Engine"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../../xous-rs" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
ticktimer-server = { package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer" }
xous-names = { package = "xous-api-names", path = "../../api/xous-api-names" }
xous = "0.9.18"
log-server = { package = "xous-api-log", version = "0.1.12" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.11" }
xous-names = { package = "xous-api-names", version = "0.9.13" }
log = "0.4.14"
susres = {package = "xous-api-susres", path = "../../api/xous-api-susres"}
susres = {package = "xous-api-susres", version = "0.9.11"}
llio = {path = "../llio"} # temporary for testing some power stuff
utralib = { path = "../../utralib", optional = true, default-features = false }
utralib = { version = "0.1.6", optional = true, default-features = false }
xous-ipc = { path = "../../xous-ipc" }
xous-ipc = "0.9.18"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}

View file

@ -7,15 +7,15 @@ description = "Sha512 hardware accelerator engine"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../../xous-rs" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
ticktimer-server = { package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer" }
xous-names = { package = "xous-api-names", path = "../../api/xous-api-names" }
xous = "0.9.18"
log-server = { package = "xous-api-log", version = "0.1.12" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.11" }
xous-names = { package = "xous-api-names", version = "0.9.13" }
log = "0.4.14"
susres = {package = "xous-api-susres", path = "../../api/xous-api-susres"}
susres = {package = "xous-api-susres", version = "0.9.11"}
trng = { path = "../trng" }
xous-ipc = { path = "../../xous-ipc" }
xous-ipc = "0.9.18"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
@ -25,7 +25,7 @@ digest = "0.9.0"
block-buffer = "0.9.0"
opaque-debug = "0.3.0" # prevents internal hash state leakage from debug structures
utralib = { path = "../../utralib", optional = true, default-features = false }
utralib = { version = "0.1.6", optional = true, default-features = false }
[features]
precursor = ["utralib/precursor", "xous/precursor"]

View file

@ -7,18 +7,18 @@ description = "FFI test integration"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../../xous-rs" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
ticktimer-server = { package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer" }
xous-names = { package = "xous-api-names", path = "../../api/xous-api-names" }
xous = "0.9.18"
log-server = { package = "xous-api-log", version = "0.1.12" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.11" }
xous-names = { package = "xous-api-names", version = "0.9.13" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
susres = {package = "xous-api-susres", path = "../../api/xous-api-susres"}
susres = {package = "xous-api-susres", version = "0.9.11"}
ffi-sys = {path = "sys"}
keyboard = {path = "../keyboard"}
utralib = { path = "../../utralib", optional = true, default-features = false }
utralib = { version = "0.1.6", optional = true, default-features = false }
[features]
precursor = ["utralib/precursor", "xous/precursor"]

View file

@ -14,18 +14,18 @@ ime-plugin-api = {path = "../ime-plugin-api"}
ime-plugin-shell = {path = "../ime-plugin-shell"}
keyboard = {path = "../keyboard"}
log = "0.4.14"
log-server = {package = "xous-api-log", path = "../../api/xous-api-log"}
ticktimer-server = {package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer"}
log-server = {package = "xous-api-log", version = "0.1.12"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.11"}
trng = {path = "../trng"}
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
xous-names = {package = "xous-api-names", path = "../../api/xous-api-names"}
xous = "0.9.18"
xous-ipc = "0.9.18"
xous-names = {package = "xous-api-names", version = "0.9.13"}
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
susres = {package = "xous-api-susres", path = "../../api/xous-api-susres"} # used for the sleep now menu item
susres = {package = "xous-api-susres", version = "0.9.11"} # used for the sleep now menu item
enum_dispatch = "0.3.7" # used for trait-based dispatch off of multiple layout objects.
locales = {path = "../../locales"}
@ -41,7 +41,7 @@ hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
sha2 = {path="../engine-sha512"}
digest = "0.9.0"
utralib = {path = "../../utralib", optional = true, default-features = false }
utralib = {version = "0.1.6", optional = true, default-features = false }
[features]
precursor = ["utralib/precursor", "xous/precursor"]

View file

@ -9,18 +9,18 @@ version = "0.1.0"
[dependencies]
keyboard = {path = "../keyboard"}
log = "0.4.14"
log-server = {package = "xous-api-log", path = "../../api/xous-api-log"}
xous = { path = "../../xous-rs" }
susres = {package = "xous-api-susres", path = "../../api/xous-api-susres"}
ticktimer-server = {package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer"}
log-server = {package = "xous-api-log", version = "0.1.12"}
xous = "0.9.18"
susres = {package = "xous-api-susres", version = "0.9.11"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.11"}
xous-ipc = { path = "../../xous-ipc" }
xous-names = {package = "xous-api-names", path = "../../api/xous-api-names"}
xous-ipc = "0.9.18"
xous-names = {package = "xous-api-names", version = "0.9.13"}
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
utralib = {path = "../../utralib", optional = true, default-features = false }
utralib = {version = "0.1.6", optional = true, default-features = false }
[target.'cfg(any(windows,unix))'.dependencies]
minifb = "0.23.0"

View file

@ -12,12 +12,12 @@ graphics-server = {path = "../graphics-server"}
ime-plugin-api = {path = "../ime-plugin-api"}
keyboard = {path = "../keyboard"}
log = "0.4.14"
log-server = {package = "xous-api-log", path = "../../api/xous-api-log"}
ticktimer-server = {package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer"}
xous = { path = "../../xous-rs" }
log-server = {package = "xous-api-log", version = "0.1.12"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.11"}
xous = "0.9.18"
locales = {path = "../../locales"}
xous-ipc = { path = "../../xous-ipc" }
xous-names = {package = "xous-api-names", path = "../../api/xous-api-names"}
xous-ipc = "0.9.18"
xous-names = {package = "xous-api-names", version = "0.9.13"}
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
@ -25,7 +25,7 @@ rkyv = {version = "0.4.3", default-features = false, features = ["const_generics
tts-frontend = {path="../tts"}
utralib = {path = "../../utralib", optional = true, default-features = false }
utralib = {version = "0.1.6", optional = true, default-features = false }
[features]
precursor = ["utralib/precursor", "xous/precursor"]

View file

@ -9,9 +9,9 @@ version = "0.1.0"
[dependencies]
graphics-server = {path = "../graphics-server"}# this is used by the IMEF portion of the API
log = "0.4.14"
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
xous-names = {package = "xous-api-names", path = "../../api/xous-api-names"}# used by the IMEF for registering listeners
xous = "0.9.18"
xous-ipc = "0.9.18"
xous-names = {package = "xous-api-names", version = "0.9.13"}# used by the IMEF for registering listeners
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -9,17 +9,17 @@ version = "0.1.0"
[dependencies]
ime-plugin-api = {path = "../ime-plugin-api"}
log = "0.4.14"
log-server = {package = "xous-api-log", path = "../../api/xous-api-log"}
ticktimer-server = {package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer"}
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
xous-names = {package = "xous-api-names", path = "../../api/xous-api-names"}
log-server = {package = "xous-api-log", version = "0.1.12"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.11"}
xous = "0.9.18"
xous-ipc = "0.9.18"
xous-names = {package = "xous-api-names", version = "0.9.13"}
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
utralib = {path = "../../utralib", optional = true, default-features = false }
utralib = {version = "0.1.6", optional = true, default-features = false }
[features]
precursor = ["utralib/precursor", "xous/precursor"]

View file

@ -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", path = "../../api/xous-api-log"}
ticktimer-server = {package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer"}
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
xous-names = {package = "xous-api-names", path = "../../api/xous-api-names"}
log-server = {package = "xous-api-log", version = "0.1.12"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.11"}
xous = "0.9.18"
xous-ipc = "0.9.18"
xous-names = {package = "xous-api-names", version = "0.9.13"}
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
@ -22,7 +22,7 @@ rkyv = {version = "0.4.3", default-features = false, features = ["const_generics
tts-frontend = {path="../tts"}
locales = {path = "../../locales"}
utralib = {path = "../../utralib", optional = true, default-features = false }
utralib = {version = "0.1.6", optional = true, default-features = false }
[features]
precursor = ["utralib/precursor", "xous/precursor"]

View file

@ -7,19 +7,19 @@ description = "JTAG port server"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../../xous-rs" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
ticktimer-server = { package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer" }
xous-names = { package = "xous-api-names", path = "../../api/xous-api-names" }
xous = "0.9.18"
log-server = { package = "xous-api-log", version = "0.1.12" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.11" }
xous-names = { package = "xous-api-names", version = "0.9.13" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
susres = {package = "xous-api-susres", path = "../../api/xous-api-susres"}
susres = {package = "xous-api-susres", version = "0.9.11"}
xous-ipc = { path = "../../xous-ipc" }
xous-ipc = "0.9.18"
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
utralib = { path = "../../utralib", optional = true, default-features = false }
utralib = { version = "0.1.6", optional = true, default-features = false }
[features]
precursor = ["utralib/precursor", "xous/precursor"]

View file

@ -7,12 +7,12 @@ description = "Program to test various aspects of the kernel"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../../xous-rs" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
ticktimer-server = { package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer" }
xous = "0.9.18"
log-server = { package = "xous-api-log", version = "0.1.12" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.11" }
log = "0.4.14"
utralib = { path = "../../utralib", optional = true, default-features = false }
utralib = { version = "0.1.6", optional = true, default-features = false }
[features]
precursor = ["utralib/precursor", "xous/precursor"]

View file

@ -8,20 +8,20 @@ version = "0.1.0"
# Dependency versions enforced by Cargo.lock.
[dependencies]
log = {version = "0.4", features = ["max_level_trace", "release_max_level_trace"]}
log-server = {package = "xous-api-log", path = "../../api/xous-api-log"}
ticktimer-server = {package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer"}
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
xous-names = {package = "xous-api-names", path = "../../api/xous-api-names"}
log-server = {package = "xous-api-log", version = "0.1.12"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.11"}
xous = "0.9.18"
xous-ipc = "0.9.18"
xous-names = {package = "xous-api-names", version = "0.9.13"}
llio = {path = "../llio"}
susres = {package = "xous-api-susres", path = "../../api/xous-api-susres"}
susres = {package = "xous-api-susres", version = "0.9.11"}
spinor = {path = "../spinor"}
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
utralib = {path = "../../utralib", optional = true, default-features = false }
utralib = {version = "0.1.6", optional = true, default-features = false }
[features]
precursor = ["utralib/precursor", "xous/precursor"]

View file

@ -7,10 +7,10 @@ description = "libstd test stub"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../../xous-rs" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
ticktimer-server = { package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer" }
xous-names = { package = "xous-api-names", path = "../../api/xous-api-names" }
xous = "0.9.18"
log-server = { package = "xous-api-log", version = "0.1.12" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.11" }
xous-names = { package = "xous-api-names", version = "0.9.13" }
log = "0.4.14"
num-derive = {version = "0.3.3", 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 = { path = "../../utralib", optional = true, default-features = false }
utralib = { version = "0.1.6", optional = true, default-features = false }
[features]
precursor = ["utralib/precursor", "xous/precursor"]

View file

@ -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", path = "../../api/xous-api-log"}
ticktimer-server = {package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer"}
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
xous-names = {package = "xous-api-names", path = "../../api/xous-api-names"}
susres = {package = "xous-api-susres", path = "../../api/xous-api-susres"}
log-server = {package = "xous-api-log", version = "0.1.12"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.11"}
xous = "0.9.18"
xous-ipc = "0.9.18"
xous-names = {package = "xous-api-names", version = "0.9.13"}
susres = {package = "xous-api-susres", version = "0.9.11"}
# RTC dependencies
bitflags = "1.2.1"
@ -25,7 +25,7 @@ rkyv = {version = "0.4.3", default-features = false, features = ["const_generics
xous-semver = "0.1.2"
utralib = {path = "../../utralib", optional = true, default-features = false }
utralib = {version = "0.1.6", optional = true, default-features = false }
[target.'cfg(any(windows,unix))'.dependencies]
chrono = "0.4.19"

View file

@ -7,7 +7,7 @@ version = "0.1.0"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../../xous-rs" }
xous = "0.9.18"
[features]
default = []

View file

@ -7,14 +7,14 @@ description = "Ux modals server"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../../xous-rs" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
ticktimer-server = { package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer" }
xous-names = { package = "xous-api-names", path = "../../api/xous-api-names" }
xous = "0.9.18"
log-server = { package = "xous-api-log", version = "0.1.12" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.11" }
xous-names = { package = "xous-api-names", version = "0.9.13" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
xous-ipc = { path = "../../xous-ipc" }
xous-ipc = "0.9.18"
rkyv = {version = "0.4.3", features = ["const_generics"], default-features = false}
gam = {path="../gam"}
trng = {path="../trng"}
@ -22,7 +22,7 @@ tts-frontend = {path="../tts"}
locales = {path = "../../locales"}
bit_field = "0.9.0"
utralib = { path = "../../utralib", optional = true, default-features = false }
utralib = { version = "0.1.6", optional = true, default-features = false }
[features]
precursor = ["utralib/precursor", "xous/precursor"]

View file

@ -7,15 +7,15 @@ description = "Network middleware"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
ticktimer-server = { package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer" }
xous-names = { package = "xous-api-names", path = "../../api/xous-api-names" }
xous = "0.9.18"
xous-ipc = "0.9.18"
log-server = { package = "xous-api-log", version = "0.1.12" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.11" }
xous-names = { package = "xous-api-names", version = "0.9.13" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
susres = {package = "xous-api-susres", path = "../../api/xous-api-susres"}
susres = {package = "xous-api-susres", version = "0.9.11"}
#rkyv = "0.7.18"
rkyv = {version = "0.4.3", features = ["const_generics"], default-features = false}
llio = {path = "../llio"}
@ -25,7 +25,7 @@ trng = {path = "../trng"}
com_rs-ref = {path = "../../imports/com_rs-ref"}
modals = {path = "../modals"}
locales = {path = "../../locales"}
utralib = { path = "../../utralib", optional = true, default-features = false }
utralib = { version = "0.1.6", optional = true, default-features = false }
# for automatic SSID management and AP list storage
pddb = {path = "../pddb"}

View file

@ -8,15 +8,15 @@ description = "Plausibly Deniable Database"
# Dependency versions enforced by Cargo.lock.
[dependencies]
bitflags = {version = "1"}
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
ticktimer-server = { package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer" }
xous-names = { package = "xous-api-names", path = "../../api/xous-api-names" }
xous = "0.9.18"
xous-ipc = "0.9.18"
log-server = { package = "xous-api-log", version = "0.1.12" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.11" }
xous-names = { package = "xous-api-names", version = "0.9.13" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
susres = {package = "xous-api-susres", path = "../../api/xous-api-susres"}
susres = {package = "xous-api-susres", version = "0.9.11"}
rkyv = {version = "0.4.3", features = ["const_generics"], default-features = false}
trng = {path = "../trng"}
spinor = {path = "../spinor"}
@ -45,7 +45,7 @@ gam = {path="../gam"}
locales = {path = "../../locales"}
modals = {path="../modals"}
utralib = { path = "../../utralib", optional = true, default-features = false }
utralib = { version = "0.1.6", optional = true, default-features = false }
[target.'cfg(any(windows,unix))'.dependencies]
rand = "0.7.3"

View file

@ -252,7 +252,7 @@ pub struct PddbBasisList {
pub num: u32,
}
#[derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)]
#[derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Debug)]
pub enum PddbRequestCode {
Create = 0,
Open = 1,

View file

@ -428,7 +428,7 @@ impl Pddb {
PddbRequestCode::NoFreeSpace => Err(Error::new(ErrorKind::OutOfMemory, "No more space on disk")),
PddbRequestCode::NotMounted => Err(Error::new(ErrorKind::ConnectionReset, "PDDB was unmounted")),
PddbRequestCode::NotFound => Err(Error::new(ErrorKind::NotFound, "Dictionary or key was not found")),
_ => Err(Error::new(ErrorKind::Other, "Internal error"))
_ => Err(Error::new(ErrorKind::Other, format!("Unhandled return code: {:?}", response.result))),
}
}

View file

@ -7,20 +7,20 @@ description = "Xous root keys server"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../../xous-rs" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
ticktimer-server = { package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer" }
xous-names = { package = "xous-api-names", path = "../../api/xous-api-names" }
xous = "0.9.18"
log-server = { package = "xous-api-log", version = "0.1.12" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.11" }
xous-names = { package = "xous-api-names", version = "0.9.13" }
log = "0.4.14"
susres = {package = "xous-api-susres", path = "../../api/xous-api-susres"}
susres = {package = "xous-api-susres", version = "0.9.11"}
trng = {path= "../trng"}
spinor = {path="../spinor"}
llio = {path="../llio"}
com = {path="../com"}
xous-semver = "0.1.2"
utralib = { path = "../../utralib", optional = true, default-features = false }
utralib = { version = "0.1.6", optional = true, default-features = false }
xous-ipc = { path = "../../xous-ipc" }
xous-ipc = "0.9.18"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}

View file

@ -16,13 +16,13 @@ ime-plugin-shell = {path = "../ime-plugin-shell"}
ime-plugin-tts = {path = "../ime-plugin-tts"}
llio = {path = "../llio"}
log = "0.4.14"
log-server = {package = "xous-api-log", path = "../../api/xous-api-log"}
ticktimer-server = {package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer"}
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
xous-names = {package = "xous-api-names", path = "../../api/xous-api-names"}
log-server = {package = "xous-api-log", version = "0.1.12"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.11"}
xous = "0.9.18"
xous-ipc = "0.9.18"
xous-names = {package = "xous-api-names", version = "0.9.13"}
keyboard = {path = "../keyboard"}
susres = {package = "xous-api-susres", path = "../../api/xous-api-susres"}
susres = {package = "xous-api-susres", version = "0.9.11"}
codec = {path = "../codec"}
#engine-sha512 = {path="../engine-sha512"}
sha2 = {path="../engine-sha512"}
@ -38,7 +38,7 @@ dns = {path="../dns"}
pddb = {path="../pddb"}
modals = {path="../modals"}
usb-device-xous = {path="../usb-device-xous"}
utralib = {path = "../../utralib", optional = true, default-features = false }
utralib = {version = "0.1.6", optional = true, default-features = false }
tts-frontend = {path="../tts"}
locales = {path = "../../locales"}

View file

@ -7,16 +7,16 @@ description = "Audio CODEC server"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../../xous-rs" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
ticktimer-server = { package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer" }
xous-names = { package = "xous-api-names", path = "../../api/xous-api-names" }
xous = "0.9.18"
log-server = { package = "xous-api-log", version = "0.1.12" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.11" }
xous-names = { package = "xous-api-names", version = "0.9.13" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
susres = {package = "xous-api-susres", path = "../../api/xous-api-susres"}
susres = {package = "xous-api-susres", version = "0.9.11"}
utralib = { path = "../../utralib", optional = true, default-features = false }
utralib = { version = "0.1.6", optional = true, default-features = false }
[features]
precursor = ["utralib/precursor", "xous/precursor"]

View file

@ -7,22 +7,22 @@ description = "SPINOR ROM operations server"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../../xous-rs" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
ticktimer-server = { package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer" }
xous-names = { package = "xous-api-names", path = "../../api/xous-api-names" }
xous = "0.9.18"
log-server = { package = "xous-api-log", version = "0.1.12" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.11" }
xous-names = { package = "xous-api-names", version = "0.9.13" }
log = "0.4.14"
susres = {package = "xous-api-susres", path = "../../api/xous-api-susres"}
susres = {package = "xous-api-susres", version = "0.9.11"}
trng = { path = "../trng" }
com = { path = "../com" }
llio = { path = "../llio" }
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
xous-ipc = { path = "../../xous-ipc" }
xous-ipc = "0.9.18"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
utralib = { path = "../../utralib", optional = true, default-features = false }
utralib = { version = "0.1.6", optional = true, default-features = false }
[dev-dependencies]
lazy_static = "1.4.0"

View file

@ -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", path = "../../api/xous-api-log"}
ticktimer-server = {package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer"}
log-server = {package = "xous-api-log", version = "0.1.12"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.11"}
trng = {path = "../trng"}
llio = {path = "../llio"}
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
xous-names = {package = "xous-api-names", path = "../../api/xous-api-names"}
xous = "0.9.18"
xous-ipc = "0.9.18"
xous-names = {package = "xous-api-names", version = "0.9.13"}
graphics-server = {path = "../graphics-server"}
gam = {path = "../gam"}
locales = {path = "../../locales"}
susres = {package = "xous-api-susres", path = "../../api/xous-api-susres"}
susres = {package = "xous-api-susres", version = "0.9.11"}
root-keys = {path = "../root-keys"}
modals = {path = "../modals"}
pddb = {path = "../pddb"}
@ -42,7 +42,7 @@ digest = "0.9.0"
xous-semver = "0.1.2"
com_rs-ref = {path = "../../imports/com_rs-ref"}
utralib = {path = "../../utralib", optional = true, default-features = false }
utralib = {version = "0.1.6", optional = true, default-features = false }
# short circuit the datetime call on hosted mode
[target.'cfg(any(windows,unix))'.dependencies]

View file

@ -6,4 +6,4 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
xous = { path = "../../xous-rs" }
xous = "0.9.18"

View file

@ -6,4 +6,4 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
xous = { path = "../../../xous-rs" }
xous = "0.9.18"

View file

@ -7,18 +7,18 @@ description = "TRNG server"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../../xous-rs" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
ticktimer-server = { package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer" }
xous-names = { package = "xous-api-names", path = "../../api/xous-api-names" }
xous = "0.9.18"
log-server = { package = "xous-api-log", version = "0.1.12" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.11" }
xous-names = { package = "xous-api-names", version = "0.9.13" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
susres = {package = "xous-api-susres", path = "../../api/xous-api-susres"}
susres = {package = "xous-api-susres", version = "0.9.11"}
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
xous-ipc = { path = "../../xous-ipc" }
xous-ipc = "0.9.18"
utralib = { path = "../../utralib", optional = true, default-features = false }
utralib = { version = "0.1.6", optional = true, default-features = false }
[target.'cfg(any(windows,unix))'.dependencies]
rand = "0.8.5"

View file

@ -7,11 +7,11 @@ description = "Text to speech integration server"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
ticktimer-server = { package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer" }
xous-names = { package = "xous-api-names", path = "../../api/xous-api-names" }
xous = "0.9.18"
xous-ipc = "0.9.18"
log-server = { package = "xous-api-log", version = "0.1.12" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.11" }
xous-names = { package = "xous-api-names", version = "0.9.13" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
@ -20,7 +20,7 @@ rkyv = {version = "0.4.3", default-features = false, features = ["const_generics
xous-tts-backend = "0.1.4"
codec = {path = "../codec"}
utralib = { path = "../../utralib", optional = true, default-features = false }
utralib = { version = "0.1.6", optional = true, default-features = false }
[features]
precursor = ["utralib/precursor", "xous/precursor"]

View file

@ -7,23 +7,23 @@ description = "Xous USB device drivers"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
ticktimer-server = { package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer" }
xous-names = { package = "xous-api-names", path = "../../api/xous-api-names" }
xous = "0.9.18"
xous-ipc = "0.9.18"
log-server = { package = "xous-api-log", version = "0.1.12" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.11" }
xous-names = { package = "xous-api-names", version = "0.9.13" }
log = "0.4.14"
llio = {path="../llio"}
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
susres = {package = "xous-api-susres", path = "../../api/xous-api-susres"}
susres = {package = "xous-api-susres", version = "0.9.11"}
modals = {path = "../modals"}
keyboard = {path = "../keyboard"}
bitfield = "0.13.2"
vcell = "0.1.3"
xous-semver = "0.1.2"
utralib = { path = "../../utralib", optional = true, default-features = false }
utralib = { version = "0.1.6", optional = true, default-features = false }
usbd-human-interface-device = "0.2.1"
embedded-time = "0.12.1" # required by the keyboard interface

View file

@ -7,18 +7,18 @@ description = "USB test & development stub"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../../xous-rs" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
ticktimer-server = { package = "xous-api-ticktimer", path = "../../api/xous-api-ticktimer" }
xous-names = { package = "xous-api-names", path = "../../api/xous-api-names" }
xous = "0.9.18"
log-server = { package = "xous-api-log", version = "0.1.12" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.11" }
xous-names = { package = "xous-api-names", version = "0.9.13" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
susres = {package = "xous-api-susres", path = "../../api/xous-api-susres"}
susres = {package = "xous-api-susres", version = "0.9.11"}
keyboard = {path = "../keyboard"}
bitfield = "0.13.2"
vcell = "0.1.3"
utralib = { path = "../../utralib", optional = true, default-features = false }
utralib = { version = "0.1.6", optional = true, default-features = false }
usbd-human-interface-device = "0.1.1"
embedded-time = "0.12.1" # required by the keyboard interface

View file

@ -10,14 +10,14 @@ homepage = "https://betrusted.io/xous-book/"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous-api-log = {package = "xous-api-log", path = "../../api/xous-api-log"}
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
xous-api-log = {package = "xous-api-log", version = "0.1.12"}
xous = "0.9.18"
xous-ipc = "0.9.18"
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
utralib = {path = "../../utralib", optional = true, default-features = false }
utralib = {version = "0.1.6", optional = true, default-features = false }
[features]
precursor = ["utralib/precursor", "xous/precursor"]

View file

@ -10,16 +10,16 @@ homepage = "https://betrusted.io/"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous-api-names = { path = "../../api/xous-api-names" }
log-server = {package = "xous-api-log", path = "../../api/xous-api-log"}
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
xous-api-names = "0.9.13"
log-server = {package = "xous-api-log", version = "0.1.12"}
xous = "0.9.18"
xous-ipc = "0.9.18"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
log = "0.4.14"
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
utralib = {path = "../../utralib", optional = true, default-features = false }
utralib = {version = "0.1.6", optional = true, default-features = false }
[target.'cfg(any(windows,unix))'.dependencies]

View file

@ -10,11 +10,11 @@ homepage = "https://betrusted.io/xous-book/"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous-api-susres = { path = "../../api/xous-api-susres" }
xous-names = { package = "xous-api-names", path = "../../api/xous-api-names" }
log-server = { package = "xous-api-log", path = "../../api/xous-api-log" }
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
xous-api-susres = "0.9.11"
xous-names = { package = "xous-api-names", version = "0.9.13" }
log-server = { package = "xous-api-log", version = "0.1.12" }
xous = "0.9.18"
xous-ipc = "0.9.18"
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
@ -22,7 +22,7 @@ num-traits = {version = "0.2.14", default-features = false}
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
utralib = { path = "../../utralib", optional = true, default-features = false }
utralib = { version = "0.1.6", optional = true, default-features = false }
[features]
precursor = ["utralib/precursor", "xous/precursor"]

View file

@ -10,18 +10,18 @@ homepage = "https://betrusted.io/xous-book/"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous-api-ticktimer = { path = "../../api/xous-api-ticktimer" }
xous = { path = "../../xous-rs" }
xous-ipc = { path = "../../xous-ipc" }
xous-names = {package = "xous-api-names", path = "../../api/xous-api-names"}
log-server = {package = "xous-api-log", path = "../../api/xous-api-log"}
susres = {package = "xous-api-susres", path = "../../api/xous-api-susres"}
xous-api-ticktimer = "0.9.11"
xous = "0.9.18"
xous-ipc = "0.9.18"
xous-names = {package = "xous-api-names", version = "0.9.13"}
log-server = {package = "xous-api-log", version = "0.1.12"}
susres = {package = "xous-api-susres", version = "0.9.11"}
log = "0.4.14"
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
xous-semver = "0.1.2"
utralib = {path = "../../utralib", optional = true, default-features = false }
utralib = {version = "0.1.6", optional = true, default-features = false }
[features]
precursor = ["utralib/precursor", "xous/precursor", "susres/precursor"]

View file

@ -17,7 +17,7 @@ ring = "0.16.20"
env_logger = "0.7.1"
log = "0.4.14"
pem = "0.8.3"
svd2utra = { path = "../svd2utra" }
svd2utra = "0.1.4"
xmas-elf = "0.7.0"
xous-semver = "0.1.2"

View file

@ -7,9 +7,9 @@ description = "Performance counter tooling"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../../xous-rs" }
xous = "0.9.18"
log = "0.4.14"
utralib = { path = "../../utralib", default-features = false }
utralib = { version = "0.1.6", default-features = false }
[features]
precursor = ["utralib/precursor", "xous/precursor"]

View file

@ -12,7 +12,7 @@ homepage = "https://betrusted.io/xous-book/"
[dependencies]
[build-dependencies]
svd2utra = { path = "../svd2utra" }
svd2utra = "0.1.4"
# UTRA pre-generated version tracker
[features]

View file

@ -10,6 +10,6 @@ homepage = "https://betrusted.io/"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = { path = "../xous-rs" }
xous = "0.9.18"
bitflags = {version = "1"}
rkyv = {version = "0.4.3", features = ["const_generics"], default-features = false}

View file

@ -17,5 +17,5 @@ serde_json = "1.0.41"
serde = { version = "1.0.130", features = ["derive"] }
tempfile = "3.3.0"
ureq = { version = "2.5.0", features = ["json"] }
svd2utra = { path = "../svd2utra" }
svd2utra = "0.1.4"
# toml_edit = "0.14.4" # would be used to verify Cargo.toml files, but it's too hard to do this right now.

View file

@ -117,12 +117,12 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
// packages located on crates.io. For testing non-local build configs that are less
// concerned about software supply chain and more focused on developer convenience.
let base_pkgs_remote = [
"xous-log@0.1.8", // "well known" service: debug logging
"xous-names@0.9.16", // "well known" service: manage inter-server connection lookup
"xous-susres@0.1.12", // ticktimer registers with susres to coordinate time continuity across sleeps
"xous-ticktimer@0.1.11", // "well known" service: thread scheduling
"xous-log@0.1.9", // "well known" service: debug logging
"xous-names@0.9.17", // "well known" service: manage inter-server connection lookup
"xous-susres@0.1.13", // ticktimer registers with susres to coordinate time continuity across sleeps
"xous-ticktimer@0.1.12", // "well known" service: thread scheduling
].to_vec();
let xous_kernel_remote = "xous-kernel@0.9.10";
let xous_kernel_remote = "xous-kernel@0.9.11";
// ---- extract position independent args ----
let lkey = get_flag("--lkey")?;
@ -366,7 +366,17 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
// checking before you can check them!
let do_verify = env::args().filter(|x| x == "--no-verify").count() == 0;
if do_verify {
check_project_consistency()
match check_project_consistency() {
Ok(()) => Ok(()),
Err(e) => {
// Explain to developers why this step is important.
println!("Local source changes have not been published. If you meant to modify core components,");
println!("activate patches in top-level Cargo.toml to redirect crates.io to the local source tree.");
println!("Otherwise, your local changes are IGNORED.");
println!("Use the `--no-verify` argument to suppress this warning.");
Err(e)
}
}
} else {
Ok(())
}

View file

@ -10,20 +10,20 @@ use crate::DynError;
pub fn check_project_consistency() -> Result<(), DynError> {
let check_pkgs = [
// this set updates with kernel API changes
"xous@0.9.17",
"xous-kernel@0.9.10",
"xous-ipc@0.9.17",
"xous-api-log@0.1.11",
"xous-api-names@0.9.12",
"xous-api-susres@0.9.10",
"xous-api-ticktimer@0.9.10",
"xous-log@0.1.8",
"xous-names@0.9.16",
"xous-susres@0.1.12",
"xous-ticktimer@0.1.11",
"xous@0.9.18",
"xous-kernel@0.9.11",
"xous-ipc@0.9.18",
"xous-api-log@0.1.12",
"xous-api-names@0.9.13",
"xous-api-susres@0.9.11",
"xous-api-ticktimer@0.9.11",
"xous-log@0.1.9",
"xous-names@0.9.17",
"xous-susres@0.1.13",
"xous-ticktimer@0.1.12",
// this set is only updated if the utralib changes
"utralib@0.1.5",
"svd2utra@0.1.3",
"utralib@0.1.6",
"svd2utra@0.1.4",
];
for pkg in check_pkgs {
verify(pkg.into())?;