Merge branch 'main' of github.com:betrusted-io/xous-core

This commit is contained in:
Sean Cross 2023-09-17 16:29:59 +08:00
commit c1dae9d999
81 changed files with 699 additions and 2825 deletions

236
Cargo.lock generated
View file

@ -74,7 +74,7 @@ dependencies = [
"aes 0.8.1",
"hex-literal",
"log",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
]
@ -264,11 +264,11 @@ dependencies = [
"num-derive",
"num-traits",
"trng",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -676,12 +676,12 @@ dependencies = [
"rkyv",
"trng",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -707,12 +707,12 @@ dependencies = [
"trng",
"typenum",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
]
@ -764,7 +764,7 @@ dependencies = [
"graphics-server",
"log",
"rkyv",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-names",
]
@ -805,7 +805,7 @@ version = "0.1.0"
dependencies = [
"log",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
@ -821,7 +821,7 @@ dependencies = [
"num-derive",
"num-traits",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
@ -835,7 +835,7 @@ dependencies = [
"num-derive",
"num-traits",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
@ -1376,12 +1376,12 @@ dependencies = [
"trng",
"userprefs",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1401,12 +1401,12 @@ dependencies = [
"rkyv",
"spinor",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1556,12 +1556,12 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1694,7 +1694,7 @@ dependencies = [
"num-derive",
"num-traits",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
@ -1918,12 +1918,12 @@ dependencies = [
"trng",
"tts-frontend",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1984,9 +1984,9 @@ dependencies = [
"wasi 0.11.0+wasi-snapshot-preview1",
"wasm-bindgen",
"wasm-bindgen-test",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-names",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -2019,12 +2019,12 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -2109,10 +2109,10 @@ dependencies = [
"num-derive",
"num-traits",
"tts-frontend",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -2252,11 +2252,11 @@ dependencies = [
"rkyv",
"tts-frontend",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -2268,9 +2268,9 @@ dependencies = [
"num-derive",
"num-traits",
"rkyv",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-names",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -2283,11 +2283,11 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -2302,11 +2302,11 @@ dependencies = [
"rkyv",
"tts-frontend",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -2412,12 +2412,12 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -2432,7 +2432,7 @@ version = "0.1.0"
dependencies = [
"log",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-ticktimer",
]
@ -2449,12 +2449,12 @@ dependencies = [
"rkyv",
"spinor",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -2530,7 +2530,7 @@ dependencies = [
"num-derive",
"num-traits",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
@ -2554,12 +2554,12 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
]
@ -2717,11 +2717,11 @@ dependencies = [
"trng",
"tts-frontend",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -2748,11 +2748,11 @@ dependencies = [
"status",
"trng",
"ureq",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -2788,12 +2788,12 @@ dependencies = [
"smoltcp",
"trng",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
]
@ -3179,12 +3179,12 @@ dependencies = [
"trng",
"tts-frontend",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"zeroize",
"zeroize_derive",
]
@ -3212,7 +3212,7 @@ version = "0.1.0"
dependencies = [
"log",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -3765,11 +3765,11 @@ dependencies = [
"num-derive",
"num-traits",
"trng",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -3807,9 +3807,9 @@ dependencies = [
"spin 0.5.2",
"untrusted",
"winapi",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-names",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -3891,12 +3891,12 @@ dependencies = [
"tts-frontend",
"usb-device-xous",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
"zeroize",
]
@ -4227,12 +4227,12 @@ dependencies = [
"rkyv",
"trng",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -4321,12 +4321,12 @@ dependencies = [
"usb-device-xous",
"utralib",
"x25519-dalek",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -4408,12 +4408,12 @@ dependencies = [
"rkyv",
"trng",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -4469,12 +4469,12 @@ dependencies = [
"usb-device-xous",
"userprefs",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
]
@ -4656,7 +4656,7 @@ name = "ticktimer-test-client"
version = "0.1.0"
dependencies = [
"log",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
]
@ -4750,11 +4750,11 @@ dependencies = [
"sha2 0.9.8",
"webpki-roots 0.23.1",
"x509-parser",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -4867,10 +4867,10 @@ dependencies = [
"num-derive",
"num-traits",
"usb-device-xous",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -4885,12 +4885,12 @@ dependencies = [
"rand_core 0.5.1",
"rkyv",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -4903,11 +4903,11 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-tts-backend",
]
@ -5069,12 +5069,12 @@ dependencies = [
"usbd_scsi 0.1.1",
"utralib",
"vcell",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
]
@ -5094,7 +5094,7 @@ dependencies = [
"usbd-human-interface-device 0.1.1",
"utralib",
"vcell",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
@ -5157,7 +5157,7 @@ dependencies = [
"typenum",
"usb-device",
"usbd_mass_storage 0.1.0",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-ticktimer",
]
@ -5231,7 +5231,7 @@ dependencies = [
"usb-device",
"usbd_bulk_only_transport 0.1.0",
"usbd_mass_storage 0.1.0",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-ticktimer",
]
@ -5311,12 +5311,12 @@ dependencies = [
"usbd-human-interface-device 0.2.1",
"userprefs",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -5859,7 +5859,7 @@ checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
[[package]]
name = "xous"
version = "0.9.50"
version = "0.9.51"
dependencies = [
"compiler_builtins",
"lazy_static",
@ -5868,94 +5868,94 @@ dependencies = [
[[package]]
name = "xous"
version = "0.9.50"
version = "0.9.51"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e22345475acd2fa8a2385a3ef335cbb51a81d6908fbd5c23759969ecbce5ac72"
checksum = "f4d8c91009ed676410e747425107cfe4afc3dd9d3bf502a87542a353173b09e8"
dependencies = [
"lazy_static",
]
[[package]]
name = "xous-api-log"
version = "0.1.46"
version = "0.1.47"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75be0f7c2830bff3f575e01084295d5a8ecc66e0c44ba3aeacec89d41802bcbd"
checksum = "4eafb373d7e40d7ee4afc0489bd3d26bfab4d9a7b70791ef61a5d5cc8451071f"
dependencies = [
"log",
"num-derive",
"num-traits",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "xous-api-names"
version = "0.9.48"
version = "0.9.49"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fd4411d760d8124a02be6dbbd149b80e0538e6195286155a3362cd337879808"
checksum = "021f7059279bc3fd94d2c9e5201c2e70f9b4ca569852f6e33504f7fa0c0f9f91"
dependencies = [
"log",
"num-derive",
"num-traits",
"rkyv",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "xous-api-susres"
version = "0.9.46"
version = "0.9.47"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d71ec095cfc0a3bd907cb1bfc4e5192ad658523b2f77e68f40abde0c0fb4645c"
checksum = "b84645bb01a97f65a8a6aff6d55083ceba76163a771f7520ae040dadac392176"
dependencies = [
"log",
"num-derive",
"num-traits",
"rkyv",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "xous-api-ticktimer"
version = "0.9.46"
version = "0.9.47"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e81a23eb5d0cff6b05df0da76a88098b23980fc3dbee0fadcb1bfcb492521da8"
checksum = "204874bdcb4cce6a968ee7a090c2c67632403373849bf5d1ce7e0817339c9166"
dependencies = [
"log",
"num-derive",
"num-traits",
"rkyv",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
]
[[package]]
name = "xous-ipc"
version = "0.9.50"
version = "0.9.51"
dependencies = [
"bitflags 1.3.2",
"rkyv",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "xous-ipc"
version = "0.9.50"
version = "0.9.51"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91ab03617c3032c89a514238bf5c515bf2897c04302b7adb78e021dc50304382"
checksum = "549eacc8d02d5e4c49559840fc3ec7f16e9a2c0a5bd27ae94da9c3e6ef9bc210"
dependencies = [
"bitflags 1.3.2",
"rkyv",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -5975,7 +5975,7 @@ dependencies = [
"rand_chacha 0.3.1",
"stats_alloc",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-riscv",
]
@ -5989,9 +5989,9 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -6003,10 +6003,10 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -6018,7 +6018,7 @@ dependencies = [
"pio",
"pio-proc",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -6030,7 +6030,7 @@ dependencies = [
"pio",
"pio-proc",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-pio",
]
@ -6059,11 +6059,11 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -6076,12 +6076,12 @@ dependencies = [
"num-traits",
"rkyv",
"utralib",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-log",
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
]
@ -6095,9 +6095,9 @@ dependencies = [
"num-derive",
"num-traits",
"rkyv",
"xous 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-api-names",
"xous-ipc 0.9.50 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-ipc 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]

View file

@ -3,15 +3,15 @@ authors = ["Sean Cross <sean@xobs.io>"]
description = "Log server API"
edition = "2018"
name = "xous-api-log"
version = "0.1.46"
version = "0.1.47"
license = "MIT OR Apache-2.0"
repository = "https://github.com/betrusted-io/xous-core/"
homepage = "https://betrusted.io/xous-book/"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.50"
xous-ipc = "0.9.50"
xous = "0.9.51"
xous-ipc = "0.9.51"
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -3,16 +3,16 @@ authors = ["bunnie <bunnie@kosagi.com>"]
description = "Xous microkernel OS inter-process name resolution server"
edition = "2018"
name = "xous-api-names"
version = "0.9.48"
version = "0.9.49"
license = "MIT OR Apache-2.0"
repository = "https://github.com/betrusted-io/xous-core/"
homepage = "https://betrusted.io/"
# Dependency versions enforced by Cargo.lock.
[dependencies]
log-server = {package = "xous-api-log", version = "0.1.46"}
xous = "0.9.50"
xous-ipc = "0.9.50"
log-server = {package = "xous-api-log", version = "0.1.47"}
xous = "0.9.51"
xous-ipc = "0.9.51"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
log = "0.4.14"

View file

@ -1,6 +1,6 @@
[package]
name = "xous-api-susres"
version = "0.9.46"
version = "0.9.47"
authors = ["bunnie <bunnie@kosagi.com>"]
edition = "2018"
description = "Manager of suspend/resume operations"
@ -10,10 +10,10 @@ homepage = "https://betrusted.io/xous-book/"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.50"
xous-ipc = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
xous = "0.9.51"
xous-ipc = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -3,18 +3,18 @@ authors = ["bunnie <bunnie@kosagi.com>", "Sean Cross <sean@xobs.io>"]
description = "Provide high-resolution, non-rollover system time"
edition = "2018"
name = "xous-api-ticktimer"
version = "0.9.46"
version = "0.9.47"
license = "MIT OR Apache-2.0"
repository = "https://github.com/betrusted-io/xous-core/"
homepage = "https://betrusted.io/xous-book/"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.50"
xous-ipc = "0.9.50"
log-server = {package = "xous-api-log", version = "0.1.46"}
susres = {package = "xous-api-susres", version = "0.9.46"}
xous-names = {package = "xous-api-names", version = "0.9.48"}
xous = "0.9.51"
xous-ipc = "0.9.51"
log-server = {package = "xous-api-log", version = "0.1.47"}
susres = {package = "xous-api-susres", version = "0.9.47"}
xous-names = {package = "xous-api-names", version = "0.9.49"}
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 = "0.9.50"
xous-ipc = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
xous = "0.9.51"
xous-ipc = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
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 = "0.9.50"
xous-ipc = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
xous = "0.9.51"
xous-ipc = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
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 = "0.9.50"
xous-ipc = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
xous = "0.9.51"
xous-ipc = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
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 = "0.9.50"
xous-ipc = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
xous = "0.9.51"
xous-ipc = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
gam = {path = "../../services/gam" }
graphics-server = {path = "../../services/graphics-server" }
trng = {path = "../../services/trng"}

View file

@ -9,10 +9,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 = "0.9.50"
xous-ipc = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
xous = "0.9.51"
xous-ipc = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
gam = {path = "../../services/gam" }
graphics-server = {path = "../../services/graphics-server" }
usb-device-xous = {path="../../services/usb-device-xous"}

View file

@ -25,8 +25,9 @@ impl FlashDrive {
)
.unwrap();
// initialize backing slice with bogus data
let backing_slice: &mut [u32] = backing.as_slice_mut();
// initialize backing slice with bogus data. Safety: all `[u32]`
// values are valid
let backing_slice: &mut [u32] = unsafe { backing.as_slice_mut() };
for (index, d) in backing_slice.iter_mut().enumerate() {
*d = index as u32;
}
@ -44,7 +45,8 @@ impl FlashDrive {
.memory_message_mut()
.expect("incorrect message type received");
let lba = body.offset.map(|v| v.get()).unwrap_or_default();
let data = body.buf.as_slice_mut::<u8>();
// Safety: all values of `[u32]` are valid
let data = unsafe { body.buf.as_slice_mut::<u8>() };
self.read_inner(lba, data);
}
@ -55,7 +57,8 @@ impl FlashDrive {
.memory_message_mut()
.expect("incorrect message type received");
let lba = body.offset.map(|v| v.get()).unwrap_or_default();
let data = body.buf.as_slice_mut::<u8>();
// Safety: all values of `[u32]` are valid
let data = unsafe { body.buf.as_slice_mut::<u8>() };
self.write_inner(lba, data);
}
@ -67,7 +70,8 @@ impl FlashDrive {
impl FlashDrive {
fn read_inner(&mut self, lba: usize, data: &mut [u8]) {
let backing_slice: &[u8] = self.memory.as_slice();
// Safety: all values of `[u8]` are valid
let backing_slice: &[u8] = unsafe { self.memory.as_slice() };
let rawdata = &backing_slice[lba * self.block_size..(lba + 1) * self.block_size];
@ -75,7 +79,8 @@ impl FlashDrive {
}
fn write_inner(&mut self, lba: usize, data: &mut [u8]) {
let backing_slice: &mut [u8] = self.memory.as_slice_mut();
// Safety: all values of `[u8]` are valid
let backing_slice: &mut [u8] = unsafe { self.memory.as_slice_mut() };
backing_slice[lba * self.block_size..(lba + 1) * self.block_size]
.copy_from_slice(&data[..self.block_size]);
}

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 = "0.9.50"
xous-ipc = "0.9.50"
xous = "0.9.51"
xous-ipc = "0.9.51"
rkyv = {version = "0.4.3", features = ["const_generics"], default-features = false}
log-server = { package = "xous-api-log", version = "0.1.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
log-server = { package = "xous-api-log", version = "0.1.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
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", version = "0.9.46"}
susres = {package = "xous-api-susres", version = "0.9.47"}
ime-plugin-api = {path = "../../services/ime-plugin-api"}
content-plugin-api = {path = "../../services/content-plugin-api"} # all content canvas providers must provide this API
backup = {path = "libraries/backup"}
@ -29,7 +29,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", version = "0.9.46"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.47"}
userprefs = {path = "../../libs/userprefs"}
# opensk

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", version = "0.9.48"}
xous-names = {package = "xous-api-names", version = "0.9.49"}
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", version = "0.9.48"}
xous = "0.9.50"
xous-ipc = "0.9.50"
xous-names = {package = "xous-api-names", version = "0.9.49"}
xous = "0.9.51"
xous-ipc = "0.9.51"
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}

View file

@ -11,14 +11,14 @@ resolver = "2"
[dependencies]
bitflags = "1.2.1"
stats_alloc = { version = "0.1.8", optional = true }
xous-kernel = { package = "xous", version = "0.9.50", features = [
xous-kernel = { package = "xous", version = "0.9.51", features = [
"forget-memory-messages",
] }
utralib = { version = "0.1.23", optional = true, default_features = false }
rand_chacha = { version = "0.3.1", optional = true, default_features = false }
[target.'cfg(any(windows,unix))'.dev-dependencies]
xous-kernel = { package = "xous", version = "0.9.50", features = [
xous-kernel = { package = "xous", version = "0.9.51", features = [
"forget-memory-messages",
"processes-as-threads",
] }
@ -31,7 +31,7 @@ gdbstub_arch = { version = "0.2.4", optional = true, default-features = false }
[target.'cfg(target_arch = "arm")'.dependencies]
armv7 = { git = "https://github.com/Foundation-Devices/armv7.git", branch = "update", features = ["critical-section"] }
atsama5d27 = { git = "https://github.com/Foundation-Devices/atsama5d27.git", branch = "master" }
xous-kernel = { package = "xous", version = "0.9.50", features = [
xous-kernel = { package = "xous", version = "0.9.51", features = [
"v2p",
] }
critical-section = "1.1.1"

View file

@ -9,15 +9,15 @@ use crate::{
debug::shell::process_characters,
PID,
};
#[cfg(feature="cramium-fpga")]
use utralib::generated::*;
#[cfg(feature="cramium-fpga")]
use xous_kernel::{MemoryFlags, MemoryType};
#[cfg(feature="cramium-soc")]
use crate::{
io::{SerialWrite, SerialRead},
mem::MemoryManager,
debug::shell::process_characters,
PID,
};
/// UART virtual address.
@ -136,7 +136,21 @@ pub fn init() {
#[cfg(feature="cramium-soc")]
pub fn init() { // there is no kernel UART yet...just a placeholder function
let uart = Uart::new(UART_ADDR, IRQ0_ADDR, process_characters);
// Map the UART peripheral.
MemoryManager::with_mut(|memory_manager| {
memory_manager
.map_range(
utra::duart::HW_DUART_BASE as *mut u8,
(UART_ADDR & !4095) as *mut u8,
4096,
PID::new(1).unwrap(),
MemoryFlags::R | MemoryFlags::W,
MemoryType::Default,
)
.expect("unable to map serial port")
});
let mut uart = Uart::new(UART_ADDR, IRQ0_ADDR, process_characters);
uart.init();
unsafe{
UART = Some(uart);
crate::debug::shell::init(UART.as_mut().unwrap());
@ -145,19 +159,26 @@ pub fn init() { // there is no kernel UART yet...just a placeholder function
#[cfg(feature="cramium-soc")]
pub struct Uart {
uart_csr: CSR<u32>,
}
#[cfg(feature="cramium-soc")]
impl Uart {
pub fn new(_addr: usize, _irq_addr: usize, _callback: fn(&mut Self)) -> Uart {
pub fn new(addr: usize, _irq_addr: usize, _callback: fn(&mut Self)) -> Uart {
Uart {
uart_csr: CSR::new(addr as *mut u32),
}
}
pub fn init(&mut self) {
// duart requires no special initializations
}
}
#[cfg(feature="cramium-soc")]
impl SerialWrite for Uart {
fn putc(&mut self, _c: u8) {
fn putc(&mut self, c: u8) {
while self.uart_csr.r(utra::duart::SFR_SR) != 0 {}
self.uart_csr.wo(utra::duart::SFR_TXD, c as u32);
}
}

View file

@ -20,7 +20,7 @@ typenum = "1.11.2"
usbd_mass_storage = { version = "0.1.0", path = "../usbd_mass_storage" }
packing = { version = "0.2.0", path = "../packing/packing" }
log = "0.4.17"
xous = "0.9.50"
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.46" }
xous = "0.9.51"
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
[features]

View file

@ -22,7 +22,7 @@ usbd_mass_storage = { version = "0.1.0", path = "../usbd_mass_storage" }
packing = { version = "0.2.0", path = "../packing/packing" }
usbd_bulk_only_transport = { version = "0.1.0", path = "../usbd_bulk_only_transport" }
log = "0.4.17"
xous = "0.9.50"
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.46" }
xous = "0.9.51"
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
[features]

View file

@ -9,11 +9,11 @@ version = "0.1.0"
log = "0.4.14"
num-derive = { version = "0.3.3", default-features = false}
num-traits = { version = "0.2.14", default-features = false}
xous = "0.9.50"
xous-ipc = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
xous = "0.9.51"
xous-ipc = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
modals = { path = "../../services/modals" }
net = { path = "../../services/net" }

View file

@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"
[dependencies]
xous-names = {package = "xous-api-names", version = "0.9.48"}
xous-names = {package = "xous-api-names", version = "0.9.49"}
pddb = {path = "../../services/pddb"}
keyboard = {path = "../../services/keyboard"}
bincode = {version = "2.0.0-rc.2"}

View file

@ -10,10 +10,10 @@ log = "0.4.14"
pio-proc = "0.2.2"
pio = "0.2.1"
defmt = {version ="0.3", optional = true}
utralib = {version = "0.1.23", optional = true, default-features = false }
utralib = {version = "0.1.23", default-features = false }
[target.'cfg(target_os = "xous")'.dependencies]
xous = "0.9.50"
xous = "0.9.51"
[features]
cramium-soc = ["utralib/cramium-soc"]

View file

@ -3,9 +3,8 @@
use pio::Program;
use pio::RP2040_MAX_PROGRAM_SIZE;
mod pio_generated;
use pio_generated::utra::rp_pio;
use pio_generated::*;
use utralib::generated::*;
use utralib::generated::utra::rp_pio;
#[cfg(feature="tests")]
pub mod pio_tests;

File diff suppressed because it is too large Load diff

View file

@ -1,4 +1,5 @@
use crate::pio_generated::utra::rp_pio;
use utralib::generated::utra::rp_pio;
use crate::*;
use super::report_api;

View file

@ -1,5 +1,5 @@
use crate::*;
use crate::pio_generated::utra::rp_pio;
use utralib::utra::rp_pio;
use super::report_api;
const SIM_SCALE_FACTOR: f32 = 200.0; // speedup over real time to have simulation finish in a reasonable amount of time

View file

@ -1,4 +1,4 @@
use crate::pio_generated::utra::rp_pio;
use utralib::generated::utra::rp_pio;
use crate::*;
use super::report_api;

View file

@ -1,5 +1,5 @@
use pio::RP2040_MAX_PROGRAM_SIZE;
use crate::pio_generated::utra::rp_pio::{self, SFR_FDEBUG, SFR_FLEVEL, SFR_FSTAT, SFR_DBG_CFGINFO};
use utralib::utra::rp_pio::{self, SFR_FDEBUG, SFR_FLEVEL, SFR_FSTAT, SFR_DBG_CFGINFO};
use crate::*;
use super::report_api;
@ -865,8 +865,9 @@ pub fn instruction_tests() {
report_api(expected_value);
wait_rx_or_fail(&mut sm_a, expected_value, None, None);
// retrograde movement of address would indicate we're in the loop (this might not work perfectly on real hardware due to synchronizers)
wait_addr_or_fail(&sm_a, 31, None);
wait_addr_or_fail(&sm_a, 30, None);
// commented out, because this test is too sensitive to external clock config
// wait_addr_or_fail(&sm_a, 31, None);
// wait_addr_or_fail(&sm_a, 30, None);
level += 1;
if level > 4 {

View file

@ -14,7 +14,7 @@ pio-proc = "0.2.2"
pio = "0.2.1"
[target.'cfg(target_os = "xous")'.dependencies]
xous = "0.9.50"
xous = "0.9.51"
[features]
cramium-soc = ["utralib/cramium-soc"]
@ -23,6 +23,7 @@ precursor = []
hosted = []
renode = []
pio = ["xous-pio"]
dma-mainram = []
tests = ["pio"]
default = ["tests", "pio"]

View file

@ -36,8 +36,16 @@ pub fn basic_tests (pl230: &mut Pl230) -> bool {
const DMA_LEN: usize = 16;
// setup the PL230 to do a simple transfer between two memory regions
// dma_mainram feature will cause us to DMA between main memory regions. This works under RTL sims.
#[cfg(feature="dma_mainram")]
let mut region_a = [0u32; DMA_LEN];
#[cfg(feature="dma_mainram")]
let region_b = [0u32; DMA_LEN];
// The alternate is to DMA between IFRAM regions. This works under FPGA and RTL sim.
#[cfg(not(feature="dma_mainram"))]
let region_a = unsafe{core::slice::from_raw_parts_mut((utralib::HW_IFRAM0_MEM + 4096) as *mut u32, DMA_LEN)};
#[cfg(not(feature="dma_mainram"))]
let region_b = unsafe{core::slice::from_raw_parts_mut(utralib::HW_IFRAM1_MEM as *mut u32, DMA_LEN)};
let mut state = 0x1111_1111;
for d in region_a.iter_mut() {
*d = state;
@ -89,16 +97,31 @@ pub fn basic_tests (pl230: &mut Pl230) -> bool {
"nop",
); }
// manual flushing, as a sanity check of cache flush if needed
/*
{
let flush_ptr = 0x6100_0000 as *mut u32;
let mut dummy: u32 = 0;
// read a bunch of data to ensure the cache is flushed
for i in 0..131072 {
dummy += unsafe{flush_ptr.add(i).read_volatile()};
}
report_api("dummy: ", dummy);
} */
let mut passing = true;
let mut errs = 0;
for (i, (src, dst)) in region_a.iter().zip(region_b.iter()).enumerate() {
if *src != *dst {
report_api("error in iter ", i as u32);
report_api("src: ", *src);
report_api("dst: ", *dst);
passing = false;
errs += 1;
}
}
report_api("basic dma result (1=pass)", if passing { 1 } else { 0 });
report_api("errs: ", errs);
passing
}
@ -106,6 +129,15 @@ pub fn basic_tests (pl230: &mut Pl230) -> bool {
pub fn pio_test(pl230: &mut Pl230) -> bool {
use xous_pio::*;
let iox_csr = utra::iox::HW_IOX_BASE as *mut u32;
unsafe {
iox_csr.add(0x8 / core::mem::size_of::<u32>()).write_volatile(0b0101_0101_0101_0101); // PBL
iox_csr.add(0xC / core::mem::size_of::<u32>()).write_volatile(0b0101_0101_0101_0101); // PBH
iox_csr.add(0x10 / core::mem::size_of::<u32>()).write_volatile(0b0101_0101_0101_0101); // PCL
iox_csr.add(0x14 / core::mem::size_of::<u32>()).write_volatile(0b0101_0101_0101_0101); // PCH
iox_csr.add(0x200 / core::mem::size_of::<u32>()).write_volatile(0xffffffff); // PIO sel port D31-0
}
// setup PIO block as DMA target -- just take the data coming into the TX
// FIFO and send it to the GPIO pins.
let mut pio_ss = PioSharedState::new();
@ -120,8 +152,13 @@ pub fn pio_test(pl230: &mut Pl230) -> bool {
sm_a.sm_set_enabled(false);
a_prog.setup_default_config(&mut sm_a);
sm_a.config_set_out_pins(0, 32);
sm_a.sm_set_pindirs_with_mask(
0xFFFF_FFFF,
0xFFFF_FFFF
);
sm_a.config_set_clkdiv(133.0); // have it run slow so this test operates in the background
sm_a.config_set_out_shift(false, true, 32);
sm_a.sm_set_pindirs_with_mask(0x10, 0x10);
sm_a.sm_init(a_prog.entry());
sm_a.sm_clear_fifos(); // ensure the fifos are cleared for this test
@ -158,7 +195,7 @@ pub fn pio_test(pl230: &mut Pl230) -> bool {
let mut state = 0x1111_0000;
for d in region_a.iter_mut() {
*d = state;
state += 1;
state += 0x0101_0101;
}
cc_struct.channels[0].dst_end_ptr =

View file

@ -62,6 +62,8 @@ pub fn platform_tests() {
#[cfg(feature="cramium-soc")]
pub fn early_init() {
/*
// "actual SoC" parameters
unsafe {
(0x400400a0 as *mut u32).write_volatile(0x1F598); // F
crate::println!("F: {:08x}", ((0x400400a0 as *const u32).read_volatile()));
@ -93,5 +95,70 @@ pub fn early_init() {
crate::println!("{:08x} ok", dat);
}
}
} */
// FPGA board parameters (deals with MMCM instead of PLL)
unsafe {
let poke_array: [(u32, u32, bool); 9] = [
(0x40040030, 0x0001, true), // cgusel1
(0x40040010, 0x0001, true), // cgusel0
(0x40040010, 0x0001, true), // cgusel0
(0x40040014, 0x007f, true), // fdfclk
(0x40040018, 0x007f, true), // fdaclk
(0x4004001c, 0x007f, true), // fdhclk
(0x40040020, 0x007f, true), // fdiclk
(0x40040024, 0x007f, true), // fdpclk
(0x400400a0, 0x4040, false), // pllmn FPGA
];
for &(addr, dat, is_u32) in poke_array.iter() {
let rbk = if is_u32 {
(addr as *mut u32).write_volatile(dat);
(addr as *const u32).read_volatile()
} else {
(addr as *mut u16).write_volatile(dat as u16);
(addr as *const u16).read_volatile() as u32
};
if dat != rbk {
crate::println!("{:08x}(w) != {:08x}(r)", dat, rbk);
} else {
crate::println!("{:08x} ok", dat);
}
}
}
use utralib::generated::*;
// configure the UDMA UART and send a test string. This UART's settings will be
// used as the initial console UART.
let mut udma_ctrl = CSR::new(utra::udma_ctrl::HW_UDMA_CTRL_BASE as *mut u32);
let iox_csr = utra::iox::HW_IOX_BASE as *mut u32;
unsafe {
iox_csr.add(0).write_volatile(0b00_00_00_01_01_00_00_00); // PAL AF1 on PA3/PA4
iox_csr.add(0x1c / core::mem::size_of::<u32>()).write_volatile(0x1400); // PDH
iox_csr.add(0x148 / core::mem::size_of::<u32>()).write_volatile(0x10); // PA4 output
iox_csr.add(0x148 / core::mem::size_of::<u32>() + 3).write_volatile(0xffff); // PD
iox_csr.add(0x160 / core::mem::size_of::<u32>()).write_volatile(0x8); // PA3 pullup
}
udma_ctrl.wo(utra::udma_ctrl::REG_CG, 1);
let baudrate: u32 = 115200;
let freq: u32 = 100_000_000;
let clk_counter: u32 = (freq + baudrate / 2) / baudrate;
let mut udma_uart = CSR::new(utra::udma_uart_0::HW_UDMA_UART_0_BASE as *mut u32);
udma_uart.wo(utra::udma_uart_0::REG_UART_SETUP,
0x0306 | (clk_counter << 16));
/*
// send a test string to confirm the UART is configured
let tx_buf = utralib::HW_IFRAM0_MEM as *mut u8;
for i in 0..16 {
unsafe { tx_buf.add(i).write_volatile('a' as u32 as u8 + i as u8) };
}
udma_uart.wo(utra::udma_uart_0::REG_TX_SADDR, tx_buf as u32);
udma_uart.wo(utra::udma_uart_0::REG_TX_SIZE, 16);
// send it
udma_uart.wo(utra::udma_uart_0::REG_TX_CFG, 0x10); // EN
// wait for it all to be done
while udma_uart.rf(utra::udma_uart_0::REG_TX_CFG_R_TX_EN) != 0 { }
while (udma_uart.r(utra::udma_uart_0::REG_STATUS) & 1) != 0 { }
*/
}

View file

@ -10,8 +10,8 @@ version = "0.1.0"
aes = { path = "../aes" }
hex-literal = "0.3.1"
log = "0.4.14"
log-server = { package = "xous-api-log", version = "0.1.46" }
xous = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.47" }
xous = "0.9.51"
[features]
default = []

View file

@ -7,16 +7,16 @@ description = "Audio CODEC server"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
xous = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
log = "0.4.14"
susres = {package = "xous-api-susres", version = "0.9.46"}
susres = {package = "xous-api-susres", version = "0.9.47"}
llio = {path = "../llio"}
trng = {path = "../trng"}
xous-ipc = "0.9.50"
xous-ipc = "0.9.51"
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

@ -9,13 +9,13 @@ version = "0.1.0"
[dependencies]
com_rs = { git = "https://github.com/betrusted-io/com_rs", rev = "891bdd3ca8e41f81510d112483e178aea3e3a921" }
log = "0.4.14"
log-server = {package = "xous-api-log", version = "0.1.46"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.46"}
susres = {package = "xous-api-susres", version = "0.9.46"}
log-server = {package = "xous-api-log", version = "0.1.47"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.47"}
susres = {package = "xous-api-susres", version = "0.9.47"}
typenum = "1.12"
xous = "0.9.50"
xous-ipc = "0.9.50"
xous-names = {package = "xous-api-names", version = "0.9.48"}
xous = "0.9.51"
xous-ipc = "0.9.51"
xous-names = {package = "xous-api-names", version = "0.9.49"}
trng = {path = "../trng"}
llio = {path = "../llio"}

View file

@ -7,9 +7,9 @@ description = "Content Canvas Plugin Common APIs"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.50"
xous = "0.9.51"
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", version = "0.9.48"} # used by the IMEF for registering listeners
xous-names = {package = "xous-api-names", version = "0.9.49"} # used by the IMEF for registering listeners
log = "0.4.14"

View file

@ -7,10 +7,10 @@ edition = "2021"
[dependencies]
utralib = {version = "0.1.23", optional = true, default-features = false }
xous-api-names = "0.9.48"
xous-api-ticktimer = "0.9.46"
xous = "0.9.50"
log-server = {package = "xous-api-log", version = "0.1.46"}
xous-api-names = "0.9.49"
xous-api-ticktimer = "0.9.47"
xous = "0.9.51"
log-server = {package = "xous-api-log", version = "0.1.47"}
log = "0.4.14"
xous-pio = {path = "../../libs/xous-pio", optional = true}
xous-pl230 = {path = "../../libs/xous-pl230", optional = true}

View file

@ -7,10 +7,10 @@ edition = "2021"
[dependencies]
utralib = {version = "0.1.23", optional = true, default-features = false }
xous-api-names = "0.9.48"
xous-api-ticktimer = "0.9.46"
xous = "0.9.50"
log-server = {package = "xous-api-log", version = "0.1.46"}
xous-api-names = "0.9.49"
xous-api-ticktimer = "0.9.47"
xous = "0.9.51"
log-server = {package = "xous-api-log", version = "0.1.47"}
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -7,10 +7,10 @@ edition = "2021"
[dependencies]
utralib = {version = "0.1.23", optional = true, default-features = false }
xous-api-names = "0.9.48"
xous-api-ticktimer = "0.9.46"
xous = "0.9.50"
log-server = {package = "xous-api-log", version = "0.1.46"}
xous-api-names = "0.9.49"
xous-api-ticktimer = "0.9.47"
xous = "0.9.51"
log-server = {package = "xous-api-log", version = "0.1.47"}
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -7,15 +7,15 @@ description = "Xous DNS resolver"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
xous = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
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 = "0.9.50"
xous-ipc = "0.9.51"
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
trng = {path = "../trng"}
@ -28,7 +28,7 @@ chrono = {version = "0.4.19", default-features = false, features = ["std"]}
sntpc = {version = "0.3.1"} #, features = ["log"]
locales = {path = "../../locales"}
gam = {path = "../gam"}
susres = {package = "xous-api-susres", version = "0.9.46"}
susres = {package = "xous-api-susres", version = "0.9.47"}
userprefs = {path = "../../libs/userprefs"}
modals = {path = "../modals"}

View file

@ -8,12 +8,12 @@ edition = "2021"
[dependencies]
log = {version = "0.4", features = ["max_level_trace", "release_max_level_trace"]}
log-server = {package = "xous-api-log", version = "0.1.46"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.46"}
xous = "0.9.50"
xous-ipc = "0.9.50"
xous-names = {package = "xous-api-names", version = "0.9.48"}
susres = {package = "xous-api-susres", version = "0.9.46"}
log-server = {package = "xous-api-log", version = "0.1.47"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.47"}
xous = "0.9.51"
xous-ipc = "0.9.51"
xous-names = {package = "xous-api-names", version = "0.9.49"}
susres = {package = "xous-api-susres", version = "0.9.47"}
spinor = {path = "../../services/spinor"}
num-derive = {version = "0.3.3", default-features = false}

View file

@ -7,16 +7,16 @@ description = "Curve25519 Engine"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
xous = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
log = "0.4.14"
susres = {package = "xous-api-susres", version = "0.9.46"}
susres = {package = "xous-api-susres", version = "0.9.47"}
llio = {path = "../llio"} # temporary for testing some power stuff
utralib = { version = "0.1.23", optional = true, default-features = false }
xous-ipc = "0.9.50"
xous-ipc = "0.9.51"
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 = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
xous = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
log = "0.4.14"
susres = {package = "xous-api-susres", version = "0.9.46"}
susres = {package = "xous-api-susres", version = "0.9.47"}
trng = { path = "../trng" }
xous-ipc = "0.9.50"
xous-ipc = "0.9.51"
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,14 +7,14 @@ description = "FFI test integration"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
xous = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
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", version = "0.9.46"}
susres = {package = "xous-api-susres", version = "0.9.47"}
ffi-sys = {path = "sys"}
keyboard = {path = "../keyboard"}

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", version = "0.1.46"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.46"}
log-server = {package = "xous-api-log", version = "0.1.47"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.47"}
trng = {path = "../trng"}
xous = "0.9.50"
xous-ipc = "0.9.50"
xous-names = {package = "xous-api-names", version = "0.9.48"}
xous = "0.9.51"
xous-ipc = "0.9.51"
xous-names = {package = "xous-api-names", version = "0.9.49"}
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", version = "0.9.46"} # used for the sleep now menu item
susres = {package = "xous-api-susres", version = "0.9.47"} # 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"}

View file

@ -9,14 +9,14 @@ version = "0.1.0"
[dependencies]
keyboard = {path = "../keyboard"}
log = "0.4.14"
log-server = {package = "xous-api-log", version = "0.1.46"}
xous = "0.9.50"
susres = {package = "xous-api-susres", version = "0.9.46"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.46"}
log-server = {package = "xous-api-log", version = "0.1.47"}
xous = "0.9.51"
susres = {package = "xous-api-susres", version = "0.9.47"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.47"}
locales = {path = "../../locales"}
xous-ipc = "0.9.50"
xous-names = {package = "xous-api-names", version = "0.9.48"}
xous-ipc = "0.9.51"
xous-names = {package = "xous-api-names", version = "0.9.49"}
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

@ -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", version = "0.1.46"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.46"}
xous = "0.9.50"
log-server = {package = "xous-api-log", version = "0.1.47"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.47"}
xous = "0.9.51"
locales = {path = "../../locales"}
xous-ipc = "0.9.50"
xous-names = {package = "xous-api-names", version = "0.9.48"}
xous-ipc = "0.9.51"
xous-names = {package = "xous-api-names", version = "0.9.49"}
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

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 = "0.9.50"
xous-ipc = "0.9.50"
xous-names = {package = "xous-api-names", version = "0.9.48"}# used by the IMEF for registering listeners
xous = "0.9.51"
xous-ipc = "0.9.51"
xous-names = {package = "xous-api-names", version = "0.9.49"}# 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,11 +9,11 @@ version = "0.1.0"
[dependencies]
ime-plugin-api = {path = "../ime-plugin-api"}
log = "0.4.14"
log-server = {package = "xous-api-log", version = "0.1.46"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.46"}
xous = "0.9.50"
xous-ipc = "0.9.50"
xous-names = {package = "xous-api-names", version = "0.9.48"}
log-server = {package = "xous-api-log", version = "0.1.47"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.47"}
xous = "0.9.51"
xous-ipc = "0.9.51"
xous-names = {package = "xous-api-names", version = "0.9.49"}
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

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", version = "0.1.46"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.46"}
xous = "0.9.50"
xous-ipc = "0.9.50"
xous-names = {package = "xous-api-names", version = "0.9.48"}
log-server = {package = "xous-api-log", version = "0.1.47"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.47"}
xous = "0.9.51"
xous-ipc = "0.9.51"
xous-names = {package = "xous-api-names", version = "0.9.49"}
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -7,16 +7,16 @@ description = "JTAG port server"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
xous = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
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", version = "0.9.46"}
susres = {package = "xous-api-susres", version = "0.9.47"}
xous-ipc = "0.9.50"
xous-ipc = "0.9.51"
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
utralib = { version = "0.1.23", optional = true, default-features = false }

View file

@ -7,9 +7,9 @@ description = "Program to test various aspects of the kernel"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.46" }
xous = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
log = "0.4.14"
utralib = { version = "0.1.23", optional = true, default-features = false }

View file

@ -8,13 +8,13 @@ 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", version = "0.1.46"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.46"}
xous = "0.9.50"
xous-ipc = "0.9.50"
xous-names = {package = "xous-api-names", version = "0.9.48"}
log-server = {package = "xous-api-log", version = "0.1.47"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.47"}
xous = "0.9.51"
xous-ipc = "0.9.51"
xous-names = {package = "xous-api-names", version = "0.9.49"}
llio = {path = "../llio"}
susres = {package = "xous-api-susres", version = "0.9.46"}
susres = {package = "xous-api-susres", version = "0.9.47"}
spinor = {path = "../spinor"}
num-derive = {version = "0.3.3", default-features = false}

View file

@ -7,10 +7,10 @@ description = "libstd test stub"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
xous = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

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", version = "0.1.46"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.46"}
xous = "0.9.50"
xous-ipc = "0.9.50"
xous-names = {package = "xous-api-names", version = "0.9.48"}
susres = {package = "xous-api-susres", version = "0.9.46"}
log-server = {package = "xous-api-log", version = "0.1.47"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.47"}
xous = "0.9.51"
xous-ipc = "0.9.51"
xous-names = {package = "xous-api-names", version = "0.9.49"}
susres = {package = "xous-api-susres", version = "0.9.47"}
# RTC dependencies
bitflags = "1.2.1"

View file

@ -7,7 +7,7 @@ version = "0.1.0"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.50"
xous = "0.9.51"
[features]
default = []

View file

@ -7,14 +7,14 @@ description = "Ux modals server"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
xous = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
xous-ipc = "0.9.50"
xous-ipc = "0.9.51"
rkyv = {version = "0.4.3", features = ["const_generics"], default-features = false}
gam = {path="../gam"}
trng = {path="../trng"}

View file

@ -7,15 +7,15 @@ description = "Network middleware"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.50"
xous-ipc = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
xous = "0.9.51"
xous-ipc = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
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", version = "0.9.46"}
susres = {package = "xous-api-susres", version = "0.9.47"}
#rkyv = "0.7.18"
rkyv = {version = "0.4.3", features = ["const_generics"], default-features = false}
llio = {path = "../llio"}

View file

@ -8,12 +8,12 @@ description = "Plausibly Deniable Database"
# Dependency versions enforced by Cargo.lock.
[dependencies]
bitflags = {version = "1"}
xous = "0.9.50"
xous-ipc = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
susres = {package = "xous-api-susres", version = "0.9.46"}
xous = "0.9.51"
xous-ipc = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
susres = {package = "xous-api-susres", version = "0.9.47"}
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -7,12 +7,12 @@ description = "Xous root keys server"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
xous = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
log = "0.4.14"
susres = {package = "xous-api-susres", version = "0.9.46"}
susres = {package = "xous-api-susres", version = "0.9.47"}
trng = {path= "../trng"}
spinor = {path="../spinor"}
llio = {path="../llio"}
@ -20,7 +20,7 @@ com = {path="../com"}
xous-semver = "0.1.2"
utralib = { version = "0.1.23", optional = true, default-features = false }
xous-ipc = "0.9.50"
xous-ipc = "0.9.51"
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", version = "0.1.46"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.46"}
xous = "0.9.50"
xous-ipc = "0.9.50"
xous-names = {package = "xous-api-names", version = "0.9.48"}
log-server = {package = "xous-api-log", version = "0.1.47"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.47"}
xous = "0.9.51"
xous-ipc = "0.9.51"
xous-names = {package = "xous-api-names", version = "0.9.49"}
keyboard = {path = "../keyboard"}
susres = {package = "xous-api-susres", version = "0.9.46"}
susres = {package = "xous-api-susres", version = "0.9.47"}
codec = {path = "../codec"}
#engine-sha512 = {path="../engine-sha512"}
sha2 = {path="../engine-sha512"}

View file

@ -7,14 +7,14 @@ description = "Audio CODEC server"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
xous = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
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", version = "0.9.46"}
susres = {package = "xous-api-susres", version = "0.9.47"}
utralib = { version = "0.1.23", optional = true, default-features = false }

View file

@ -7,18 +7,18 @@ description = "SPINOR ROM operations server"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
xous = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
log = "0.4.14"
susres = {package = "xous-api-susres", version = "0.9.46"}
susres = {package = "xous-api-susres", version = "0.9.47"}
trng = { path = "../trng" }
com = { path = "../com" }
llio = { path = "../llio" }
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
xous-ipc = "0.9.50"
xous-ipc = "0.9.51"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

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", version = "0.1.46"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.46"}
log-server = {package = "xous-api-log", version = "0.1.47"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.47"}
trng = {path = "../trng"}
llio = {path = "../llio"}
xous = "0.9.50"
xous-ipc = "0.9.50"
xous-names = {package = "xous-api-names", version = "0.9.48"}
xous = "0.9.51"
xous-ipc = "0.9.51"
xous-names = {package = "xous-api-names", version = "0.9.49"}
graphics-server = {path = "../graphics-server"}
gam = {path = "../gam"}
locales = {path = "../../locales"}
susres = {package = "xous-api-susres", version = "0.9.46"}
susres = {package = "xous-api-susres", version = "0.9.47"}
root-keys = {path = "../root-keys"}
modals = {path = "../modals"}
pddb = {path = "../pddb"}

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 = "0.9.50"
xous = "0.9.51"

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 = "0.9.50"
xous = "0.9.51"

View file

@ -7,9 +7,9 @@ version = "0.1.0"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.50"
xous = "0.9.51"
log = "0.4.14"
log-server = {package = "xous-api-log", version = "0.1.46"}
log-server = {package = "xous-api-log", version = "0.1.47"}
[features]
default = []

View file

@ -7,16 +7,16 @@ description = "TRNG server"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
xous = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
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", version = "0.9.46"}
susres = {package = "xous-api-susres", version = "0.9.47"}
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
xous-ipc = "0.9.50"
xous-ipc = "0.9.51"
rand_core = "0.5.1" # the 0.5.1 API is necessary for compatibility with curve25519-dalek crates
utralib = { version = "0.1.23", optional = true, default-features = false }

View file

@ -7,11 +7,11 @@ description = "Text to speech integration server"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.50"
xous-ipc = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
xous = "0.9.51"
xous-ipc = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}

View file

@ -7,17 +7,17 @@ description = "Xous USB device drivers"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.50"
xous-ipc = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
xous = "0.9.51"
xous-ipc = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
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", version = "0.9.46"}
susres = {package = "xous-api-susres", version = "0.9.47"}
modals = {path = "../modals"}
keyboard = {path = "../keyboard", features=["inject-api"]}
bitfield = "0.13.2"

View file

@ -7,14 +7,14 @@ description = "USB test & development stub"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.50"
log-server = { package = "xous-api-log", version = "0.1.46" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.46" }
xous-names = { package = "xous-api-names", version = "0.9.48" }
xous = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.47" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
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", version = "0.9.46"}
susres = {package = "xous-api-susres", version = "0.9.47"}
keyboard = {path = "../keyboard"}
bitfield = "0.13.2"
vcell = "0.1.3"

View file

@ -10,9 +10,9 @@ homepage = "https://betrusted.io/xous-book/"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous-api-log = {package = "xous-api-log", version = "0.1.46"}
xous = "0.9.50"
xous-ipc = "0.9.50"
xous-api-log = {package = "xous-api-log", version = "0.1.47"}
xous = "0.9.51"
xous-ipc = "0.9.51"
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
@ -24,7 +24,7 @@ rkyv = {version = "0.4.3", default-features = false, features = ["const_generics
[target.'cfg(target_arch = "arm")'.dependencies]
atsama5d27 = { git = "https://github.com/Foundation-Devices/atsama5d27.git", branch = "master", features = ["lcd-console"]}
xous = { version = "0.9.50", features = ["v2p"] } # v2p feature is used when lcd-console feature is turned on
xous = { version = "0.9.51", features = ["v2p"] } # v2p feature is used when lcd-console feature is turned on
[features]
cramium-soc = ["utralib/cramium-soc"]

View file

@ -43,11 +43,21 @@ impl Uart {
#[cfg(feature="cramium-soc")]
impl Uart {
pub fn putc(&self, c: u8) {
assert!(unsafe { DEFAULT_UART_ADDR } as usize != 0);
let mut uart_csr = CSR::new(unsafe { DEFAULT_UART_ADDR as *mut u32 });
while uart_csr.r(utra::duart::SFR_SR) != 0 {}
uart_csr.wo(utra::duart::SFR_TXD, c as u32);
let mut uart_csr = CSR::new(unsafe { crate::platform::debug::DEFAULT_UART_ADDR as *mut u32 });
// enqueue our character to send via DMA
unsafe {
if crate::implementation::UART_DMA_BUF as usize != 0 {
crate::implementation::UART_DMA_BUF.write_volatile(c); // write to the virtual memory address
}
}
// configure the DMA
uart_csr.wo(utra::udma_uart_0::REG_TX_SADDR, utralib::HW_IFRAM0_MEM as u32); // source is the physical address
uart_csr.wo(utra::udma_uart_0::REG_TX_SIZE, 1);
// send it
uart_csr.wo(utra::udma_uart_0::REG_TX_CFG, 0x10); // EN
// wait for it all to be done
while uart_csr.rf(utra::udma_uart_0::REG_TX_CFG_R_TX_EN) != 0 { }
while (uart_csr.r(utra::udma_uart_0::REG_STATUS) & 1) != 0 { }
}
}

View file

@ -3,6 +3,9 @@ use utralib::generated::*;
pub struct Output {}
#[cfg(feature="cramium-soc")]
pub static mut UART_DMA_BUF: *mut u8 = 0x0000_0000 as *mut u8;
pub fn init() -> Output {
#[cfg(feature="cramium-fpga")]
let uart = xous::syscall::map_memory(
@ -15,7 +18,7 @@ pub fn init() -> Output {
// TODO: migrate this to a "proper" UART that is available on SoC hardware, but for now all we have access to is the DUART.
#[cfg(feature="cramium-soc")]
let uart = xous::syscall::map_memory(
xous::MemoryAddress::new(utra::duart::HW_DUART_BASE),
xous::MemoryAddress::new(utra::udma_uart_0::HW_UDMA_UART_0_BASE),
None,
4096,
xous::MemoryFlags::R | xous::MemoryFlags::W,
@ -25,6 +28,76 @@ pub fn init() -> Output {
println!("Mapped UART @ {:08x}", uart.as_ptr() as usize);
println!("Process: map success!");
#[cfg(feature="cramium-soc")]
{
// TODO: need to write an allocator for the UDMA memory region as well
let tx_buf_region = xous::syscall::map_memory(
xous::MemoryAddress::new(utralib::HW_IFRAM0_MEM),
None,
4096,
xous::MemoryFlags::R | xous::MemoryFlags::W,
)
.expect("couldn't map UDMA buffer");
unsafe { UART_DMA_BUF = tx_buf_region.as_mut_ptr() as *mut u8 };
/*
// TODO: migrate this to an allocator that can handle all IOs
let iox_buf = xous::syscall::map_memory(
xous::MemoryAddress::new(utra::iox::HW_IOX_BASE),
None,
4096,
xous::MemoryFlags::R | xous::MemoryFlags::W,
)
.expect("couldn't map iox buffer");
let udma_ctrl = xous::syscall::map_memory(
xous::MemoryAddress::new(utra::udma_ctrl::HW_UDMA_CTRL_BASE),
None,
4096,
xous::MemoryFlags::R | xous::MemoryFlags::W,
)
.expect("couldn't map UDMA control");
let iox_csr = iox_buf.as_mut_ptr() as *mut u32;
unsafe {
iox_csr.add(0).write_volatile(0b00_00_00_01_01_00_00_00); // PAL AF1 on PA3/PA4
iox_csr.add(0x1c / core::mem::size_of::<u32>()).write_volatile(0x1400); // PDH
iox_csr.add(0x148 / core::mem::size_of::<u32>()).write_volatile(0x10); // PA4 output
iox_csr.add(0x148 / core::mem::size_of::<u32>() + 3).write_volatile(0xffff); // PD
iox_csr.add(0x160 / core::mem::size_of::<u32>()).write_volatile(0x8); // PA3 pullup
}
let mut udma_ctrl = CSR::new(udma_ctrl.as_mut_ptr() as _);
// ungate the clock for the UART. TODO: send this to a power management common server...
// probably should be in the same server that allocates UDMA buffers.
udma_ctrl.wo(utra::udma_ctrl::REG_CG, 1);
// setup the baud rate
let mut uart_csr = CSR::new(uart.as_mut_ptr() as *mut u32);
let baudrate: u32 = 115200;
let freq: u32 = 100_000_000;
let clk_counter: u32 = (freq + baudrate / 2) / baudrate;
uart_csr.wo(utra::udma_uart_0::REG_UART_SETUP,
0x0306 | (clk_counter << 16)
); */
// rely on the bootloader to set up all the above params
/* // for debug: send a test string to confirm everything is configured correctly
let tx_buf = tx_buf_region.as_mut_ptr() as *mut u8;
for i in 0..16 {
unsafe { tx_buf.add(i).write_volatile('M' as u32 as u8 + i as u8) };
}
let mut udma_uart = CSR::new(uart.as_mut_ptr() as *mut u32);
udma_uart.wo(utra::udma_uart_0::REG_TX_SADDR, tx_buf as u32);
udma_uart.wo(utra::udma_uart_0::REG_TX_SIZE, 16);
// send it
udma_uart.wo(utra::udma_uart_0::REG_TX_CFG, 0x10); // EN
// wait for it all to be done
while udma_uart.rf(utra::udma_uart_0::REG_TX_CFG_R_TX_EN) != 0 { }
while (udma_uart.r(utra::udma_uart_0::REG_STATUS) & 1) != 0 { }
*/
}
#[cfg(feature="inject")]
{
let inject_mem = xous::syscall::map_memory(
@ -117,14 +190,20 @@ impl OutputWriter {
#[cfg(feature="cramium-soc")]
{
let mut uart_csr = CSR::new(unsafe { crate::platform::debug::DEFAULT_UART_ADDR as *mut u32 });
while uart_csr.r(utra::duart::SFR_SR) != 0 {}
uart_csr.wo(utra::duart::SFR_TXD, c as u32);
// there's a race condition in the handler, if a new character comes in while handling the interrupt,
// the pending bit never clears. If the console seems to freeze, uncomment this line.
// This kind of works around that, at the expense of maybe losing some Rx characters.
// uart_csr.wfo(utra::uart::EV_PENDING_RX, 1);
// enqueue our character to send via DMA
unsafe {
if UART_DMA_BUF as usize != 0 {
UART_DMA_BUF.write_volatile(c); // write to the virtual memory address
}
}
// configure the DMA
uart_csr.wo(utra::udma_uart_0::REG_TX_SADDR, utralib::HW_IFRAM0_MEM as u32); // source is the physical address
uart_csr.wo(utra::udma_uart_0::REG_TX_SIZE, 1);
// send it
uart_csr.wo(utra::udma_uart_0::REG_TX_CFG, 0x10); // EN
// wait for it all to be done
while uart_csr.rf(utra::udma_uart_0::REG_TX_CFG_R_TX_EN) != 0 { }
while (uart_csr.r(utra::udma_uart_0::REG_STATUS) & 1) != 0 { }
}
}
@ -132,10 +211,49 @@ impl OutputWriter {
/// bytes written. This is mostly compatible with `std::io::Write`,
/// except it is infallible.
pub fn write(&mut self, buf: &[u8]) -> usize {
for c in buf {
self.putc(*c);
#[cfg(feature="cramium-soc")]
{
// write the whole buffer via DMA, and then idle with yield_slice() for better
// concurrency (as opposed to character-by-character polling).
let mut uart_csr = CSR::new(unsafe { crate::platform::debug::DEFAULT_UART_ADDR as *mut u32 });
// enqueue our character to send via DMA
unsafe {
if UART_DMA_BUF as usize != 0 {
// convert the raw pointer to a 4k buffer region. This is "by fiat", we don't
// have a formal allocator for this region yet
let dest_buf = core::slice::from_raw_parts_mut(UART_DMA_BUF as *mut u8, 4096);
// copy the whole buf to the destination
for (&s, d) in buf.iter().zip(dest_buf.iter_mut()) {
*d = s;
}
}
}
// configure the DMA
uart_csr.wo(utra::udma_uart_0::REG_TX_SADDR, utralib::HW_IFRAM0_MEM as u32); // source is the physical address
let writelen = buf.len().min(4096); // we will send the smaller of the buffer length or the maximum size of the DMA page
uart_csr.wo(utra::udma_uart_0::REG_TX_SIZE, writelen as u32);
// send it
uart_csr.wo(utra::udma_uart_0::REG_TX_CFG, 0x10); // EN
// wait for it all to be done
while uart_csr.rf(utra::udma_uart_0::REG_TX_CFG_R_TX_EN) != 0 {
// this should complete quickly because we're just ensuring nothing is already in progress
}
while (uart_csr.r(utra::udma_uart_0::REG_STATUS) & 1) != 0 {
// this takes a bit longer; yield the time because we expect the average
// time to send to be around 0.25ms or so, so this is worth it.
xous::yield_slice();
}
writelen
}
#[cfg(feature="cramium-fpga")]
{
for c in buf {
self.putc(*c)
}
buf.len()
}
buf.len()
}
pub fn write_all(&mut self, buf: &[u8]) -> core::result::Result<usize, ()> {

View file

@ -10,10 +10,10 @@ homepage = "https://betrusted.io/"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous-api-names = "0.9.48"
log-server = {package = "xous-api-log", version = "0.1.46"}
xous = "0.9.50"
xous-ipc = "0.9.50"
xous-api-names = "0.9.49"
log-server = {package = "xous-api-log", version = "0.1.47"}
xous = "0.9.51"
xous-ipc = "0.9.51"
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,11 +10,11 @@ homepage = "https://betrusted.io/xous-book/"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous-api-susres = "0.9.46"
xous-names = { package = "xous-api-names", version = "0.9.48" }
log-server = { package = "xous-api-log", version = "0.1.46" }
xous = "0.9.50"
xous-ipc = "0.9.50"
xous-api-susres = "0.9.47"
xous-names = { package = "xous-api-names", version = "0.9.49" }
log-server = { package = "xous-api-log", version = "0.1.47" }
xous = "0.9.51"
xous-ipc = "0.9.51"
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}

View file

@ -10,12 +10,12 @@ homepage = "https://betrusted.io/xous-book/"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous-api-ticktimer = "0.9.46"
xous = "0.9.50"
xous-ipc = "0.9.50"
xous-names = {package = "xous-api-names", version = "0.9.48"}
log-server = {package = "xous-api-log", version = "0.1.46"}
susres = {package = "xous-api-susres", version = "0.9.46"}
xous-api-ticktimer = "0.9.47"
xous = "0.9.51"
xous-ipc = "0.9.51"
xous-names = {package = "xous-api-names", version = "0.9.49"}
log-server = {package = "xous-api-log", version = "0.1.47"}
susres = {package = "xous-api-susres", version = "0.9.47"}
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

@ -7,7 +7,7 @@ description = "Performance counter tooling"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.50"
xous = "0.9.51"
log = "0.4.14"
utralib = { version = "0.1.23", default-features = false }

View file

@ -3,7 +3,7 @@
<device schemaVersion="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="CMSIS-SVD.xsd" >
<vendor>litex</vendor>
<name>SOC</name>
<description><![CDATA[Litex SoC 2023-08-11 22:59:46]]></description>
<description><![CDATA[Litex SoC 2023-08-20 16:58:47]]></description>
<addressUnitBits>8</addressUnitBits>
<width>32</width>

View file

@ -3,7 +3,7 @@
<device schemaVersion="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="CMSIS-SVD.xsd" >
<vendor>litex</vendor>
<name>SOC</name>
<description><![CDATA[Litex SoC 2023-08-11 22:59:48]]></description>
<description><![CDATA[Litex SoC 2023-08-20 16:58:49]]></description>
<addressUnitBits>8</addressUnitBits>
<width>32</width>

View file

@ -4,12 +4,12 @@ description = "System call interface for Xous"
edition = "2018"
license = "MIT OR Apache-2.0"
name = "xous-ipc"
version = "0.9.50"
version = "0.9.51"
repository = "https://github.com/betrusted-io/xous-core/"
homepage = "https://betrusted.io/"
# Dependency versions enforced by Cargo.lock.
[dependencies]
xous = "0.9.50"
xous = "0.9.51"
bitflags = {version = "1"}
rkyv = {version = "0.4.3", features = ["const_generics"], default-features = false}

View file

@ -1,6 +1,6 @@
[package]
name = "xous"
version = "0.9.50"
version = "0.9.51"
authors = ["Sean Cross <sean@xobs.io>"]
edition = "2021"
license = "MIT OR Apache-2.0"

View file

@ -12,12 +12,12 @@ pub fn check_project_consistency() -> Result<(), DynError> {
// TODO: retire utralib/svd2utra from publication as well
let check_pkgs = [
// this set updates with kernel API changes
"xous@0.9.50",
"xous-ipc@0.9.50",
"xous-api-log@0.1.46",
"xous-api-names@0.9.48",
"xous-api-susres@0.9.46",
"xous-api-ticktimer@0.9.46",
"xous@0.9.51",
"xous-ipc@0.9.51",
"xous-api-log@0.1.47",
"xous-api-names@0.9.49",
"xous-api-susres@0.9.47",
"xous-api-ticktimer@0.9.47",
];
// utra/svd2utra changes are downgraded to warnings because these now prefer to pull
// from the local patch version, so any inconsistency simply indicates we forgot to