From 45632385d5b3e908ee4abc6ca62fc0e3b11bfdd6 Mon Sep 17 00:00:00 2001 From: bunnie Date: Wed, 28 Jan 2026 00:36:05 +0800 Subject: [PATCH] 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. --- Cargo.toml | 4 ++-- api/xous-api-ticktimer/Cargo.toml | 1 - apps-baosec/vault2/Cargo.toml | 2 ++ apps/vault/Cargo.toml | 2 +- libs/bao1x-hal/Cargo.toml | 3 ++- services/bao-console/Cargo.toml | 6 +++++- services/codec/Cargo.toml | 2 +- services/com/Cargo.toml | 2 +- services/dns/Cargo.toml | 2 +- services/early_settings/Cargo.toml | 2 +- services/ffi-test/Cargo.toml | 2 +- services/gam/Cargo.toml | 2 +- services/graphics-server/Cargo.toml | 9 ++------- services/jtag/Cargo.toml | 2 +- services/keyboard/Cargo.toml | 2 +- services/llio/Cargo.toml | 2 +- services/net/Cargo.toml | 2 +- services/pddb/Cargo.toml | 2 +- services/root-keys/Cargo.toml | 2 +- services/shellchat/Cargo.toml | 2 +- services/skeleton/Cargo.toml | 2 +- services/spinor/Cargo.toml | 2 +- services/status/Cargo.toml | 2 +- services/ticktimer-test-client/Cargo.toml | 2 +- services/trng/Cargo.toml | 2 +- services/usb-device-xous/Cargo.toml | 2 +- services/usb-test/Cargo.toml | 2 +- services/xous-ticktimer/Cargo.toml | 2 +- 28 files changed, 35 insertions(+), 34 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8606c555c..f5d6d0795 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" diff --git a/api/xous-api-ticktimer/Cargo.toml b/api/xous-api-ticktimer/Cargo.toml index 349a624bd..09f935d33 100644 --- a/api/xous-api-ticktimer/Cargo.toml +++ b/api/xous-api-ticktimer/Cargo.toml @@ -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 = [ diff --git a/apps-baosec/vault2/Cargo.toml b/apps-baosec/vault2/Cargo.toml index 5c3872317..a986a10f3 100644 --- a/apps-baosec/vault2/Cargo.toml +++ b/apps-baosec/vault2/Cargo.toml @@ -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" diff --git a/apps/vault/Cargo.toml b/apps/vault/Cargo.toml index 73f202f5b..aeba7d715 100644 --- a/apps/vault/Cargo.toml +++ b/apps/vault/Cargo.toml @@ -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" } diff --git a/libs/bao1x-hal/Cargo.toml b/libs/bao1x-hal/Cargo.toml index 298a8edc4..0177f5572 100644 --- a/libs/bao1x-hal/Cargo.toml +++ b/libs/bao1x-hal/Cargo.toml @@ -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", diff --git a/services/bao-console/Cargo.toml b/services/bao-console/Cargo.toml index 0e6d6b9f4..6f8d91737 100644 --- a/services/bao-console/Cargo.toml +++ b/services/bao-console/Cargo.toml @@ -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", diff --git a/services/codec/Cargo.toml b/services/codec/Cargo.toml index 9f3a49729..d9ad959a5 100644 --- a/services/codec/Cargo.toml +++ b/services/codec/Cargo.toml @@ -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" } diff --git a/services/com/Cargo.toml b/services/com/Cargo.toml index 32c5bbed0..7502a5631 100644 --- a/services/com/Cargo.toml +++ b/services/com/Cargo.toml @@ -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" diff --git a/services/dns/Cargo.toml b/services/dns/Cargo.toml index cb679a064..3ba594370 100644 --- a/services/dns/Cargo.toml +++ b/services/dns/Cargo.toml @@ -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" } diff --git a/services/early_settings/Cargo.toml b/services/early_settings/Cargo.toml index 7740b24d7..10e178d68 100644 --- a/services/early_settings/Cargo.toml +++ b/services/early_settings/Cargo.toml @@ -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" } diff --git a/services/ffi-test/Cargo.toml b/services/ffi-test/Cargo.toml index a2d58d28f..9a2ab0f69 100644 --- a/services/ffi-test/Cargo.toml +++ b/services/ffi-test/Cargo.toml @@ -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" } diff --git a/services/gam/Cargo.toml b/services/gam/Cargo.toml index a990c871e..f96ab6f8e 100644 --- a/services/gam/Cargo.toml +++ b/services/gam/Cargo.toml @@ -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. diff --git a/services/graphics-server/Cargo.toml b/services/graphics-server/Cargo.toml index dbe150126..364a0e53e 100644 --- a/services/graphics-server/Cargo.toml +++ b/services/graphics-server/Cargo.toml @@ -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 = [ diff --git a/services/jtag/Cargo.toml b/services/jtag/Cargo.toml index 8a90c6f17..8b2513de5 100644 --- a/services/jtag/Cargo.toml +++ b/services/jtag/Cargo.toml @@ -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 = [ diff --git a/services/keyboard/Cargo.toml b/services/keyboard/Cargo.toml index 6d39e74c4..a3e0ed7da 100644 --- a/services/keyboard/Cargo.toml +++ b/services/keyboard/Cargo.toml @@ -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 } diff --git a/services/llio/Cargo.toml b/services/llio/Cargo.toml index 52689b415..51f44c083 100644 --- a/services/llio/Cargo.toml +++ b/services/llio/Cargo.toml @@ -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" diff --git a/services/net/Cargo.toml b/services/net/Cargo.toml index 7bfe0b852..1f620e816 100644 --- a/services/net/Cargo.toml +++ b/services/net/Cargo.toml @@ -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", diff --git a/services/pddb/Cargo.toml b/services/pddb/Cargo.toml index 3f33825d3..16bcebe9b 100644 --- a/services/pddb/Cargo.toml +++ b/services/pddb/Cargo.toml @@ -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 } diff --git a/services/root-keys/Cargo.toml b/services/root-keys/Cargo.toml index 6393384a7..2432cd020 100644 --- a/services/root-keys/Cargo.toml +++ b/services/root-keys/Cargo.toml @@ -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" } diff --git a/services/shellchat/Cargo.toml b/services/shellchat/Cargo.toml index 90af71d43..9caea0566 100644 --- a/services/shellchat/Cargo.toml +++ b/services/shellchat/Cargo.toml @@ -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" diff --git a/services/skeleton/Cargo.toml b/services/skeleton/Cargo.toml index d7e6005f8..427425854 100644 --- a/services/skeleton/Cargo.toml +++ b/services/skeleton/Cargo.toml @@ -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 } diff --git a/services/spinor/Cargo.toml b/services/spinor/Cargo.toml index a17b827c3..95812ae8f 100644 --- a/services/spinor/Cargo.toml +++ b/services/spinor/Cargo.toml @@ -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" } diff --git a/services/status/Cargo.toml b/services/status/Cargo.toml index 342fd5a56..02be3f079 100644 --- a/services/status/Cargo.toml +++ b/services/status/Cargo.toml @@ -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" } diff --git a/services/ticktimer-test-client/Cargo.toml b/services/ticktimer-test-client/Cargo.toml index 81f9cf0e4..423d20f0d 100644 --- a/services/ticktimer-test-client/Cargo.toml +++ b/services/ticktimer-test-client/Cargo.toml @@ -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] diff --git a/services/trng/Cargo.toml b/services/trng/Cargo.toml index 1a6def8d6..b5519dfd3 100644 --- a/services/trng/Cargo.toml +++ b/services/trng/Cargo.toml @@ -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", diff --git a/services/usb-device-xous/Cargo.toml b/services/usb-device-xous/Cargo.toml index 580c943a4..d9784415e 100644 --- a/services/usb-device-xous/Cargo.toml +++ b/services/usb-device-xous/Cargo.toml @@ -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" diff --git a/services/usb-test/Cargo.toml b/services/usb-test/Cargo.toml index ceb5ae996..3f44b4c9f 100644 --- a/services/usb-test/Cargo.toml +++ b/services/usb-test/Cargo.toml @@ -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" diff --git a/services/xous-ticktimer/Cargo.toml b/services/xous-ticktimer/Cargo.toml index 8955a5cf4..b4c54fcde 100644 --- a/services/xous-ticktimer/Cargo.toml +++ b/services/xous-ticktimer/Cargo.toml @@ -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",