Skip to content

Commit

Permalink
bump xous-rs crate to absorb Send derives on Messages
Browse files Browse the repository at this point in the history 
this is necessary for the smoltcp port
  • Loading branch information
@bunnie
bunnie committed Oct 3, 2023
1 parent 81a8720 commit 8325625
Show file tree
Hide file tree
Showing 69 changed files with 292 additions and 292 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ rev="4296c2e7904898766cf7d8d589759a129794783b" # use the commitref because we're
path = "./utralib"
[patch.crates-io.svd2utra]
path = "./svd2utra"
[patch.crates-io.xous]
path = "./xous-rs"
# [patch.crates-io.xous]
# path = "./xous-rs"
# [patch.crates-io.xous-ipc]
# path = "./xous-ipc"
# [patch.crates-io.xous-api-names]
Expand Down
6 changes: 3 additions & 3 deletions api/xous-api-log/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ authors = ["Sean Cross <[email protected]>"]
description = "Log server API"
edition = "2018"
name = "xous-api-log"
version = "0.1.47"
version = "0.1.48"
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.51"
xous-ipc = "0.9.51"
xous = "0.9.52"
xous-ipc = "0.9.52"
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
Expand Down
8 changes: 4 additions & 4 deletions api/xous-api-names/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ authors = ["bunnie <[email protected]>"]
description = "Xous microkernel OS inter-process name resolution server"
edition = "2018"
name = "xous-api-names"
version = "0.9.49"
version = "0.9.50"
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.47"}
xous = "0.9.51"
xous-ipc = "0.9.51"
log-server = {package = "xous-api-log", version = "0.1.48"}
xous = "0.9.52"
xous-ipc = "0.9.52"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
log = "0.4.14"
Expand Down
10 changes: 5 additions & 5 deletions api/xous-api-susres/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "xous-api-susres"
version = "0.9.47"
version = "0.9.48"
authors = ["bunnie <[email protected]>"]
edition = "2018"
description = "Manager of suspend/resume operations"
Expand All @@ -10,10 +10,10 @@ homepage = "https://betrusted.io/xous-book/"

# Dependency versions enforced by Cargo.lock.
[dependencies]
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" }
xous = "0.9.52"
xous-ipc = "0.9.52"
log-server = { package = "xous-api-log", version = "0.1.48" }
xous-names = { package = "xous-api-names", version = "0.9.50" }
log = "0.4.14"
num-derive = {version = "0.3.3", default-features = false}
num-traits = {version = "0.2.14", default-features = false}
Expand Down
12 changes: 6 additions & 6 deletions api/xous-api-ticktimer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ authors = ["bunnie <[email protected]>", "Sean Cross <[email protected]>"]
description = "Provide high-resolution, non-rollover system time"
edition = "2018"
name = "xous-api-ticktimer"
version = "0.9.47"
version = "0.9.48"
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.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"}
xous = "0.9.52"
xous-ipc = "0.9.52"
log-server = {package = "xous-api-log", version = "0.1.48"}
susres = {package = "xous-api-susres", version = "0.9.48"}
xous-names = {package = "xous-api-names", version = "0.9.50"}
log = "0.4.14"
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
num-derive = {version = "0.3.3", default-features = false}
Expand Down
10 changes: 5 additions & 5 deletions apps/ball/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.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" }
xous = "0.9.52"
xous-ipc = "0.9.52"
log-server = { package = "xous-api-log", version = "0.1.48" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.48" }
xous-names = { package = "xous-api-names", version = "0.9.50" }
gam = {path = "../../services/gam" }
trng = {path = "../../services/trng"}
modals = {path = "../../services/modals"}
Expand Down
8 changes: 4 additions & 4 deletions apps/hello/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.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" }
xous = "0.9.52"
xous-ipc = "0.9.52"
log-server = { package = "xous-api-log", version = "0.1.48" }
xous-names = { package = "xous-api-names", version = "0.9.50" }
gam = {path = "../../services/gam" }
graphics-server = {path = "../../services/graphics-server" }
locales = {path = "../../locales"}
Expand Down
10 changes: 5 additions & 5 deletions apps/mtxchat/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.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" }
xous = "0.9.52"
xous-ipc = "0.9.52"
log-server = { package = "xous-api-log", version = "0.1.48" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.48" }
xous-names = { package = "xous-api-names", version = "0.9.50" }
gam = { path = "../../services/gam" }
graphics-server = { path = "../../services/graphics-server" }
trng = { path = "../../services/trng"}
Expand Down
10 changes: 5 additions & 5 deletions apps/mtxcli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.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" }
xous = "0.9.52"
xous-ipc = "0.9.52"
log-server = { package = "xous-api-log", version = "0.1.48" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.48" }
xous-names = { package = "xous-api-names", version = "0.9.50" }
gam = { path = "../../services/gam" }
graphics-server = { path = "../../services/graphics-server" }
trng = { path = "../../services/trng"}
Expand Down
10 changes: 5 additions & 5 deletions apps/repl/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.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" }
xous = "0.9.52"
xous-ipc = "0.9.52"
log-server = { package = "xous-api-log", version = "0.1.48" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.48" }
xous-names = { package = "xous-api-names", version = "0.9.50" }
gam = {path = "../../services/gam" }
graphics-server = {path = "../../services/graphics-server" }
trng = {path = "../../services/trng"}
Expand Down
8 changes: 4 additions & 4 deletions apps/transientdisk/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.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" }
xous = "0.9.52"
xous-ipc = "0.9.52"
log-server = { package = "xous-api-log", version = "0.1.48" }
xous-names = { package = "xous-api-names", version = "0.9.50" }
gam = {path = "../../services/gam" }
graphics-server = {path = "../../services/graphics-server" }
usb-device-xous = {path="../../services/usb-device-xous"}
Expand Down
12 changes: 6 additions & 6 deletions apps/vault/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.51"
xous-ipc = "0.9.51"
xous = "0.9.52"
xous-ipc = "0.9.52"
rkyv = {version = "0.4.3", features = ["const_generics"], default-features = false}
log-server = { package = "xous-api-log", version = "0.1.47" }
xous-names = { package = "xous-api-names", version = "0.9.49" }
log-server = { package = "xous-api-log", version = "0.1.48" }
xous-names = { package = "xous-api-names", version = "0.9.50" }
gam = {path = "../../services/gam" }
graphics-server = {path = "../../services/graphics-server" }
locales = {path = "../../locales"}
Expand All @@ -21,15 +21,15 @@ 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.47"}
susres = {package = "xous-api-susres", version = "0.9.48"}
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"}
byteorder = { version = "1.4.3", default-features = false }
arrayref = "0.3.6"
subtle = { version = "2.5.0", features = ["core_hint_black_box"] }
rand_core = "0.6.3"
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.47"}
ticktimer-server = {package = "xous-api-ticktimer", version = "0.9.48"}
userprefs = {path = "../../libs/userprefs"}

# opensk
Expand Down
2 changes: 1 addition & 1 deletion apps/vault/libraries/crypto/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.49"}
xous-names = {package = "xous-api-names", version = "0.9.50"}
rand_core = "0.6.3"
p256 = {version = "0.10.1", default-features = false, features = ["ecdsa", "ecdh", "std"]}
cbc = "0.1.2"
Expand Down
6 changes: 3 additions & 3 deletions imports/getrandom/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.49"}
xous = "0.9.51"
xous-ipc = "0.9.51"
xous-names = {package = "xous-api-names", version = "0.9.50"}
xous = "0.9.52"
xous-ipc = "0.9.52"
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}


Expand Down
6 changes: 3 additions & 3 deletions kernel/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.51", features = [
xous-kernel = { package = "xous", version = "0.9.52", 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.51", features = [
xous-kernel = { package = "xous", version = "0.9.52", features = [
"forget-memory-messages",
"processes-as-threads",
] }
Expand All @@ -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.51", features = [
xous-kernel = { package = "xous", version = "0.9.52", features = [
"v2p",
] }
critical-section = "1.1.1"
Expand Down
10 changes: 5 additions & 5 deletions libs/chat/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ description = "Chat UI over pddb records"
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.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" }
xous = "0.9.52"
xous-ipc = "0.9.52"
log-server = { package = "xous-api-log", version = "0.1.48" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.48" }
xous-names = { package = "xous-api-names", version = "0.9.50" }
gam = {path = "../../services/gam" }
graphics-server = {path = "../../services/graphics-server" }
trng = {path = "../../services/trng"}
Expand Down
4 changes: 2 additions & 2 deletions libs/mass-storage/usbd_bulk_only_transport/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.51"
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
xous = "0.9.52"
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.48" }

[features]
4 changes: 2 additions & 2 deletions libs/mass-storage/usbd_scsi/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.51"
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.47" }
xous = "0.9.52"
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.48" }

[features]
10 changes: 5 additions & 5 deletions libs/tls/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.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" }
xous = "0.9.52"
xous-ipc = "0.9.52"
log-server = { package = "xous-api-log", version = "0.1.48" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.48" }
xous-names = { package = "xous-api-names", version = "0.9.50" }

modals = { path = "../../services/modals" }
net = { path = "../../services/net" }
Expand Down
2 changes: 1 addition & 1 deletion libs/userprefs/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"

[dependencies]
xous-names = {package = "xous-api-names", version = "0.9.49"}
xous-names = {package = "xous-api-names", version = "0.9.50"}
pddb = {path = "../../services/pddb"}
keyboard = {path = "../../services/keyboard"}
bincode = {version = "2.0.0-rc.2"}
Expand Down
2 changes: 1 addition & 1 deletion libs/xous-pio/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ defmt = {version ="0.3", optional = true}
utralib = {version = "0.1.23", default-features = false }

[target.'cfg(target_os = "xous")'.dependencies]
xous = "0.9.51"
xous = "0.9.52"

[features]
cramium-soc = ["utralib/cramium-soc"]
Expand Down
2 changes: 1 addition & 1 deletion libs/xous-pl230/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pio-proc = "0.2.2"
pio = "0.2.1"

[target.'cfg(target_os = "xous")'.dependencies]
xous = "0.9.51"
xous = "0.9.52"

[features]
cramium-soc = ["utralib/cramium-soc"]
Expand Down
4 changes: 2 additions & 2 deletions services/aes-test/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.47" }
xous = "0.9.51"
log-server = { package = "xous-api-log", version = "0.1.48" }
xous = "0.9.52"

[features]
default = []
Expand Down
12 changes: 6 additions & 6 deletions services/codec/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ description = "Audio CODEC server"

# Dependency versions enforced by Cargo.lock.
[dependencies]
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" }
xous = "0.9.52"
log-server = { package = "xous-api-log", version = "0.1.48" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.48" }
xous-names = { package = "xous-api-names", version = "0.9.50" }
log = "0.4.14"
susres = {package = "xous-api-susres", version = "0.9.47"}
susres = {package = "xous-api-susres", version = "0.9.48"}
llio = {path = "../llio"}
trng = {path = "../trng"}

xous-ipc = "0.9.51"
xous-ipc = "0.9.52"
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"]}
Expand Down
Loading

0 comments on commit 8325625

Please sign in to comment.