From 2ba77894bd641998d1cd9c3ba5b1256daa311a02 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 4 Jul 2023 11:19:12 +0800 Subject: [PATCH] it helps to test against the local copy :P --- Cargo.lock | 231 ++++++++++++++++------------------ xous-rs/build.rs | 9 -- xous-rs/src/arch/riscv/asm.S | 25 ---- xous-rs/src/arch/riscv/mod.rs | 6 +- 4 files changed, 112 insertions(+), 159 deletions(-) delete mode 100644 xous-rs/src/arch/riscv/asm.S diff --git a/Cargo.lock b/Cargo.lock index 7b492ff2a..11bdcc22f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -74,7 +74,7 @@ dependencies = [ "aes 0.8.1", "hex-literal", "log", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", ] @@ -249,11 +249,11 @@ dependencies = [ "num-derive", "num-traits", "trng", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -640,12 +640,12 @@ dependencies = [ "rkyv", "trng", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -661,12 +661,12 @@ dependencies = [ "trng", "typenum", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -718,7 +718,7 @@ dependencies = [ "graphics-server", "log", "rkyv", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-names", ] @@ -1223,12 +1223,12 @@ dependencies = [ "trng", "userprefs", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1248,12 +1248,12 @@ dependencies = [ "rkyv", "spinor", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1394,12 +1394,12 @@ dependencies = [ "num-traits", "rkyv", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1511,7 +1511,7 @@ dependencies = [ "num-derive", "num-traits", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", @@ -1729,12 +1729,12 @@ dependencies = [ "trng", "tts-frontend", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1795,9 +1795,9 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", "wasm-bindgen", "wasm-bindgen-test", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-names", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1830,12 +1830,12 @@ dependencies = [ "num-traits", "rkyv", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1920,10 +1920,10 @@ dependencies = [ "num-derive", "num-traits", "tts-frontend", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2057,11 +2057,11 @@ dependencies = [ "rkyv", "tts-frontend", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2073,9 +2073,9 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-names", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2088,11 +2088,11 @@ dependencies = [ "num-traits", "rkyv", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2107,11 +2107,11 @@ dependencies = [ "rkyv", "tts-frontend", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2206,12 +2206,12 @@ dependencies = [ "num-traits", "rkyv", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2226,7 +2226,7 @@ version = "0.1.0" dependencies = [ "log", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-ticktimer", ] @@ -2243,12 +2243,12 @@ dependencies = [ "rkyv", "spinor", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2293,7 +2293,7 @@ dependencies = [ "num-derive", "num-traits", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-ticktimer", @@ -2311,12 +2311,12 @@ dependencies = [ "num-traits", "rkyv", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -2474,11 +2474,11 @@ dependencies = [ "trng", "tts-frontend", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2505,11 +2505,11 @@ dependencies = [ "status", "trng", "ureq", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2545,12 +2545,12 @@ dependencies = [ "smoltcp", "trng", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -2907,12 +2907,12 @@ dependencies = [ "trng", "tts-frontend", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", "zeroize", "zeroize_derive", ] @@ -2940,7 +2940,7 @@ version = "0.1.0" dependencies = [ "log", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", ] [[package]] @@ -3408,11 +3408,11 @@ dependencies = [ "num-derive", "num-traits", "trng", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3450,9 +3450,9 @@ dependencies = [ "spin 0.5.2", "untrusted", "winapi", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-names", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3534,12 +3534,12 @@ dependencies = [ "tts-frontend", "usb-device-xous", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", "zeroize", ] @@ -3851,12 +3851,12 @@ dependencies = [ "rkyv", "trng", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3945,12 +3945,12 @@ dependencies = [ "usb-device-xous", "utralib", "x25519-dalek", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4026,12 +4026,12 @@ dependencies = [ "rkyv", "trng", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4087,12 +4087,12 @@ dependencies = [ "usb-device-xous", "userprefs", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -4259,7 +4259,7 @@ name = "ticktimer-test-client" version = "0.1.0" dependencies = [ "log", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", ] @@ -4344,11 +4344,11 @@ dependencies = [ "sha2 0.9.8", "webpki-roots 0.23.1", "x509-parser", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4461,10 +4461,10 @@ dependencies = [ "num-derive", "num-traits", "usb-device-xous", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4479,12 +4479,12 @@ dependencies = [ "rand_core 0.5.1", "rkyv", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4497,11 +4497,11 @@ dependencies = [ "num-traits", "rkyv", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", "xous-tts-backend", ] @@ -4663,12 +4663,12 @@ dependencies = [ "usbd_scsi 0.1.1", "utralib", "vcell", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -4688,7 +4688,7 @@ dependencies = [ "usbd-human-interface-device 0.1.1", "utralib", "vcell", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", @@ -4751,7 +4751,7 @@ dependencies = [ "typenum", "usb-device", "usbd_mass_storage 0.1.0", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-ticktimer", ] @@ -4825,7 +4825,7 @@ dependencies = [ "usb-device", "usbd_bulk_only_transport 0.1.0", "usbd_mass_storage 0.1.0", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-ticktimer", ] @@ -4907,12 +4907,12 @@ dependencies = [ "usbd-human-interface-device 0.2.1", "userprefs", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5389,103 +5389,94 @@ checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" [[package]] name = "xous" -version = "0.9.45" +version = "0.9.46" dependencies = [ "compiler_builtins", "lazy_static", "rustc-std-workspace-core", ] -[[package]] -name = "xous" -version = "0.9.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648387c0ac9e051154d7b9fa56ce5845bffa576387ed2b18a3b5977341c77982" -dependencies = [ - "lazy_static", -] - [[package]] name = "xous-api-log" -version = "0.1.41" +version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24aad5ecdee87526a97eaaa7f26d22c0fe419667727598d694bda183dfa31847" +checksum = "bed3fa0ae6816dc116d0215e73268448d06fddd71bb10b362eeb2166120b8e71" dependencies = [ "log", "num-derive", "num-traits", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "xous-api-names" -version = "0.9.43" +version = "0.9.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92baa5a52f91e40d015a53db1891c66ee7c715b22d1e9731a6fb29e3d9df1061" +checksum = "ee70e50ba7f5538a30d1e20784f5a682f43a8c420e6ed4eb2414a71373555156" dependencies = [ "log", "num-derive", "num-traits", "rkyv", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "xous-api-susres" -version = "0.9.41" +version = "0.9.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5324cd9fbea0a18bae2bd706c2f2f4abdc8fd9bacd6338bd4ef24dccfba5b814" +checksum = "1ebd4c67694257d3c505eaddeba80b14316ed5960e50972a48e5435b3d018f0f" dependencies = [ "log", "num-derive", "num-traits", "rkyv", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "xous-api-ticktimer" -version = "0.9.41" +version = "0.9.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eec5426d66ac219ace8e787b8f1c0f844dbea19f941b81061366b6f89e34d6b" +checksum = "96512cc01d0abc7171297e0cd1fd5dca431ac7f51f8a927fb1c272abc811bf8c" dependencies = [ "log", "num-derive", "num-traits", "rkyv", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] [[package]] name = "xous-ipc" -version = "0.9.45" +version = "0.9.46" dependencies = [ "bitflags", "rkyv", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", ] [[package]] name = "xous-ipc" -version = "0.9.45" +version = "0.9.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510be937e654eeed0b60f627b4615e7a89e3cba88e20f1198ed16a87ea4b5fde" +checksum = "40800914aaa16e46bceec4ffd5fed0e4c5ca4a398dfdc0d2c9aeb8d99b59ac1a" dependencies = [ "bitflags", "rkyv", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", ] [[package]] @@ -5505,7 +5496,7 @@ dependencies = [ "rand_chacha 0.3.1", "stats_alloc", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-riscv", ] @@ -5519,9 +5510,9 @@ dependencies = [ "num-traits", "rkyv", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5533,10 +5524,10 @@ dependencies = [ "num-traits", "rkyv", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5564,11 +5555,11 @@ dependencies = [ "num-traits", "rkyv", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5581,12 +5572,12 @@ dependencies = [ "num-traits", "rkyv", "utralib", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-log", "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -5600,9 +5591,9 @@ dependencies = [ "num-derive", "num-traits", "rkyv", - "xous 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous", "xous-api-names", - "xous-ipc 0.9.45 (registry+https://github.com/rust-lang/crates.io-index)", + "xous-ipc 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/xous-rs/build.rs b/xous-rs/build.rs index d071d8c54..c2bce4fe2 100644 --- a/xous-rs/build.rs +++ b/xous-rs/build.rs @@ -1,12 +1,3 @@ -// NOTE: Adapted from cortex-m/build.rs -use std::env; -use std::fs; -use std::path::PathBuf; - fn main() { - let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap()); - let target = env::var("TARGET").unwrap(); - let name = env::var("CARGO_PKG_NAME").unwrap(); - println!("cargo:rerun-if-changed=build.rs"); } diff --git a/xous-rs/src/arch/riscv/asm.S b/xous-rs/src/arch/riscv/asm.S deleted file mode 100644 index a2ee4953f..000000000 --- a/xous-rs/src/arch/riscv/asm.S +++ /dev/null @@ -1,25 +0,0 @@ -#define STORE sw -#define LOAD lw -#define LOG_REGBYTES 2 -#define REGBYTES (1 << LOG_REGBYTES) - -.global _xous_syscall -.global _xous_syscall_rust -_xous_syscall_rust: -_xous_syscall: - ecall - lw t0, 0(sp) - sw a0, 0*REGBYTES(t0) - sw a1, 1*REGBYTES(t0) - sw a2, 2*REGBYTES(t0) - sw a3, 3*REGBYTES(t0) - sw a4, 4*REGBYTES(t0) - sw a5, 5*REGBYTES(t0) - sw a6, 6*REGBYTES(t0) - sw a7, 7*REGBYTES(t0) - ret - -.global riscv_cache_flush -riscv_cache_flush: - fence - ret diff --git a/xous-rs/src/arch/riscv/mod.rs b/xous-rs/src/arch/riscv/mod.rs index 1c0b0e748..14310a336 100644 --- a/xous-rs/src/arch/riscv/mod.rs +++ b/xous-rs/src/arch/riscv/mod.rs @@ -316,13 +316,9 @@ where }) } -extern "C" { - fn riscv_cache_flush(); -} - pub fn cache_flush() { unsafe { - asm!( + core::arch::asm!( "fence" ) };