downgrade susres to a common api

doesn't make sense to push this to crates.io because it's not
common across all platforms, I think.
This commit is contained in:
bunnie 2026-01-28 00:36:05 +08:00
parent ece9b9943c
commit 45632385d5
28 changed files with 35 additions and 34 deletions

View file

@ -217,8 +217,6 @@ path = "./svd2utra"
# path = "./xous-ipc"
# [patch.crates-io.xous-api-names]
# path = "./api/xous-api-names"
# [patch.crates-io.xous-api-susres]
# path = "./api/xous-api-susres"
# [patch.crates-io.xous-api-log]
# path = "./api/xous-api-log"
# [patch.crates-io.xous-api-ticktimer]
@ -226,3 +224,5 @@ path = "./svd2utra"
# [patch.crates-io.xous-tts-backend]
# path = "../tts-backend"
# [patch.crates-io.xous-api-susres]
# path = "./api/xous-api-susres"

View file

@ -13,7 +13,6 @@ homepage = "https://betrusted.io/xous-book/"
xous = "0.9.69"
xous-ipc = "0.10.9"
log-server = { package = "xous-api-log", version = "0.1.68" }
susres = { package = "xous-api-susres", version = "0.9.68" }
xous-names = { package = "xous-api-names", version = "0.9.70" }
log = "0.4.14"
rkyv = { version = "0.8.8", default-features = false, features = [

View file

@ -60,6 +60,8 @@ sntpc = { version = "0.3.1" }
# net = { path = "../../services/net" }
# com_rs = { git = "https://github.com/betrusted-io/com_rs", rev = "891bdd3ca8e41f81510d112483e178aea3e3a921" }
# QR code encoding
base45 = "3.1.0"
[dev-dependencies]
enum-iterator = "0.6.0"

View file

@ -23,7 +23,7 @@ xous-usb-hid = { git = "https://github.com/betrusted-io/xous-usb-hid.git", branc
pddb = { path = "../../services/pddb" }
modals = { path = "../../services/modals" }
trng = { path = "../../services/trng" }
susres = { package = "xous-api-susres", version = "0.9.68" }
susres = { path = "../../api/xous-api-susres", package = "xous-api-susres" }
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" }

View file

@ -58,6 +58,7 @@ bytemuck = "1.24.0"
camera-ov2640 = []
camera-gc2145 = []
display-sh1107 = []
sensor-lis2dh12 = []
axp2101 = []
bmp180 = []
sigcheck = ["ed25519-dalek", "sha2-bao1x", "digest", "linked_list_allocator"]
@ -72,7 +73,7 @@ board-baosec = [
"ux-api/std",
] # USB form factor token
# "lite" variant of baosec. Shares the same basic flags but some things remapped when this is added.
oem-baosec-lite = []
oem-baosec-lite = ["sensor-lis2dh12"]
loader-baosec = [
"utralib/bao1x",

View file

@ -24,9 +24,12 @@ ux-api = { path = "../../libs/ux-api", optional = true }
pddb = { path = "../pddb", optional = true }
xous-swapper = { path = "../xous-swapper", optional = true }
bytemuck = "1.24.0"
susres = { package = "xous-api-susres", version = "0.9.68" }
susres = { path = "../../api/xous-api-susres", package = "xous-api-susres" }
keystore = { path = "../keystore" }
bio-lib = { path = "../../libs/bio-lib" }
arbitrary-int = "1.2"
# pddb testing
rand = { version = "0.8.5", features = ["getrandom"], optional = true }
rand_chacha = { version = "0.3.1", optional = true }
@ -57,6 +60,7 @@ board-baosec = [
"xous-swapper",
"ux-api/board-baosec",
]
oem-baosec-lite = ["bao1x-hal/sensor-lis2dh12"]
hosted-baosec = [
"modals/hosted-baosec",
"usb-bao1x/hosted-baosec",

View file

@ -12,7 +12,7 @@ log-server = { package = "xous-api-log", version = "0.1.68" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.68" }
xous-names = { package = "xous-api-names", version = "0.9.70" }
log = "0.4.14"
susres = { package = "xous-api-susres", version = "0.9.68" }
susres = { path = "../../api/xous-api-susres", package = "xous-api-susres" }
llio = { path = "../llio" }
trng = { path = "../trng" }

View file

@ -11,7 +11,7 @@ com_rs = { git = "https://github.com/betrusted-io/com_rs", rev = "891bdd3ca8e41f
log = "0.4.14"
log-server = { package = "xous-api-log", version = "0.1.68" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.68" }
susres = { package = "xous-api-susres", version = "0.9.68" }
susres = { path = "../../api/xous-api-susres", package = "xous-api-susres" }
typenum = "1.12"
xous = "0.9.69"
xous-ipc = "0.10.9"

View file

@ -31,7 +31,7 @@ chrono = { version = "0.4.33", 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.68" }
susres = { path = "../../api/xous-api-susres", package = "xous-api-susres" }
userprefs = { path = "../../libs/userprefs" }
modals = { path = "../modals" }
precursor-hal = { path = "../../libs/precursor-hal" }

View file

@ -16,7 +16,7 @@ ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.68" }
xous = "0.9.69"
xous-ipc = "0.10.9"
xous-names = { package = "xous-api-names", version = "0.9.70" }
susres = { package = "xous-api-susres", version = "0.9.68" }
susres = { path = "../../api/xous-api-susres", package = "xous-api-susres" }
spinor = { path = "../../services/spinor" }
precursor-hal = { path = "../../libs/precursor-hal" }

View file

@ -14,7 +14,7 @@ xous-names = { package = "xous-api-names", version = "0.9.70" }
log = "0.4.14"
num-derive = { version = "0.4.2", default-features = false }
num-traits = { version = "0.2.14", default-features = false }
susres = { package = "xous-api-susres", version = "0.9.68" }
susres = { path = "../../api/xous-api-susres", package = "xous-api-susres" }
ffi-sys = { path = "sys" }
keyboard = { path = "../keyboard" }

View file

@ -30,7 +30,7 @@ rkyv = { version = "0.8.8", default-features = false, features = [
"alloc",
] }
susres = { package = "xous-api-susres", version = "0.9.68", optional = true } # used for the sleep now menu item
susres = { path = "../../api/xous-api-susres", package = "xous-api-susres", optional = true } # used for the sleep now menu item
bao1x-hal-service = { path = "../bao1x-hal-service", optional = true, default-features = false }
enum_dispatch = "0.3.7" # used for trait-based dispatch off of multiple layout objects.

View file

@ -11,7 +11,7 @@ keyboard = { path = "../keyboard" }
log = "0.4.14"
log-server = { package = "xous-api-log", version = "0.1.68" }
xous = "0.9.69"
susres = { package = "xous-api-susres", version = "0.9.68" }
susres = { path = "../../api/xous-api-susres", package = "xous-api-susres" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.68" }
locales = { path = "../../locales" }
blitstr2 = { path = "../../libs/blitstr2" }
@ -39,12 +39,7 @@ bao1x-hal = { path = "../../libs/bao1x-hal", optional = true, features = [
minifb = "0.26.0"
[features]
bao1x = [
"utralib/bao1x",
"bao1x-hal-service",
"bao1x-hal",
"bao1x-hal/std",
]
bao1x = ["utralib/bao1x", "bao1x-hal-service", "bao1x-hal", "bao1x-hal/std"]
board-baosor = ["bao1x-hal/board-baosor", "blitstr2/board-baosor"]
precursor = [

View file

@ -14,7 +14,7 @@ xous-names = { package = "xous-api-names", version = "0.9.70" }
log = "0.4.14"
num-derive = { version = "0.4.2", default-features = false }
num-traits = { version = "0.2.14", default-features = false }
susres = { package = "xous-api-susres", version = "0.9.68" }
susres = { path = "../../api/xous-api-susres", package = "xous-api-susres" }
xous-ipc = "0.10.9"
rkyv = { version = "0.8.8", default-features = false, features = [

View file

@ -17,7 +17,7 @@ xous = "0.9.69"
xous-ipc = "0.10.9"
xous-names = { package = "xous-api-names", version = "0.9.70" }
llio = { path = "../llio" }
susres = { package = "xous-api-susres", version = "0.9.68" }
susres = { path = "../../api/xous-api-susres", package = "xous-api-susres" }
spinor = { path = "../spinor" }
num-derive = { version = "0.4.2", default-features = false }

View file

@ -13,7 +13,7 @@ ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.68" }
xous = "0.9.69"
xous-ipc = "0.10.9"
xous-names = { package = "xous-api-names", version = "0.9.70" }
susres = { package = "xous-api-susres", version = "0.9.68" }
susres = { path = "../../api/xous-api-susres", package = "xous-api-susres" }
# RTC dependencies
bitflags = "1.2.1"

View file

@ -15,7 +15,7 @@ xous-names = { package = "xous-api-names", version = "0.9.70" }
log = "0.4.14"
num-derive = { version = "0.4.2", default-features = false }
num-traits = { version = "0.2.14", default-features = false }
susres = { package = "xous-api-susres", version = "0.9.68" }
susres = { path = "../../api/xous-api-susres", package = "xous-api-susres" }
rkyv = { version = "0.8.8", default-features = false, features = [
"std",
"alloc",

View file

@ -13,7 +13,7 @@ xous-ipc = "0.10.9"
log-server = { package = "xous-api-log", version = "0.1.68" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.68" }
xous-names = { package = "xous-api-names", version = "0.9.70" }
susres = { package = "xous-api-susres", version = "0.9.68", optional = true }
susres = { path = "../../api/xous-api-susres", package = "xous-api-susres", optional = true }
log = "0.4.14"
num-derive = { version = "0.4.2", default-features = false }
num-traits = { version = "0.2.14", default-features = false }

View file

@ -12,7 +12,7 @@ log-server = { package = "xous-api-log", version = "0.1.68" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.68" }
xous-names = { package = "xous-api-names", version = "0.9.70" }
log = "0.4.14"
susres = { package = "xous-api-susres", version = "0.9.68" }
susres = { path = "../../api/xous-api-susres", package = "xous-api-susres" }
trng = { path = "../trng" }
spinor = { path = "../spinor" }
llio = { path = "../llio" }

View file

@ -23,7 +23,7 @@ xous = "0.9.69"
xous-ipc = "0.10.9"
xous-names = { package = "xous-api-names", version = "0.9.70" }
keyboard = { path = "../keyboard" }
susres = { package = "xous-api-susres", version = "0.9.68" }
susres = { path = "../../api/xous-api-susres", package = "xous-api-susres" }
codec = { path = "../codec" }
sha2 = { version = "0.10.8" }
digest = "0.10.7"

View file

@ -14,7 +14,7 @@ xous-names = { package = "xous-api-names", version = "0.9.70" }
log = "0.4.14"
num-derive = { version = "0.4.2", default-features = false }
num-traits = { version = "0.2.14", default-features = false }
susres = { package = "xous-api-susres", version = "0.9.68" }
susres = { path = "../../api/xous-api-susres", package = "xous-api-susres" }
utralib = { version = "0.1.26", optional = true, default-features = false }

View file

@ -12,7 +12,7 @@ log-server = { package = "xous-api-log", version = "0.1.68" }
ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.68" }
xous-names = { package = "xous-api-names", version = "0.9.70" }
log = "0.4.14"
susres = { package = "xous-api-susres", version = "0.9.68" }
susres = { path = "../../api/xous-api-susres", package = "xous-api-susres" }
trng = { path = "../trng" }
com = { path = "../com" }
llio = { path = "../llio" }

View file

@ -20,7 +20,7 @@ xous-names = { package = "xous-api-names", version = "0.9.70" }
ux-api = { path = "../../libs/ux-api" }
gam = { path = "../gam" }
locales = { path = "../../locales" }
susres = { package = "xous-api-susres", version = "0.9.68" }
susres = { path = "../../api/xous-api-susres", package = "xous-api-susres" }
root-keys = { path = "../root-keys" }
keystore-api = { path = "../../libs/keystore-api", features = ["gen1"] }
modals = { path = "../modals" }

View file

@ -10,7 +10,7 @@ version = "0.1.0"
xous = "0.9.69"
log = "0.4.14"
log-server = { package = "xous-api-log", version = "0.1.68" }
susres = { package = "xous-api-susres", version = "0.9.68", optional = true }
susres = { path = "../../api/xous-api-susres", package = "xous-api-susres", optional = true }
xous-names = { package = "xous-api-names", version = "0.9.70", optional = true }
[features]

View file

@ -14,7 +14,7 @@ xous-names = { package = "xous-api-names", version = "0.9.70" }
log = "0.4.14"
num-derive = { version = "0.4.1", default-features = false }
num-traits = { version = "0.2.14", default-features = false }
susres = { package = "xous-api-susres", version = "0.9.68" }
susres = { path = "../../api/xous-api-susres", package = "xous-api-susres" }
rkyv = { version = "0.8.8", default-features = false, features = [
"std",
"alloc",

View file

@ -20,7 +20,7 @@ rkyv = { version = "0.8.8", default-features = false, features = [
"std",
"alloc",
] }
susres = { package = "xous-api-susres", version = "0.9.68" }
susres = { path = "../../api/xous-api-susres", package = "xous-api-susres" }
modals = { path = "../modals", optional = true }
keyboard = { path = "../keyboard", features = ["inject-api"], optional = true }
bitfield = "0.13.2"

View file

@ -14,7 +14,7 @@ xous-names = { package = "xous-api-names", version = "0.9.70" }
log = "0.4.14"
num-derive = { version = "0.4.2", default-features = false }
num-traits = { version = "0.2.14", default-features = false }
susres = { package = "xous-api-susres", version = "0.9.68" }
susres = { path = "../../api/xous-api-susres", package = "xous-api-susres" }
keyboard = { path = "../keyboard" }
bitfield = "0.13.2"
vcell = "0.1.3"

View file

@ -15,7 +15,7 @@ xous = "0.9.69"
xous-ipc = "0.10.9"
xous-names = { package = "xous-api-names", version = "0.9.70" }
log-server = { package = "xous-api-log", version = "0.1.68" }
susres = { package = "xous-api-susres", version = "0.9.68" }
susres = { path = "../../api/xous-api-susres", package = "xous-api-susres" }
log = "0.4.14"
rkyv = { version = "0.8.8", default-features = false, features = [
"std",