From fefff0d614335eb54a7ad17ae3f750f2eb6ffaef Mon Sep 17 00:00:00 2001 From: Kurtis Dinelle Date: Tue, 12 May 2026 10:48:13 -0700 Subject: [PATCH 1/3] Update embedded-services + hals --- platform/dev-imxrt/Cargo.lock | 207 +++---------------------- platform/dev-mcxa/Cargo.lock | 58 +++---- platform/dev-mcxa/Cargo.toml | 23 +-- platform/dev-mcxa/src/main.rs | 7 +- platform/dev-mcxa/src/uart_adapter.rs | 44 ------ platform/dev-npcx/Cargo.lock | 211 +++----------------------- platform/dev-npcx/src/board.rs | 42 +---- platform/dev-npcx/src/main.rs | 7 +- platform/dev-qemu/Cargo.lock | 209 +++---------------------- platform/platform-common/Cargo.lock | 151 +++--------------- platform/platform-common/Cargo.toml | 2 + 11 files changed, 137 insertions(+), 824 deletions(-) delete mode 100644 platform/dev-mcxa/src/uart_adapter.rs diff --git a/platform/dev-imxrt/Cargo.lock b/platform/dev-imxrt/Cargo.lock index 30bc91a..7b17660 100644 --- a/platform/dev-imxrt/Cargo.lock +++ b/platform/dev-imxrt/Cargo.lock @@ -11,20 +11,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "aquamarine" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f50776554130342de4836ba542aa85a4ddb361690d7e8df13774d7284c3d5c2" -dependencies = [ - "include_dir", - "itertools 0.10.5", - "proc-macro-error2", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "autocfg" version = "1.5.0" @@ -49,7 +35,7 @@ dependencies = [ [[package]] name = "battery-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "battery-service-interface", "defmt 0.3.100", @@ -57,8 +43,6 @@ dependencies = [ "embassy-sync", "embassy-time", "embedded-batteries-async", - "embedded-hal 1.0.0", - "embedded-hal-async", "embedded-services", "odp-service-common", "power-policy-interface", @@ -67,7 +51,7 @@ dependencies = [ [[package]] name = "battery-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embedded-batteries-async", @@ -76,24 +60,14 @@ dependencies = [ [[package]] name = "battery-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "battery-service-interface", "defmt 0.3.100", - "embedded-batteries-async", "embedded-services", "num_enum", ] -[[package]] -name = "bincode" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740" -dependencies = [ - "unty", -] - [[package]] name = "bit-register" version = "0.1.0" @@ -120,26 +94,6 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f798d2d157e547aa99aab0967df39edd0b70307312b6f8bd2848e6abe40896e0" -[[package]] -name = "bitfield" -version = "0.19.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ba6517c6b0f2bf08be60e187ab64b038438f22dd755614d8fe4d4098c46419" -dependencies = [ - "bitfield-macros", -] - -[[package]] -name = "bitfield-macros" -version = "0.19.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f48d6ace212fdf1b45fd6b566bb40808415344642b76c3224c07c8df9da81e97" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "bitfield-struct" version = "0.12.1" @@ -163,18 +117,6 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - [[package]] name = "bq40z50-rx" version = "0.8.1" @@ -480,7 +422,7 @@ dependencies = [ [[package]] name = "embassy-imxrt" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embassy-imxrt#d95ffe560071e942d917b422bbdea7e73f6c4602" +source = "git+https://github.com/OpenDevicePartnership/embassy-imxrt#f3be03ca74bfefb062b4536848c2f1d1b7e06186" dependencies = [ "cfg-if", "cortex-m", @@ -500,11 +442,13 @@ dependencies = [ "embedded-hal-async", "embedded-hal-nb", "embedded-io 0.6.1", + "embedded-io 0.7.1", "embedded-io-async 0.6.1", + "embedded-io-async 0.7.0", "embedded-mcu-hal", "embedded-storage", "fixed", - "itertools 0.11.0", + "itertools", "mimxrt600-fcb", "mimxrt633s-pac", "mimxrt685s-pac", @@ -557,12 +501,12 @@ dependencies = [ [[package]] name = "embassy-time-queue-utils" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e2ee86063bd028a420a5fb5898c18c87a8898026da1d4c852af2c443d0a454" +checksum = "168297bf80aaf114b3c9ad589bf38b01b3009b9af7f97cd18086c5bbf96f5693" dependencies = [ "embassy-executor-timer-queue", - "heapless 0.8.0", + "heapless 0.9.2", ] [[package]] @@ -590,15 +534,6 @@ dependencies = [ "embedded-hal 1.0.0", ] -[[package]] -name = "embedded-cfu-protocol" -version = "0.2.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-cfu#e0d776017cf34c902c9f2a2be0c75fe73a3a4dda" -dependencies = [ - "defmt 0.3.100", - "embedded-io-async 0.6.1", -] - [[package]] name = "embedded-crc-macros" version = "1.0.0" @@ -723,31 +658,18 @@ dependencies = [ [[package]] name = "embedded-services" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "bitfield 0.17.0", - "bitflags 2.11.1", - "bitvec", - "cfg-if", "cortex-m", "critical-section", "defmt 0.3.100", - "document-features", "embassy-futures", "embassy-sync", - "embassy-time", - "embedded-cfu-protocol", - "embedded-hal-async", - "embedded-io 0.6.1", - "embedded-io-async 0.6.1", - "embedded-usb-pd", - "heapless 0.8.0", "mctp-rs", - "num_enum", "paste", "portable-atomic", "serde", - "uuid", ] [[package]] @@ -765,22 +687,10 @@ dependencies = [ "embedded-storage", ] -[[package]] -name = "embedded-usb-pd" -version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-usb-pd#1a8e79d3a2ac0d2837a34b045087cf0863146f7d" -dependencies = [ - "aquamarine", - "bincode", - "bitfield 0.19.4", - "defmt 0.3.100", - "embedded-hal-async", -] - [[package]] name = "espi-device" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#0d21aa34fd8691c6544533e6c72fe41824dc2fa8" +source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#09eda26a729738adbd177231600acdb981690375" dependencies = [ "bit-register", "bitflags 2.11.1", @@ -814,12 +724,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - [[package]] name = "futures-core" version = "0.3.32" @@ -899,34 +803,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "include_dir" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" -dependencies = [ - "include_dir_macros", -] - -[[package]] -name = "include_dir_macros" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.11.0" @@ -985,7 +861,7 @@ dependencies = [ [[package]] name = "mctp-rs" version = "0.1.0" -source = "git+https://github.com/dymk/mctp-rs#3d941ba5205ca7781bf37e3dc7c5dfdc99a082d6" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "bit-register", "defmt 0.3.100", @@ -1094,7 +970,7 @@ dependencies = [ [[package]] name = "odp-service-common" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "embedded-services", "static_cell", @@ -1145,6 +1021,8 @@ dependencies = [ "embedded-fans-async", "embedded-hal 1.0.0", "embedded-hal-async", + "embedded-io 0.7.1", + "embedded-io-async 0.7.0", "embedded-mcu-hal", "embedded-sensors-hal-async", "embedded-services", @@ -1167,15 +1045,13 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "power-policy-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", - "embassy-futures", "embassy-sync", "embedded-batteries-async", "embedded-services", - "heapless 0.8.0", "num_enum", ] @@ -1219,12 +1095,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - [[package]] name = "rand_core" version = "0.9.5" @@ -1399,16 +1269,10 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - [[package]] name = "thermal-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1425,7 +1289,7 @@ dependencies = [ [[package]] name = "thermal-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embassy-time", @@ -1436,7 +1300,7 @@ dependencies = [ [[package]] name = "thermal-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embedded-services", @@ -1477,11 +1341,9 @@ dependencies = [ [[package]] name = "time-alarm-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ - "bitfield 0.17.0", "defmt 0.3.100", - "embassy-executor", "embassy-futures", "embassy-sync", "embassy-time", @@ -1495,7 +1357,7 @@ dependencies = [ [[package]] name = "time-alarm-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", @@ -1507,7 +1369,7 @@ dependencies = [ [[package]] name = "time-alarm-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embedded-mcu-hal", @@ -1586,17 +1448,13 @@ checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "uart-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ - "bitfield 0.17.0", "defmt 0.3.100", - "embassy-futures", "embassy-sync", - "embassy-time", - "embedded-io-async 0.6.1", + "embedded-io-async 0.7.0", "embedded-services", "mctp-rs", - "num_enum", ] [[package]] @@ -1605,12 +1463,6 @@ version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" -[[package]] -name = "unty" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae" - [[package]] name = "uuid" version = "1.17.0" @@ -1668,15 +1520,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - [[package]] name = "zerocopy" version = "0.8.48" diff --git a/platform/dev-mcxa/Cargo.lock b/platform/dev-mcxa/Cargo.lock index ca348fd..f18e9e6 100644 --- a/platform/dev-mcxa/Cargo.lock +++ b/platform/dev-mcxa/Cargo.lock @@ -29,7 +29,7 @@ dependencies = [ [[package]] name = "battery-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#e831384e6df04f2ed2e27398b8024ffbf8681a2a" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "battery-service-interface", "defmt 0.3.100", @@ -45,7 +45,7 @@ dependencies = [ [[package]] name = "battery-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#e831384e6df04f2ed2e27398b8024ffbf8681a2a" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embedded-batteries-async", @@ -54,7 +54,7 @@ dependencies = [ [[package]] name = "battery-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#e831384e6df04f2ed2e27398b8024ffbf8681a2a" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "battery-service-interface", "defmt 0.3.100", @@ -317,8 +317,6 @@ dependencies = [ "defmt-rtt", "embassy-executor", "embassy-mcxa", - "embedded-io 0.6.1", - "embedded-io-async 0.6.1", "panic-probe", "platform-common", "static_cell", @@ -347,7 +345,7 @@ dependencies = [ [[package]] name = "embassy-embedded-hal" version = "0.6.0" -source = "git+https://github.com/embassy-rs/embassy?rev=7af7d3d270f019ff70f919c62c78d51f28f2d50a#7af7d3d270f019ff70f919c62c78d51f28f2d50a" +source = "git+https://github.com/embassy-rs/embassy?rev=bef4118731ac69092bee4489240f59c89af0d944#bef4118731ac69092bee4489240f59c89af0d944" dependencies = [ "embassy-futures", "embassy-hal-internal", @@ -363,7 +361,7 @@ dependencies = [ [[package]] name = "embassy-executor" version = "0.10.0" -source = "git+https://github.com/embassy-rs/embassy?rev=7af7d3d270f019ff70f919c62c78d51f28f2d50a#7af7d3d270f019ff70f919c62c78d51f28f2d50a" +source = "git+https://github.com/embassy-rs/embassy?rev=bef4118731ac69092bee4489240f59c89af0d944#bef4118731ac69092bee4489240f59c89af0d944" dependencies = [ "cordyceps", "cortex-m", @@ -377,7 +375,7 @@ dependencies = [ [[package]] name = "embassy-executor-macros" version = "0.8.0" -source = "git+https://github.com/embassy-rs/embassy?rev=7af7d3d270f019ff70f919c62c78d51f28f2d50a#7af7d3d270f019ff70f919c62c78d51f28f2d50a" +source = "git+https://github.com/embassy-rs/embassy?rev=bef4118731ac69092bee4489240f59c89af0d944#bef4118731ac69092bee4489240f59c89af0d944" dependencies = [ "darling", "proc-macro2", @@ -388,17 +386,17 @@ dependencies = [ [[package]] name = "embassy-executor-timer-queue" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy?rev=7af7d3d270f019ff70f919c62c78d51f28f2d50a#7af7d3d270f019ff70f919c62c78d51f28f2d50a" +source = "git+https://github.com/embassy-rs/embassy?rev=bef4118731ac69092bee4489240f59c89af0d944#bef4118731ac69092bee4489240f59c89af0d944" [[package]] name = "embassy-futures" version = "0.1.2" -source = "git+https://github.com/embassy-rs/embassy?rev=7af7d3d270f019ff70f919c62c78d51f28f2d50a#7af7d3d270f019ff70f919c62c78d51f28f2d50a" +source = "git+https://github.com/embassy-rs/embassy?rev=bef4118731ac69092bee4489240f59c89af0d944#bef4118731ac69092bee4489240f59c89af0d944" [[package]] name = "embassy-hal-internal" version = "0.5.0" -source = "git+https://github.com/embassy-rs/embassy?rev=7af7d3d270f019ff70f919c62c78d51f28f2d50a#7af7d3d270f019ff70f919c62c78d51f28f2d50a" +source = "git+https://github.com/embassy-rs/embassy?rev=bef4118731ac69092bee4489240f59c89af0d944#bef4118731ac69092bee4489240f59c89af0d944" dependencies = [ "cortex-m", "critical-section", @@ -408,7 +406,7 @@ dependencies = [ [[package]] name = "embassy-mcxa" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy?rev=7af7d3d270f019ff70f919c62c78d51f28f2d50a#7af7d3d270f019ff70f919c62c78d51f28f2d50a" +source = "git+https://github.com/embassy-rs/embassy?rev=bef4118731ac69092bee4489240f59c89af0d944#bef4118731ac69092bee4489240f59c89af0d944" dependencies = [ "bbqueue", "convert_case", @@ -450,7 +448,7 @@ dependencies = [ [[package]] name = "embassy-sync" version = "0.8.0" -source = "git+https://github.com/embassy-rs/embassy?rev=7af7d3d270f019ff70f919c62c78d51f28f2d50a#7af7d3d270f019ff70f919c62c78d51f28f2d50a" +source = "git+https://github.com/embassy-rs/embassy?rev=bef4118731ac69092bee4489240f59c89af0d944#bef4118731ac69092bee4489240f59c89af0d944" dependencies = [ "cfg-if", "critical-section", @@ -464,7 +462,7 @@ dependencies = [ [[package]] name = "embassy-time" version = "0.5.1" -source = "git+https://github.com/embassy-rs/embassy?rev=7af7d3d270f019ff70f919c62c78d51f28f2d50a#7af7d3d270f019ff70f919c62c78d51f28f2d50a" +source = "git+https://github.com/embassy-rs/embassy?rev=bef4118731ac69092bee4489240f59c89af0d944#bef4118731ac69092bee4489240f59c89af0d944" dependencies = [ "cfg-if", "critical-section", @@ -480,7 +478,7 @@ dependencies = [ [[package]] name = "embassy-time-driver" version = "0.2.2" -source = "git+https://github.com/embassy-rs/embassy?rev=7af7d3d270f019ff70f919c62c78d51f28f2d50a#7af7d3d270f019ff70f919c62c78d51f28f2d50a" +source = "git+https://github.com/embassy-rs/embassy?rev=bef4118731ac69092bee4489240f59c89af0d944#bef4118731ac69092bee4489240f59c89af0d944" dependencies = [ "document-features", ] @@ -488,7 +486,7 @@ dependencies = [ [[package]] name = "embassy-time-queue-utils" version = "0.3.2" -source = "git+https://github.com/embassy-rs/embassy?rev=7af7d3d270f019ff70f919c62c78d51f28f2d50a#7af7d3d270f019ff70f919c62c78d51f28f2d50a" +source = "git+https://github.com/embassy-rs/embassy?rev=bef4118731ac69092bee4489240f59c89af0d944#bef4118731ac69092bee4489240f59c89af0d944" dependencies = [ "embassy-executor-timer-queue", "heapless 0.9.3", @@ -643,7 +641,7 @@ dependencies = [ [[package]] name = "embedded-services" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#e831384e6df04f2ed2e27398b8024ffbf8681a2a" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "bitfield 0.17.0", "cortex-m", @@ -681,7 +679,7 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "espi-device" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#0d21aa34fd8691c6544533e6c72fe41824dc2fa8" +source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#09eda26a729738adbd177231600acdb981690375" dependencies = [ "bit-register", "bitflags 2.11.1", @@ -861,7 +859,7 @@ dependencies = [ [[package]] name = "mctp-rs" version = "0.1.0" -source = "git+https://github.com/dymk/mctp-rs#3d941ba5205ca7781bf37e3dc7c5dfdc99a082d6" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "bit-register", "defmt 0.3.100", @@ -958,7 +956,7 @@ dependencies = [ [[package]] name = "odp-service-common" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#e831384e6df04f2ed2e27398b8024ffbf8681a2a" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "embedded-services", "static_cell", @@ -1029,6 +1027,8 @@ dependencies = [ "embedded-fans-async", "embedded-hal 1.0.0", "embedded-hal-async", + "embedded-io 0.7.1", + "embedded-io-async 0.7.0", "embedded-mcu-hal", "embedded-sensors-hal-async", "embedded-services", @@ -1054,7 +1054,7 @@ dependencies = [ [[package]] name = "power-policy-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#e831384e6df04f2ed2e27398b8024ffbf8681a2a" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", @@ -1300,7 +1300,7 @@ dependencies = [ [[package]] name = "thermal-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#e831384e6df04f2ed2e27398b8024ffbf8681a2a" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1317,7 +1317,7 @@ dependencies = [ [[package]] name = "thermal-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#e831384e6df04f2ed2e27398b8024ffbf8681a2a" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embassy-time", @@ -1328,7 +1328,7 @@ dependencies = [ [[package]] name = "thermal-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#e831384e6df04f2ed2e27398b8024ffbf8681a2a" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embedded-services", @@ -1369,7 +1369,7 @@ dependencies = [ [[package]] name = "time-alarm-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#e831384e6df04f2ed2e27398b8024ffbf8681a2a" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1385,7 +1385,7 @@ dependencies = [ [[package]] name = "time-alarm-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#e831384e6df04f2ed2e27398b8024ffbf8681a2a" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", @@ -1397,7 +1397,7 @@ dependencies = [ [[package]] name = "time-alarm-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#e831384e6df04f2ed2e27398b8024ffbf8681a2a" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embedded-mcu-hal", @@ -1470,11 +1470,11 @@ dependencies = [ [[package]] name = "uart-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#e831384e6df04f2ed2e27398b8024ffbf8681a2a" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embassy-sync", - "embedded-io-async 0.6.1", + "embedded-io-async 0.7.0", "embedded-services", "mctp-rs", ] diff --git a/platform/dev-mcxa/Cargo.toml b/platform/dev-mcxa/Cargo.toml index a70340d..32bcbbc 100644 --- a/platform/dev-mcxa/Cargo.toml +++ b/platform/dev-mcxa/Cargo.toml @@ -49,7 +49,7 @@ embassy-executor = { version = "0.10.0", default-features = false, features = [ "executor-interrupt", "defmt", ] } -embassy-mcxa = { git = "https://github.com/embassy-rs/embassy", rev = "7af7d3d270f019ff70f919c62c78d51f28f2d50a", features = [ +embassy-mcxa = { git = "https://github.com/embassy-rs/embassy", rev = "bef4118731ac69092bee4489240f59c89af0d944", features = [ "defmt", "unstable-pac", "mcxa2xx", @@ -59,13 +59,6 @@ uart-service = { git = "https://github.com/OpenDevicePartnership/embedded-servic ] } static_cell = "2.1.0" platform-common = { path = "../platform-common", features = ["mock"] } -# uart-service (v0.2.0 branch) depends on embedded-io-async 0.6, but -# embassy-mcxa upstream uses 0.7. We bring in 0.6 explicitly so we can adapt -# the Lpuart driver to the older trait surface required by uart-service. -# TODO: once uart-service is updated to use embedded-io-async 0.7, remove this dependency. -embedded-io-async-6 = { version = "0.6", package = "embedded-io-async" } -embedded-io-6 = { version = "0.6", package = "embedded-io" } - panic-probe = { version = "1.0.0", features = ["print-defmt"] } [package.metadata.cargo-machete] @@ -76,10 +69,10 @@ ignored = ["cortex-m", "cortex-m-rt"] # embassy-time/embassy-time-driver from crates.io, which would cause a duplicate # `links` conflict. Force everyone to use the git versions. [patch.crates-io] -embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "7af7d3d270f019ff70f919c62c78d51f28f2d50a" } -embassy-time-driver = { git = "https://github.com/embassy-rs/embassy", rev = "7af7d3d270f019ff70f919c62c78d51f28f2d50a" } -embassy-time-queue-utils = { git = "https://github.com/embassy-rs/embassy", rev = "7af7d3d270f019ff70f919c62c78d51f28f2d50a" } -embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "7af7d3d270f019ff70f919c62c78d51f28f2d50a" } -embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "7af7d3d270f019ff70f919c62c78d51f28f2d50a" } -embassy-futures = { git = "https://github.com/embassy-rs/embassy", rev = "7af7d3d270f019ff70f919c62c78d51f28f2d50a" } -embassy-embedded-hal = { git = "https://github.com/embassy-rs/embassy", rev = "7af7d3d270f019ff70f919c62c78d51f28f2d50a" } +embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "bef4118731ac69092bee4489240f59c89af0d944" } +embassy-time-driver = { git = "https://github.com/embassy-rs/embassy", rev = "bef4118731ac69092bee4489240f59c89af0d944" } +embassy-time-queue-utils = { git = "https://github.com/embassy-rs/embassy", rev = "bef4118731ac69092bee4489240f59c89af0d944" } +embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "bef4118731ac69092bee4489240f59c89af0d944" } +embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "bef4118731ac69092bee4489240f59c89af0d944" } +embassy-futures = { git = "https://github.com/embassy-rs/embassy", rev = "bef4118731ac69092bee4489240f59c89af0d944" } +embassy-embedded-hal = { git = "https://github.com/embassy-rs/embassy", rev = "bef4118731ac69092bee4489240f59c89af0d944" } diff --git a/platform/dev-mcxa/src/main.rs b/platform/dev-mcxa/src/main.rs index b77bf00..0dfac52 100644 --- a/platform/dev-mcxa/src/main.rs +++ b/platform/dev-mcxa/src/main.rs @@ -3,20 +3,19 @@ mod board; mod clocks; -mod uart_adapter; use board::Board; use defmt::info; use defmt_rtt as _; use embassy_executor::Spawner; +use embassy_mcxa::lpuart; use panic_probe as _; use platform_common::board::BoardIo; use platform_common::mock::MockOdpRelayHandler; use static_cell::StaticCell; -use uart_adapter::UartAdapter; #[embassy_executor::task] -async fn uart_service(uart: UartAdapter, relay: MockOdpRelayHandler) { +async fn uart_service(uart: lpuart::LpuartBbq, relay: MockOdpRelayHandler) { info!("Starting uart service"); static UART_SERVICE: StaticCell> = StaticCell::new(); let uart_service = uart_service::Service::new(relay).unwrap(); @@ -36,5 +35,5 @@ async fn main(spawner: Spawner) { info!("Hello world from MCXA!"); let relay = platform_common::mock::init(spawner).await; - spawner.spawn(uart_service(UartAdapter(board.uart), relay).expect("Failed to spawn UART service task")); + spawner.spawn(uart_service(board.uart, relay).expect("Failed to spawn UART service task")); } diff --git a/platform/dev-mcxa/src/uart_adapter.rs b/platform/dev-mcxa/src/uart_adapter.rs deleted file mode 100644 index adca5c4..0000000 --- a/platform/dev-mcxa/src/uart_adapter.rs +++ /dev/null @@ -1,44 +0,0 @@ -//! Adapter wrapping [`embassy_mcxa::lpuart::Lpuart`] to expose the -//! `embedded-io-async` 0.6 trait surface required by the OpenDevicePartnership -//! `uart-service` crate. -//! -//! The upstream `embassy-mcxa` HAL implements `embedded-io-async` 0.7, while -//! `uart-service` still depends on the 0.6 traits. -//! -//! TODO: once uart-service is updated to use embedded-io-async 0.7, this can be removed. - -use embassy_mcxa::lpuart; - -/// Type-erased UART error suitable for the 0.6 `embedded-io` trait family. -#[derive(Debug, defmt::Format)] -pub struct UartError; - -impl embedded_io_6::Error for UartError { - fn kind(&self) -> embedded_io_6::ErrorKind { - embedded_io_6::ErrorKind::Other - } -} - -/// UART wrapper to bridge embedded-io-async v0.6 traits over an MCXA DMA LPUART. -pub struct UartAdapter(pub lpuart::LpuartBbq); - -impl embedded_io_6::ErrorType for UartAdapter { - type Error = UartError; -} - -impl embedded_io_async_6::Read for UartAdapter { - async fn read(&mut self, buf: &mut [u8]) -> Result { - self.0.read(buf).await.map_err(|_| UartError) - } -} - -impl embedded_io_async_6::Write for UartAdapter { - async fn write(&mut self, buf: &[u8]) -> Result { - self.0.write(buf).await.map_err(|_| UartError) - } - - async fn flush(&mut self) -> Result<(), Self::Error> { - self.0.flush().await; - Ok(()) - } -} diff --git a/platform/dev-npcx/Cargo.lock b/platform/dev-npcx/Cargo.lock index 4ae988e..901697c 100644 --- a/platform/dev-npcx/Cargo.lock +++ b/platform/dev-npcx/Cargo.lock @@ -11,20 +11,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "aquamarine" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f50776554130342de4836ba542aa85a4ddb361690d7e8df13774d7284c3d5c2" -dependencies = [ - "include_dir", - "itertools", - "proc-macro-error2", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "autocfg" version = "1.5.0" @@ -43,7 +29,7 @@ dependencies = [ [[package]] name = "battery-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "battery-service-interface", "defmt 0.3.100", @@ -51,8 +37,6 @@ dependencies = [ "embassy-sync 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "embassy-time", "embedded-batteries-async", - "embedded-hal 1.0.0", - "embedded-hal-async", "embedded-services", "odp-service-common", "power-policy-interface", @@ -61,7 +45,7 @@ dependencies = [ [[package]] name = "battery-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embedded-batteries-async", @@ -70,24 +54,14 @@ dependencies = [ [[package]] name = "battery-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "battery-service-interface", "defmt 0.3.100", - "embedded-batteries-async", "embedded-services", "num_enum", ] -[[package]] -name = "bincode" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740" -dependencies = [ - "unty", -] - [[package]] name = "bit-register" version = "0.1.0" @@ -108,26 +82,6 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f798d2d157e547aa99aab0967df39edd0b70307312b6f8bd2848e6abe40896e0" -[[package]] -name = "bitfield" -version = "0.19.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ba6517c6b0f2bf08be60e187ab64b038438f22dd755614d8fe4d4098c46419" -dependencies = [ - "bitfield-macros", -] - -[[package]] -name = "bitfield-macros" -version = "0.19.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f48d6ace212fdf1b45fd6b566bb40808415344642b76c3224c07c8df9da81e97" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "bitfield-struct" version = "0.12.1" @@ -151,18 +105,6 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - [[package]] name = "bq40z50-rx" version = "0.8.1" @@ -370,12 +312,6 @@ dependencies = [ "litrs", ] -[[package]] -name = "either" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" - [[package]] name = "embassy-executor" version = "0.10.0" @@ -418,7 +354,7 @@ checksum = "dc2d050bdc5c21e0862a89256ed8029ae6c290a93aecefc73084b3002cdebb01" [[package]] name = "embassy-hal-internal" version = "0.5.0" -source = "git+https://github.com/embassy-rs/embassy#6b015329e6784d084c1b589ba31af7a7dee13a7e" +source = "git+https://github.com/embassy-rs/embassy#c8715fc1026a58f74df0b41483274e439d82aa4c" dependencies = [ "cortex-m", "critical-section", @@ -428,7 +364,7 @@ dependencies = [ [[package]] name = "embassy-npcx" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embassy-npcx#4fdc944dc8d8b7313c1b5fef1ba3620e3fc54a4f" +source = "git+https://github.com/OpenDevicePartnership/embassy-npcx#648dcd7d97831d669ef49530d3334210cf2c2265" dependencies = [ "cfg-if", "cortex-m", @@ -444,7 +380,7 @@ dependencies = [ "embedded-hal 1.0.0", "embedded-hal-async", "embedded-hal-i2c", - "embedded-io-async 0.6.1", + "embedded-io-async 0.7.0", "maitake-sync", "npcx490m-pac", "paste", @@ -468,7 +404,7 @@ dependencies = [ [[package]] name = "embassy-sync" version = "0.8.0" -source = "git+https://github.com/embassy-rs/embassy#6b015329e6784d084c1b589ba31af7a7dee13a7e" +source = "git+https://github.com/embassy-rs/embassy#c8715fc1026a58f74df0b41483274e439d82aa4c" dependencies = [ "cfg-if", "critical-section", @@ -539,15 +475,6 @@ dependencies = [ "embedded-hal 1.0.0", ] -[[package]] -name = "embedded-cfu-protocol" -version = "0.2.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-cfu#e0d776017cf34c902c9f2a2be0c75fe73a3a4dda" -dependencies = [ - "defmt 0.3.100", - "embedded-io-async 0.6.1", -] - [[package]] name = "embedded-crc-macros" version = "1.0.0" @@ -671,49 +598,24 @@ dependencies = [ [[package]] name = "embedded-services" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "bitfield 0.17.0", - "bitflags 2.11.1", - "bitvec", - "cfg-if", "cortex-m", "critical-section", "defmt 0.3.100", - "document-features", "embassy-futures", "embassy-sync 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "embassy-time", - "embedded-cfu-protocol", - "embedded-hal-async", - "embedded-io 0.6.1", - "embedded-io-async 0.6.1", - "embedded-usb-pd", - "heapless 0.8.0", "mctp-rs", - "num_enum", "paste", "portable-atomic", "serde", - "uuid", -] - -[[package]] -name = "embedded-usb-pd" -version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-usb-pd#1a8e79d3a2ac0d2837a34b045087cf0863146f7d" -dependencies = [ - "aquamarine", - "bincode", - "bitfield 0.19.4", - "defmt 0.3.100", - "embedded-hal-async", ] [[package]] name = "espi-device" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#0d21aa34fd8691c6544533e6c72fe41824dc2fa8" +source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#09eda26a729738adbd177231600acdb981690375" dependencies = [ "bit-register", "bitflags 2.11.1", @@ -735,12 +637,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - [[package]] name = "futures-core" version = "0.3.32" @@ -809,34 +705,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "include_dir" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" -dependencies = [ - "include_dir_macros", -] - -[[package]] -name = "include_dir_macros" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - [[package]] name = "lazy_static" version = "1.5.0" @@ -902,7 +770,7 @@ dependencies = [ [[package]] name = "mctp-rs" version = "0.1.0" -source = "git+https://github.com/dymk/mctp-rs#3d941ba5205ca7781bf37e3dc7c5dfdc99a082d6" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "bit-register", "defmt 0.3.100", @@ -949,7 +817,7 @@ checksum = "8d5439c4ad607c3c23abf66de8c8bf57ba8adcd1f129e699851a6e43935d339d" [[package]] name = "npcx490m-pac" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/npcx490m-pac#169a602867ebf5a65556901731cce9b6737d51c9" +source = "git+https://github.com/OpenDevicePartnership/npcx490m-pac#ff158b443e8f0a6eb420efcca2f4e1e2f73231bf" dependencies = [ "cortex-m", "cortex-m-rt", @@ -999,7 +867,7 @@ dependencies = [ [[package]] name = "odp-service-common" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "embedded-services", "static_cell", @@ -1070,6 +938,8 @@ dependencies = [ "embedded-fans-async", "embedded-hal 1.0.0", "embedded-hal-async", + "embedded-io 0.7.1", + "embedded-io-async 0.7.0", "embedded-mcu-hal", "embedded-sensors-hal-async", "embedded-services", @@ -1095,15 +965,13 @@ dependencies = [ [[package]] name = "power-policy-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", - "embassy-futures", "embassy-sync 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "embedded-batteries-async", "embedded-services", - "heapless 0.8.0", "num_enum", ] @@ -1147,12 +1015,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - [[package]] name = "regex-automata" version = "0.4.14" @@ -1316,16 +1178,10 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - [[package]] name = "thermal-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1342,7 +1198,7 @@ dependencies = [ [[package]] name = "thermal-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embassy-time", @@ -1353,7 +1209,7 @@ dependencies = [ [[package]] name = "thermal-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embedded-services", @@ -1394,11 +1250,9 @@ dependencies = [ [[package]] name = "time-alarm-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ - "bitfield 0.17.0", "defmt 0.3.100", - "embassy-executor", "embassy-futures", "embassy-sync 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "embassy-time", @@ -1412,7 +1266,7 @@ dependencies = [ [[package]] name = "time-alarm-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", @@ -1424,7 +1278,7 @@ dependencies = [ [[package]] name = "time-alarm-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embedded-mcu-hal", @@ -1497,17 +1351,13 @@ dependencies = [ [[package]] name = "uart-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ - "bitfield 0.17.0", "defmt 0.3.100", - "embassy-futures", "embassy-sync 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "embassy-time", - "embedded-io-async 0.6.1", + "embedded-io-async 0.7.0", "embedded-services", "mctp-rs", - "num_enum", ] [[package]] @@ -1516,12 +1366,6 @@ version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" -[[package]] -name = "unty" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae" - [[package]] name = "uuid" version = "1.17.0" @@ -1579,15 +1423,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - [[package]] name = "zerocopy" version = "0.8.48" diff --git a/platform/dev-npcx/src/board.rs b/platform/dev-npcx/src/board.rs index dd32032..7d79b7a 100644 --- a/platform/dev-npcx/src/board.rs +++ b/platform/dev-npcx/src/board.rs @@ -5,45 +5,13 @@ bind_interrupts!(pub struct Irqs { CR_UART1_MDMA1 => uart::InterruptHandler; }); -/// Wrapper around split UART for embedded-io-async compatibility. -/// -/// The NPCX HAL does not define `embedded-io` traits or public methods -/// for `Uart`, so the UART must be split into `UartRx` and `UartTx` -/// and wrapped with `embedded-io-async` trait implementations. -pub struct UartWrap { - rx: uart::UartRx<'static>, - tx: uart::UartTx<'static>, -} - -impl embedded_io_async::ErrorType for UartWrap { - type Error = uart::Error; -} - -impl embedded_io_async::Read for UartWrap { - async fn read(&mut self, buf: &mut [u8]) -> Result { - self.rx.read(buf).await - } -} - -impl embedded_io_async::Write for UartWrap { - async fn write(&mut self, buf: &[u8]) -> Result { - let res = self.tx.write(buf).await.map_err(|_| uart::Error::Break)?; - self.tx.flush().await.map_err(|_| uart::Error::Break)?; - Ok(res) - } - - async fn flush(&mut self) -> Result<(), Self::Error> { - self.tx.flush().await.map_err(|_| uart::Error::Break) - } -} - /// Board IO for the dev-npcx platform. /// /// This minimal development board provides a UART interface /// for ODP service communication. pub struct Board { - /// UART for ODP service communication (wrapped for embedded-io-async). - pub uart: UartWrap, + /// UART for ODP service communication. + pub uart: uart::Uart<'static, peripherals::CR_UART1>, } impl BoardIo for Board { @@ -54,10 +22,6 @@ impl BoardIo for Board { config.baudrate = 115200; let uart = uart::Uart::new(p.CR_UART1, p.PG04, p.PH04, Irqs, config); - let (rx, tx) = uart.split(); - - Board { - uart: UartWrap { tx, rx }, - } + Board { uart } } } diff --git a/platform/dev-npcx/src/main.rs b/platform/dev-npcx/src/main.rs index 3e6ffdf..57ddc00 100644 --- a/platform/dev-npcx/src/main.rs +++ b/platform/dev-npcx/src/main.rs @@ -3,7 +3,7 @@ mod board; -use board::{Board, UartWrap}; +use board::Board; use defmt::info; use embassy_executor::Spawner; use platform_common::board::BoardIo; @@ -12,7 +12,10 @@ use static_cell::StaticCell; use {defmt_rtt as _, panic_probe as _}; #[embassy_executor::task] -async fn uart_service(uart: UartWrap, relay: MockOdpRelayHandler) { +async fn uart_service( + uart: embassy_npcx::uart::Uart<'static, embassy_npcx::peripherals::CR_UART1>, + relay: MockOdpRelayHandler, +) { info!("Starting uart service"); static UART_SERVICE: StaticCell> = StaticCell::new(); diff --git a/platform/dev-qemu/Cargo.lock b/platform/dev-qemu/Cargo.lock index 10ded09..4f75993 100644 --- a/platform/dev-qemu/Cargo.lock +++ b/platform/dev-qemu/Cargo.lock @@ -11,20 +11,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "aquamarine" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f50776554130342de4836ba542aa85a4ddb361690d7e8df13774d7284c3d5c2" -dependencies = [ - "include_dir", - "itertools", - "proc-macro-error2", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "autocfg" version = "1.5.0" @@ -43,7 +29,7 @@ dependencies = [ [[package]] name = "battery-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "battery-service-interface", "defmt 0.3.100", @@ -51,8 +37,6 @@ dependencies = [ "embassy-sync 0.8.0", "embassy-time", "embedded-batteries-async", - "embedded-hal 1.0.0", - "embedded-hal-async", "embedded-services", "odp-service-common", "power-policy-interface", @@ -61,7 +45,7 @@ dependencies = [ [[package]] name = "battery-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embedded-batteries-async", @@ -70,24 +54,14 @@ dependencies = [ [[package]] name = "battery-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "battery-service-interface", "defmt 0.3.100", - "embedded-batteries-async", "embedded-services", "num_enum", ] -[[package]] -name = "bincode" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740" -dependencies = [ - "unty", -] - [[package]] name = "bit-register" version = "0.1.0" @@ -108,26 +82,6 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f798d2d157e547aa99aab0967df39edd0b70307312b6f8bd2848e6abe40896e0" -[[package]] -name = "bitfield" -version = "0.19.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ba6517c6b0f2bf08be60e187ab64b038438f22dd755614d8fe4d4098c46419" -dependencies = [ - "bitfield-macros", -] - -[[package]] -name = "bitfield-macros" -version = "0.19.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f48d6ace212fdf1b45fd6b566bb40808415344642b76c3224c07c8df9da81e97" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "bitfield-struct" version = "0.12.1" @@ -151,18 +105,6 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - [[package]] name = "bq40z50-rx" version = "0.8.1" @@ -348,12 +290,6 @@ dependencies = [ "litrs", ] -[[package]] -name = "either" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" - [[package]] name = "embassy-executor" version = "0.9.1" @@ -428,7 +364,7 @@ dependencies = [ [[package]] name = "embassy-qemu-riscv" version = "0.2.1" -source = "git+https://github.com/kurtjd/qemu-riscv-rs#f572fa4637196d7079c279c60bcccea526859f17" +source = "git+https://github.com/kurtjd/qemu-riscv-rs#702ab97339894ac996da80c88f70b2f6d4ae8f94" dependencies = [ "critical-section", "defmt 1.0.1", @@ -440,8 +376,8 @@ dependencies = [ "embassy-time-queue-utils", "embedded-hal 1.0.0", "embedded-hal-async", - "embedded-io 0.6.1", - "embedded-io-async 0.6.1", + "embedded-io 0.7.1", + "embedded-io-async 0.7.0", "qemu-riscv-pac", "riscv", "riscv-rt", @@ -537,15 +473,6 @@ dependencies = [ "embedded-hal 1.0.0", ] -[[package]] -name = "embedded-cfu-protocol" -version = "0.2.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-cfu#e0d776017cf34c902c9f2a2be0c75fe73a3a4dda" -dependencies = [ - "defmt 0.3.100", - "embedded-io-async 0.6.1", -] - [[package]] name = "embedded-crc-macros" version = "1.0.0" @@ -660,49 +587,24 @@ dependencies = [ [[package]] name = "embedded-services" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "bitfield 0.17.0", - "bitflags 2.11.1", - "bitvec", - "cfg-if", "cortex-m", "critical-section", "defmt 0.3.100", - "document-features", "embassy-futures", "embassy-sync 0.8.0", - "embassy-time", - "embedded-cfu-protocol", - "embedded-hal-async", - "embedded-io 0.6.1", - "embedded-io-async 0.6.1", - "embedded-usb-pd", - "heapless 0.8.0", "mctp-rs", - "num_enum", "paste", "portable-atomic", "serde", - "uuid", -] - -[[package]] -name = "embedded-usb-pd" -version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-usb-pd#1a8e79d3a2ac0d2837a34b045087cf0863146f7d" -dependencies = [ - "aquamarine", - "bincode", - "bitfield 0.19.4", - "defmt 0.3.100", - "embedded-hal-async", ] [[package]] name = "espi-device" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#0d21aa34fd8691c6544533e6c72fe41824dc2fa8" +source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#09eda26a729738adbd177231600acdb981690375" dependencies = [ "bit-register", "bitflags 2.11.1", @@ -724,12 +626,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - [[package]] name = "futures-core" version = "0.3.32" @@ -798,34 +694,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "include_dir" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" -dependencies = [ - "include_dir_macros", -] - -[[package]] -name = "include_dir_macros" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - [[package]] name = "lazy_static" version = "1.5.0" @@ -875,7 +743,7 @@ dependencies = [ [[package]] name = "mctp-rs" version = "0.1.0" -source = "git+https://github.com/dymk/mctp-rs#3d941ba5205ca7781bf37e3dc7c5dfdc99a082d6" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "bit-register", "defmt 0.3.100", @@ -949,7 +817,7 @@ dependencies = [ [[package]] name = "odp-service-common" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "embedded-services", "static_cell", @@ -990,6 +858,8 @@ dependencies = [ "embedded-fans-async", "embedded-hal 1.0.0", "embedded-hal-async", + "embedded-io 0.7.1", + "embedded-io-async 0.7.0", "embedded-mcu-hal", "embedded-sensors-hal-async", "embedded-services", @@ -1012,15 +882,13 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "power-policy-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", - "embassy-futures", "embassy-sync 0.8.0", "embedded-batteries-async", "embedded-services", - "heapless 0.8.0", "num_enum", ] @@ -1058,7 +926,7 @@ dependencies = [ [[package]] name = "qemu-riscv-pac" version = "0.1.0" -source = "git+https://github.com/kurtjd/qemu-riscv-rs#f572fa4637196d7079c279c60bcccea526859f17" +source = "git+https://github.com/kurtjd/qemu-riscv-rs#702ab97339894ac996da80c88f70b2f6d4ae8f94" dependencies = [ "critical-section", "riscv", @@ -1076,12 +944,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - [[package]] name = "regex-automata" version = "0.4.14" @@ -1321,16 +1183,10 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - [[package]] name = "thermal-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1347,7 +1203,7 @@ dependencies = [ [[package]] name = "thermal-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embassy-time", @@ -1358,7 +1214,7 @@ dependencies = [ [[package]] name = "thermal-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embedded-services", @@ -1399,11 +1255,9 @@ dependencies = [ [[package]] name = "time-alarm-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ - "bitfield 0.17.0", "defmt 0.3.100", - "embassy-executor 0.10.0", "embassy-futures", "embassy-sync 0.8.0", "embassy-time", @@ -1417,7 +1271,7 @@ dependencies = [ [[package]] name = "time-alarm-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", @@ -1429,7 +1283,7 @@ dependencies = [ [[package]] name = "time-alarm-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embedded-mcu-hal", @@ -1502,17 +1356,13 @@ dependencies = [ [[package]] name = "uart-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#01bc3655b3afe01f7d8c92ed855f7befad571e52" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ - "bitfield 0.17.0", "defmt 0.3.100", - "embassy-futures", "embassy-sync 0.8.0", - "embassy-time", - "embedded-io-async 0.6.1", + "embedded-io-async 0.7.0", "embedded-services", "mctp-rs", - "num_enum", ] [[package]] @@ -1521,12 +1371,6 @@ version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" -[[package]] -name = "unty" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae" - [[package]] name = "uuid" version = "1.17.0" @@ -1584,15 +1428,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - [[package]] name = "zerocopy" version = "0.8.48" diff --git a/platform/platform-common/Cargo.lock b/platform/platform-common/Cargo.lock index cdcbb42..8dedc29 100644 --- a/platform/platform-common/Cargo.lock +++ b/platform/platform-common/Cargo.lock @@ -29,20 +29,6 @@ version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f0e0fee31ef5ed1ba1316088939cea399010ed7731dba877ed44aeb407a75ea" -[[package]] -name = "aquamarine" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f50776554130342de4836ba542aa85a4ddb361690d7e8df13774d7284c3d5c2" -dependencies = [ - "include_dir", - "itertools 0.10.5", - "proc-macro-error2", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "arraydeque" version = "0.5.1" @@ -104,7 +90,7 @@ dependencies = [ [[package]] name = "battery-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#83646b1194684dc6b1b550bb2d93bcc346b15cab" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "battery-service-interface", "defmt 0.3.100", @@ -112,8 +98,6 @@ dependencies = [ "embassy-sync", "embassy-time", "embedded-batteries-async", - "embedded-hal 1.0.0", - "embedded-hal-async", "embedded-services", "odp-service-common", "power-policy-interface", @@ -122,7 +106,7 @@ dependencies = [ [[package]] name = "battery-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#83646b1194684dc6b1b550bb2d93bcc346b15cab" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embedded-batteries-async", @@ -131,24 +115,14 @@ dependencies = [ [[package]] name = "battery-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#83646b1194684dc6b1b550bb2d93bcc346b15cab" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "battery-service-interface", "defmt 0.3.100", - "embedded-batteries-async", "embedded-services", "num_enum", ] -[[package]] -name = "bincode" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740" -dependencies = [ - "unty", -] - [[package]] name = "bit-register" version = "0.1.0" @@ -169,26 +143,6 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f798d2d157e547aa99aab0967df39edd0b70307312b6f8bd2848e6abe40896e0" -[[package]] -name = "bitfield" -version = "0.19.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ba6517c6b0f2bf08be60e187ab64b038438f22dd755614d8fe4d4098c46419" -dependencies = [ - "bitfield-macros", -] - -[[package]] -name = "bitfield-macros" -version = "0.19.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f48d6ace212fdf1b45fd6b566bb40808415344642b76c3224c07c8df9da81e97" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "bitfield-struct" version = "0.12.1" @@ -403,7 +357,7 @@ dependencies = [ "bitvec", "convert_case", "dd-manifest-tree", - "itertools 0.14.0", + "itertools", "kdl", "proc-macro2", "quote", @@ -444,7 +398,6 @@ checksum = "5d0d3b15c9d7dc4fec1d8cb77112472fb008b3b28c51ad23838d83587a6d2f1e" dependencies = [ "cordyceps", "critical-section", - "defmt 1.0.1", "document-features", "embassy-executor-macros", "embassy-executor-timer-queue", @@ -540,15 +493,6 @@ dependencies = [ "embedded-hal 1.0.0", ] -[[package]] -name = "embedded-cfu-protocol" -version = "0.2.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-cfu#e0d776017cf34c902c9f2a2be0c75fe73a3a4dda" -dependencies = [ - "defmt 0.3.100", - "embedded-io-async 0.6.1", -] - [[package]] name = "embedded-crc-macros" version = "1.0.0" @@ -663,43 +607,18 @@ dependencies = [ [[package]] name = "embedded-services" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#83646b1194684dc6b1b550bb2d93bcc346b15cab" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "bitfield 0.17.0", - "bitflags 2.10.0", - "bitvec", - "cfg-if", "cortex-m", "critical-section", "defmt 0.3.100", - "document-features", "embassy-futures", "embassy-sync", - "embassy-time", - "embedded-cfu-protocol", - "embedded-hal-async", - "embedded-io 0.6.1", - "embedded-io-async 0.6.1", - "embedded-usb-pd", - "heapless 0.8.0", "mctp-rs", - "num_enum", "paste", "portable-atomic", "serde", - "uuid", -] - -[[package]] -name = "embedded-usb-pd" -version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-usb-pd#1a8e79d3a2ac0d2837a34b045087cf0863146f7d" -dependencies = [ - "aquamarine", - "bincode", - "bitfield 0.19.4", - "defmt 0.3.100", - "embedded-hal-async", ] [[package]] @@ -714,7 +633,7 @@ dependencies = [ [[package]] name = "espi-device" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#0d21aa34fd8691c6544533e6c72fe41824dc2fa8" +source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#09eda26a729738adbd177231600acdb981690375" dependencies = [ "bit-register", "bitflags 2.10.0", @@ -828,34 +747,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "include_dir" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" -dependencies = [ - "include_dir_macros", -] - -[[package]] -name = "include_dir_macros" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.14.0" @@ -931,7 +822,7 @@ dependencies = [ [[package]] name = "mctp-rs" version = "0.1.0" -source = "git+https://github.com/dymk/mctp-rs#3d941ba5205ca7781bf37e3dc7c5dfdc99a082d6" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "bit-register", "defmt 0.3.100", @@ -1079,7 +970,7 @@ dependencies = [ [[package]] name = "odp-service-common" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#83646b1194684dc6b1b550bb2d93bcc346b15cab" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "embedded-services", "static_cell", @@ -1126,6 +1017,8 @@ dependencies = [ "embedded-fans-async", "embedded-hal 1.0.0", "embedded-hal-async", + "embedded-io 0.7.1", + "embedded-io-async 0.7.0", "embedded-mcu-hal", "embedded-sensors-hal-async", "embedded-services", @@ -1148,15 +1041,13 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "power-policy-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#83646b1194684dc6b1b550bb2d93bcc346b15cab" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", - "embassy-futures", "embassy-sync", "embedded-batteries-async", "embedded-services", - "heapless 0.8.0", "num_enum", ] @@ -1397,7 +1288,7 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "thermal-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#83646b1194684dc6b1b550bb2d93bcc346b15cab" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1414,7 +1305,7 @@ dependencies = [ [[package]] name = "thermal-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#83646b1194684dc6b1b550bb2d93bcc346b15cab" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embassy-time", @@ -1425,7 +1316,7 @@ dependencies = [ [[package]] name = "thermal-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#83646b1194684dc6b1b550bb2d93bcc346b15cab" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embedded-services", @@ -1466,11 +1357,9 @@ dependencies = [ [[package]] name = "time-alarm-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#83646b1194684dc6b1b550bb2d93bcc346b15cab" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ - "bitfield 0.17.0", "defmt 0.3.100", - "embassy-executor", "embassy-futures", "embassy-sync", "embassy-time", @@ -1484,7 +1373,7 @@ dependencies = [ [[package]] name = "time-alarm-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#83646b1194684dc6b1b550bb2d93bcc346b15cab" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", @@ -1496,7 +1385,7 @@ dependencies = [ [[package]] name = "time-alarm-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#83646b1194684dc6b1b550bb2d93bcc346b15cab" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" dependencies = [ "defmt 0.3.100", "embedded-mcu-hal", @@ -1584,12 +1473,6 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" -[[package]] -name = "unty" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae" - [[package]] name = "uuid" version = "1.17.0" diff --git a/platform/platform-common/Cargo.toml b/platform/platform-common/Cargo.toml index 48b3ccc..3627a99 100644 --- a/platform/platform-common/Cargo.toml +++ b/platform/platform-common/Cargo.toml @@ -49,6 +49,8 @@ odp-service-common = { git = "https://github.com/OpenDevicePartnership/embedded- embedded-hal = "1.0.0" embedded-hal-async = "1.0.0" +embedded-io = "0.7.1" +embedded-io-async = "0.7.0" embedded-batteries-async = "0.3.4" embedded-sensors-hal-async = "0.3.0" embedded-fans-async = "0.2.0" From ec062ee006a14129088b7bd8bac02de714c3b691 Mon Sep 17 00:00:00 2001 From: Kurtis Dinelle Date: Wed, 13 May 2026 10:21:08 -0700 Subject: [PATCH 2/3] Remove unused embedded-io-async dep --- platform/dev-npcx/Cargo.lock | 1 - platform/dev-npcx/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/platform/dev-npcx/Cargo.lock b/platform/dev-npcx/Cargo.lock index 901697c..b32de60 100644 --- a/platform/dev-npcx/Cargo.lock +++ b/platform/dev-npcx/Cargo.lock @@ -286,7 +286,6 @@ dependencies = [ "embassy-executor", "embassy-npcx", "embassy-time", - "embedded-io-async 0.6.1", "panic-probe", "platform-common", "static_cell", diff --git a/platform/dev-npcx/Cargo.toml b/platform/dev-npcx/Cargo.toml index 0901f35..ce702bb 100644 --- a/platform/dev-npcx/Cargo.toml +++ b/platform/dev-npcx/Cargo.toml @@ -57,7 +57,6 @@ embassy-executor = { version = "0.10.0", features = [ "executor-thread", "defmt", ] } -embedded-io-async = "0.6" panic-probe = { version = "1.0", features = ["print-defmt"] } static_cell = "2.1.0" uart-service = { git = "https://github.com/OpenDevicePartnership/embedded-services", branch = "v0.2.0", features = [ From 5187bdf2f1bc66d8a4152b1c093ba8b1fb435dd8 Mon Sep 17 00:00:00 2001 From: Kurtis Dinelle Date: Thu, 14 May 2026 14:28:45 -0700 Subject: [PATCH 3/3] Add cargo-vet audits and refresh imports for updated embassy dependencies Assisted-by: copilot-cli:claude-opus-4.6 cargo-vet --- platform/dev-imxrt/supply-chain/audits.toml | 7 + platform/dev-imxrt/supply-chain/config.toml | 176 -------- platform/dev-imxrt/supply-chain/imports.lock | 439 ++++++++++++++++++- platform/dev-mcxa/supply-chain/audits.toml | 77 +++- platform/dev-mcxa/supply-chain/config.toml | 28 -- platform/dev-mcxa/supply-chain/imports.lock | 211 +++++++++ platform/dev-npcx/supply-chain/audits.toml | 12 +- platform/dev-npcx/supply-chain/config.toml | 152 +------ platform/dev-npcx/supply-chain/imports.lock | 402 +++++++++++++++-- platform/dev-qemu/supply-chain/config.toml | 112 ----- platform/dev-qemu/supply-chain/imports.lock | 364 +++++++++++++-- 11 files changed, 1408 insertions(+), 572 deletions(-) diff --git a/platform/dev-imxrt/supply-chain/audits.toml b/platform/dev-imxrt/supply-chain/audits.toml index 4d3b6fc..3dd474c 100644 --- a/platform/dev-imxrt/supply-chain/audits.toml +++ b/platform/dev-imxrt/supply-chain/audits.toml @@ -16,6 +16,13 @@ who = "Billy Price " criteria = "safe-to-deploy" delta = "0.7.0 -> 0.8.0" +[[audits.embassy-imxrt]] +who = "Kurtis Dinelle " +criteria = "safe-to-deploy" +version = "0.1.0@git:f3be03ca74bfefb062b4536848c2f1d1b7e06186" +importable = false +notes = "ODP-owned crate, internal dependency. Assisted-by: copilot-cli:claude-opus-4.6 cargo-vet" + [[audits.libc]] who = "Billy Price " criteria = "safe-to-deploy" diff --git a/platform/dev-imxrt/supply-chain/config.toml b/platform/dev-imxrt/supply-chain/config.toml index d97ad79..cc7358d 100644 --- a/platform/dev-imxrt/supply-chain/config.toml +++ b/platform/dev-imxrt/supply-chain/config.toml @@ -23,46 +23,10 @@ audit-as-crates-io = true version = "1.1.4" criteria = "safe-to-deploy" -[[exemptions.autocfg]] -version = "1.5.0" -criteria = "safe-to-deploy" - [[exemptions.az]] version = "1.3.0" criteria = "safe-to-deploy" -[[exemptions.bincode]] -version = "2.0.1" -criteria = "safe-to-deploy" - -[[exemptions.bitfield]] -version = "0.15.0" -criteria = "safe-to-deploy" - -[[exemptions.bitfield]] -version = "0.17.0" -criteria = "safe-to-deploy" - -[[exemptions.bitfield]] -version = "0.19.4" -criteria = "safe-to-deploy" - -[[exemptions.bitfield-macros]] -version = "0.19.4" -criteria = "safe-to-deploy" - -[[exemptions.bitfield-struct]] -version = "0.12.1" -criteria = "safe-to-deploy" - -[[exemptions.bitflags]] -version = "2.11.0" -criteria = "safe-to-deploy" - -[[exemptions.bitvec]] -version = "1.0.1" -criteria = "safe-to-deploy" - [[exemptions.bq40z50-rx]] version = "0.8.1" criteria = "safe-to-deploy" @@ -79,14 +43,6 @@ criteria = "safe-to-deploy" version = "1.0.4" criteria = "safe-to-deploy" -[[exemptions.cordyceps]] -version = "0.3.4" -criteria = "safe-to-deploy" - -[[exemptions.crunchy]] -version = "0.2.4" -criteria = "safe-to-deploy" - [[exemptions.darling]] version = "0.20.11" criteria = "safe-to-deploy" @@ -99,10 +55,6 @@ criteria = "safe-to-deploy" version = "0.20.11" criteria = "safe-to-deploy" -[[exemptions.defmt]] -version = "0.3.100" -criteria = "safe-to-deploy" - [[exemptions.defmt-rtt]] version = "0.4.2" criteria = "safe-to-deploy" @@ -115,10 +67,6 @@ criteria = "safe-to-deploy" version = "0.2.12" criteria = "safe-to-deploy" -[[exemptions.embassy-embedded-hal]] -version = "0.6.0" -criteria = "safe-to-deploy" - [[exemptions.embassy-executor]] version = "0.9.1" criteria = "safe-to-deploy" @@ -127,78 +75,10 @@ criteria = "safe-to-deploy" version = "0.7.0" criteria = "safe-to-deploy" -[[exemptions.embassy-futures]] -version = "0.1.2" -criteria = "safe-to-deploy" - -[[exemptions.embassy-hal-internal]] -version = "0.3.0" -criteria = "safe-to-deploy" - -[[exemptions.embassy-hal-internal]] -version = "0.4.0" -criteria = "safe-to-deploy" - -[[exemptions.embassy-imxrt]] -version = "0.1.0@git:d95ffe560071e942d917b422bbdea7e73f6c4602" -criteria = "safe-to-deploy" - -[[exemptions.embassy-sync]] -version = "0.8.0" -criteria = "safe-to-deploy" - -[[exemptions.embassy-sync]] -version = "0.8.0@git:6b015329e6784d084c1b589ba31af7a7dee13a7e" -criteria = "safe-to-deploy" - -[[exemptions.embassy-time]] -version = "0.5.1" -criteria = "safe-to-deploy" - -[[exemptions.embassy-time-driver]] -version = "0.2.2" -criteria = "safe-to-deploy" - -[[exemptions.embedded-hal]] -version = "1.0.0" -criteria = "safe-to-deploy" - -[[exemptions.embedded-hal-async]] -version = "1.0.0" -criteria = "safe-to-deploy" - -[[exemptions.embedded-hal-nb]] -version = "1.0.0" -criteria = "safe-to-deploy" - -[[exemptions.embedded-io]] -version = "0.7.1" -criteria = "safe-to-deploy" - -[[exemptions.embedded-io-async]] -version = "0.6.1" -criteria = "safe-to-deploy" - -[[exemptions.embedded-io-async]] -version = "0.7.0" -criteria = "safe-to-deploy" - -[[exemptions.embedded-mcu-hal]] -version = "0.1.0@git:6956ebdaf9d3725959dae2c57c2ab6baefae9330" -criteria = "safe-to-deploy" - [[exemptions.embedded-sensors-hal]] version = "0.1.1" criteria = "safe-to-deploy" -[[exemptions.embedded-storage]] -version = "0.3.1" -criteria = "safe-to-deploy" - -[[exemptions.embedded-storage-async]] -version = "0.4.1" -criteria = "safe-to-deploy" - [[exemptions.find-msvc-tools]] version = "0.1.9" criteria = "safe-to-deploy" @@ -207,10 +87,6 @@ criteria = "safe-to-deploy" version = "1.31.0" criteria = "safe-to-deploy" -[[exemptions.funty]] -version = "2.0.0" -criteria = "safe-to-deploy" - [[exemptions.futures-core]] version = "0.3.32" criteria = "safe-to-deploy" @@ -227,18 +103,6 @@ criteria = "safe-to-deploy" version = "2.7.1" criteria = "safe-to-deploy" -[[exemptions.hash32]] -version = "0.3.1" -criteria = "safe-to-deploy" - -[[exemptions.heapless]] -version = "0.8.0" -criteria = "safe-to-deploy" - -[[exemptions.heapless]] -version = "0.9.2" -criteria = "safe-to-deploy" - [[exemptions.ident_case]] version = "1.0.1" criteria = "safe-to-deploy" @@ -259,22 +123,6 @@ criteria = "safe-to-deploy" version = "2.8.0" criteria = "safe-to-deploy" -[[exemptions.mimxrt600-fcb]] -version = "0.2.2" -criteria = "safe-to-deploy" - -[[exemptions.mycelium-bitfield]] -version = "0.1.5" -criteria = "safe-to-deploy" - -[[exemptions.num_enum]] -version = "0.7.6" -criteria = "safe-to-deploy" - -[[exemptions.num_enum_derive]] -version = "0.7.6" -criteria = "safe-to-deploy" - [[exemptions.once_cell]] version = "1.21.4" criteria = "safe-to-deploy" @@ -295,18 +143,6 @@ criteria = "safe-to-deploy" version = "1.13.1" criteria = "safe-to-deploy" -[[exemptions.proc-macro2]] -version = "1.0.106" -criteria = "safe-to-deploy" - -[[exemptions.quote]] -version = "1.0.45" -criteria = "safe-to-deploy" - -[[exemptions.radium]] -version = "0.7.0" -criteria = "safe-to-deploy" - [[exemptions.regex-automata]] version = "0.4.14" criteria = "safe-to-deploy" @@ -331,10 +167,6 @@ criteria = "safe-to-deploy" version = "2.0.117" criteria = "safe-to-deploy" -[[exemptions.tap]] -version = "1.0.1" -criteria = "safe-to-deploy" - [[exemptions.thiserror]] version = "2.0.18" criteria = "safe-to-deploy" @@ -367,10 +199,6 @@ criteria = "safe-to-deploy" version = "1.0.24" criteria = "safe-to-deploy" -[[exemptions.unty]] -version = "0.0.4" -criteria = "safe-to-deploy" - [[exemptions.windows-link]] version = "0.2.1" criteria = "safe-to-deploy" @@ -383,10 +211,6 @@ criteria = "safe-to-deploy" version = "0.61.2" criteria = "safe-to-deploy" -[[exemptions.wyz]] -version = "0.5.1" -criteria = "safe-to-deploy" - [[exemptions.zerocopy]] version = "0.8.48" criteria = "safe-to-deploy" diff --git a/platform/dev-imxrt/supply-chain/imports.lock b/platform/dev-imxrt/supply-chain/imports.lock index 90bcf24..5e7543a 100644 --- a/platform/dev-imxrt/supply-chain/imports.lock +++ b/platform/dev-imxrt/supply-chain/imports.lock @@ -1,10 +1,11 @@ # cargo-vet imports lock -[[audits.OpenDevicePartnership.audits.aquamarine]] -who = "Robert Zieba " +[[audits.OpenDevicePartnership.audits.autocfg]] +who = "Jerry Xie " criteria = "safe-to-deploy" -version = "0.6.0" +delta = "1.4.0 -> 1.5.0" +notes = "No unsafe, no build.rs, no network access; delta adds edition-aware rustc probing and best-effort probe-file cleanup only. Assisted-by: copilot-cli:GPT-5.3-Codex cargo-vet" aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" [[audits.OpenDevicePartnership.audits.bare-metal]] @@ -19,6 +20,41 @@ criteria = "safe-to-deploy" version = "0.13.2" aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/mcxa-pac/refs/heads/main/supply-chain/audits.toml" +[[audits.OpenDevicePartnership.audits.bitfield]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +delta = "0.13.2 -> 0.15.0" +notes = "Delta audit: BitRange/Bit traits split into read-only and mutable variants (BitRangeMut/BitMut); added mask constant generation; clippy fixes; MSRV bump. No unsafe, no build script, no proc macros, no powerful imports. Assisted-by: copilot-cli:claude-opus-4.6 cargo-vet" +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" + +[[audits.OpenDevicePartnership.audits.bitfield]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +delta = "0.15.0 -> 0.17.0" +notes = "Delta: adds bitwise op derives, constructor derives, arbitrary visibility. Pure declarative macros. No unsafe, no build script. Assisted-by: copilot-cli:claude-opus-4.6 cargo-vet" +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" + +[[audits.OpenDevicePartnership.audits.bitfield-struct]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +version = "0.10.1" +notes = "Proc-macro crate generating safe bitfield structs. No unsafe, no build script. Standard proc-macro deps only. Assisted-by: copilot-cli:claude-opus-4.6 cargo-vet" +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" + +[[audits.OpenDevicePartnership.audits.bitfield-struct]] +who = "matteotullo " +criteria = "safe-to-deploy" +delta = "0.10.1 -> 0.12.1" +notes = "Adds hash and bitenum derives, mostly parsing and refactoring changes. No code execution nor writing to the filesystem." +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" + +[[audits.OpenDevicePartnership.audits.cordyceps]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +version = "0.3.4" +notes = "Intrusive data structures crate (no_std). ~115 unsafe blocks, all necessary for intrusive linked list/queue/stack ops. Correct patterns: addr_of_mut, proper atomic orderings, Vyukov MPSC algorithm. No build script, no proc macros, no powerful imports. Assisted-by: copilot-cli:claude-opus-4.6 cargo-vet" +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" + [[audits.OpenDevicePartnership.audits.cortex-m]] who = "Felipe Balbi " criteria = "safe-to-deploy" @@ -43,6 +79,20 @@ criteria = "safe-to-deploy" version = "1.2.0" aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/mcxa-pac/refs/heads/main/supply-chain/audits.toml" +[[audits.OpenDevicePartnership.audits.crunchy]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +delta = "0.2.3 -> 0.2.4" +notes = "Tiny diff to use newer core/std features via build.rs env var for path separator; no safety impact. Assisted-by: copilot-cli:GPT-5.3-Codex cargo-vet" +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" + +[[audits.OpenDevicePartnership.audits.defmt]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +version = "0.3.100" +notes = "Compatibility shim: no_std crate that re-exports defmt 1.x items for 0.3 API compatibility. No unsafe code, no build script, no powerful imports, no logic - pure pub-use re-exports. Assisted-by: copilot-cli:claude-opus-4.6 cargo-vet" +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" + [[audits.OpenDevicePartnership.audits.defmt]] who = "Felipe Balbi " criteria = "safe-to-deploy" @@ -61,18 +111,93 @@ criteria = "safe-to-deploy" version = "1.0.0" aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/mcxa-pac/refs/heads/main/supply-chain/audits.toml" +[[audits.OpenDevicePartnership.audits.embassy-embedded-hal]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +version = "0.5.0" +notes = "No unsafe, no build script, no proc macros. no_std shared bus/flash partition utilities for embedded-hal traits. Assisted-by: copilot-cli:claude-opus-4.6 cargo-vet" +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" + +[[audits.OpenDevicePartnership.audits.embassy-embedded-hal]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +delta = "0.5.0 -> 0.6.0" +notes = "Edition 2024. Dependency updates (embassy-sync 0.8.0, embassy-hal-internal 0.4.0). Added defmt feature. Shared I2c impl Clone. Code improvements using .any(). Trusted publisher (lulf)." +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embassy-imxrt/refs/heads/main/supply-chain/audits.toml" + [[audits.OpenDevicePartnership.audits.embassy-executor-timer-queue]] who = "Felipe Balbi " criteria = "safe-to-deploy" version = "0.1.0" aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embassy-imxrt/refs/heads/main/supply-chain/audits.toml" +[[audits.OpenDevicePartnership.audits.embassy-futures]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +version = "0.1.2" +notes = "no_std future combinators. All unsafe is pin-projection and no-op RawWaker - reviewed and sound. Assisted-by: copilot-cli:claude-opus-4.6 cargo-vet" +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" + +[[audits.OpenDevicePartnership.audits.embassy-hal-internal]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +version = "0.3.0" +notes = "no_std HAL internals. Unsafe in atomic ring buffer (sound SPSC), peripheral singletons, cortex-m interrupt priority. Build script emits cfg flags only. Assisted-by: copilot-cli:claude-opus-4.6 cargo-vet" +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" + +[[audits.OpenDevicePartnership.audits.embassy-hal-internal]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +delta = "0.3.0 -> 0.4.0" +notes = "Edition update to 2024. Added defmt/log features and RingBuffer helper methods (available, is_half_full). Safe additions only. Trusted publisher (lulf)." +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embassy-imxrt/refs/heads/main/supply-chain/audits.toml" + +[[audits.OpenDevicePartnership.audits.embassy-sync]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +version = "0.8.0" +notes = "no_std async sync primitives. Substantial unsafe for UnsafeCell-based interiors and Send/Sync impls -- all reviewed and sound, guarded by RawMutex/critical_section. Build script only reads TARGET env var. No proc macros, no powerful imports. Assisted-by: copilot-cli:claude-opus-4.6 cargo-vet" +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" + +[[audits.OpenDevicePartnership.audits.embassy-time]] +who = "Felipe Balbi " +criteria = "safe-to-deploy" +version = "0.5.0" +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/tps6699x/refs/heads/main/supply-chain/audits.toml" + +[[audits.OpenDevicePartnership.audits.embassy-time]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +delta = "0.5.0 -> 0.5.1" +notes = "Edition 2024. Added nanosecond conversion methods, 375kHz tick rate. Dependency updates (embassy-executor 0.10.0, embassy-time-driver 0.2.2). Added log feature. Trusted publisher (lulf)." +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embassy-imxrt/refs/heads/main/supply-chain/audits.toml" + +[[audits.OpenDevicePartnership.audits.embassy-time-driver]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +version = "0.2.1" +notes = "no_std driver trait for embassy-time. Minimal unsafe for extern Rust FFI calls (sound via links key). Empty build.rs. Assisted-by: copilot-cli:claude-opus-4.6 cargo-vet" +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" + +[[audits.OpenDevicePartnership.audits.embassy-time-driver]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +delta = "0.2.1 -> 0.2.2" +notes = "Rust 2024 edition update with 375kHz tick rate feature. Empty build.rs, no unsafe code, no powerful imports." +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" + [[audits.OpenDevicePartnership.audits.embassy-time-queue-utils]] who = "Felipe Balbi " criteria = "safe-to-deploy" version = "0.3.0" aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embassy-imxrt/refs/heads/main/supply-chain/audits.toml" +[[audits.OpenDevicePartnership.audits.embassy-time-queue-utils]] +who = "Felipe Balbi " +criteria = "safe-to-deploy" +delta = "0.3.0 -> 0.3.2" +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embassy-imxrt/refs/heads/main/supply-chain/audits.toml" + [[audits.OpenDevicePartnership.audits.embedded-batteries]] who = "matteotullo " criteria = "safe-to-deploy" @@ -113,6 +238,48 @@ criteria = "safe-to-deploy" version = "0.2.7" aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/mcxa-pac/refs/heads/main/supply-chain/audits.toml" +[[audits.OpenDevicePartnership.audits.embedded-hal]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +delta = "0.2.7 -> 1.0.0" +notes = "Pure no_std trait crate. Complete API redesign for 1.0: removed nb-based traits, CAN module, all unsafe code. Only defines traits/enums/types for digital, I2C, SPI, PWM, delay. No build script, no proc macros, no powerful imports. Assisted-by: copilot-cli:claude-opus-4.6 cargo-vet" +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" + +[[audits.OpenDevicePartnership.audits.embedded-hal-async]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +version = "1.0.0" +notes = "no_std async HAL trait definitions. No unsafe in library. Build script only runs rustc --version. Assisted-by: copilot-cli:claude-opus-4.6 cargo-vet" +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" + +[[audits.OpenDevicePartnership.audits.embedded-hal-nb]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +version = "1.0.0" +notes = "no_std trait-only crate. No unsafe, no build script, no proc macros, no powerful imports. Assisted-by: copilot-cli:claude-opus-4.6 cargo-vet" +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" + +[[audits.OpenDevicePartnership.audits.embedded-io]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +delta = "0.6.1 -> 0.7.1" +notes = "Add core::error::Error trait bound (MSRV 1.81). defmt 0.3->1.0. Implement ReadReady/WriteReady for slices and VecDeque. Add seek_relative(). Fix method forwardings. Trusted publisher (Dirbaio from Embedded WG)." +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embassy-imxrt/refs/heads/main/supply-chain/audits.toml" + +[[audits.OpenDevicePartnership.audits.embedded-io-async]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +version = "0.6.1" +notes = "No unsafe. Build script only detects nightly via rustc --version. Pure async trait definitions for embedded I/O. Assisted-by: copilot-cli:claude-opus-4.6 cargo-vet" +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" + +[[audits.OpenDevicePartnership.audits.embedded-io-async]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +delta = "0.6.1 -> 0.7.0" +notes = "Delta 0.6.1->0.7.0: No unsafe. Build script removed (AFIT now stable). flush() made required, BufRead requires Read, new VecDeque impls. Assisted-by: copilot-cli:claude-opus-4.6 cargo-vet" +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" + [[audits.OpenDevicePartnership.audits.embedded-mcu-hal]] who = "Felipe Balbi " criteria = "safe-to-deploy" @@ -127,28 +294,45 @@ version = "0.3.0" notes = "ODP crates are always trusted." aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" -[[audits.OpenDevicePartnership.audits.heck]] -who = "Matteo Tullo " +[[audits.OpenDevicePartnership.audits.embedded-storage]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +version = "0.3.1" +notes = "Pure no_std storage abstraction traits. deny(unsafe_code), no build script, no dependencies, no powerful imports. Assisted-by: copilot-cli:claude-opus-4.6 cargo-vet" +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" + +[[audits.OpenDevicePartnership.audits.embedded-storage-async]] +who = "Jerry Xie " criteria = "safe-to-deploy" version = "0.4.1" +notes = "Pure no_std async trait definitions for NOR flash storage. No unsafe code, no build script, no powerful imports. Only dependency is embedded-storage. Assisted-by: copilot-cli:claude-opus-4.6 cargo-vet" aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" -[[audits.OpenDevicePartnership.audits.include_dir]] -who = "Robert Zieba " +[[audits.OpenDevicePartnership.audits.hash32]] +who = "Jerry Xie " criteria = "safe-to-deploy" -version = "0.7.4" +version = "0.3.1" +notes = "no_std 32-bit hashing (FNV, MurmurHash3). ~10 unsafe blocks in murmur3.rs for MaybeUninit buffer handling - all sound. Assisted-by: copilot-cli:claude-opus-4.6 cargo-vet" aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" -[[audits.OpenDevicePartnership.audits.include_dir_macros]] -who = "Robert Zieba " +[[audits.OpenDevicePartnership.audits.heapless]] +who = "Jerry Xie " criteria = "safe-to-deploy" -version = "0.7.4" +version = "0.8.0" +notes = "no_std fixed-capacity data structures. Extensive unsafe for MaybeUninit buffer management, lock-free queues (Vyukov MPMC, SPSC), and Treiber stack memory pools with ABA prevention. Patterns mirror std or published algorithms. Build script probes for atomic/LLSC support. Assisted-by: copilot-cli:claude-opus-4.6 cargo-vet" aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" -[[audits.OpenDevicePartnership.audits.itertools]] -who = "Robert Zieba " +[[audits.OpenDevicePartnership.audits.heapless]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +version = "0.9.2" +notes = "no_std fixed-capacity data structures. Extensive unsafe for MaybeUninit buffers, lock-free queues (Vyukov MPMC, SPSC), Treiber stack pools with ABA prevention (CAS tagged pointers + ARM LLSC). All Send/Sync bounds verified correct. Build script probes for ARM LLSC. Assisted-by: copilot-cli:claude-opus-4.6 cargo-vet" +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" + +[[audits.OpenDevicePartnership.audits.heck]] +who = "Matteo Tullo " criteria = "safe-to-deploy" -version = "0.10.5" +version = "0.4.1" aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" [[audits.OpenDevicePartnership.audits.itertools]] @@ -164,6 +348,19 @@ criteria = "safe-to-deploy" delta = "0.1.0 -> 0.2.0" aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" +[[audits.OpenDevicePartnership.audits.mimxrt600-fcb]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +version = "0.2.1" +notes = "Pure no_std data-definition crate for MIMXRT600 flash config blocks. No unsafe, no build script. Assisted-by: copilot-cli:claude-opus-4.6 cargo-vet" +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" + +[[audits.OpenDevicePartnership.audits.mimxrt600-fcb]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +delta = "0.2.1 -> 0.2.2" +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embassy-imxrt/refs/heads/main/supply-chain/audits.toml" + [[audits.OpenDevicePartnership.audits.mimxrt633s-pac]] who = "Felipe Balbi " criteria = "safe-to-deploy" @@ -182,6 +379,32 @@ criteria = "safe-to-deploy" delta = "0.46.0 -> 0.50.1" aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" +[[audits.OpenDevicePartnership.audits.num_enum]] +who = "Billy Price " +criteria = "safe-to-deploy" +version = "0.7.5" +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embassy-imxrt/refs/heads/main/supply-chain/audits.toml" + +[[audits.OpenDevicePartnership.audits.num_enum]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +delta = "0.7.5 -> 0.7.6" +notes = "Version bump with test infrastructure updates. No unsafe code, no build script, no powerful imports. Purely additive test changes." +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" + +[[audits.OpenDevicePartnership.audits.num_enum_derive]] +who = "Billy Price " +criteria = "safe-to-deploy" +version = "0.7.5" +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embassy-imxrt/refs/heads/main/supply-chain/audits.toml" + +[[audits.OpenDevicePartnership.audits.num_enum_derive]] +who = "Jerry Xie " +criteria = "safe-to-deploy" +delta = "0.7.5 -> 0.7.6" +notes = "Minor update adding byte literal support for enum discriminants. No unsafe code, no build script, no powerful imports." +aggregated-from = "https://raw.githubusercontent.com/OpenDevicePartnership/embedded-services/refs/heads/main/supply-chain/audits.toml" + [[audits.OpenDevicePartnership.audits.proc-macro-error-attr2]] who = "Felipe Balbi " criteria = "safe-to-deploy" @@ -414,6 +637,13 @@ This is a standard adapter between the `log` ecosystem and the `tracing` ecosystem. There's one `unsafe` block in this crate and it's well-scoped. """ +[[audits.google.audits.autocfg]] +who = "Manish Goregaokar " +criteria = "safe-to-deploy" +version = "1.4.0" +notes = "Contains no unsafe" +aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" + [[audits.google.audits.bitflags]] who = "Lukasz Anforowicz " criteria = "safe-to-deploy" @@ -530,6 +760,169 @@ criteria = "safe-to-deploy" delta = "1.0.0 -> 1.1.0" aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/refs/heads/main/cargo-vet/audits.toml?format=TEXT" +[[audits.google.audits.proc-macro2]] +who = "Lukasz Anforowicz " +criteria = "safe-to-deploy" +version = "1.0.78" +notes = """ +Grepped for "crypt", "cipher", "fs", "net" - there were no hits +(except for a benign "fs" hit in a doc comment) + +Notes from the `unsafe` review can be found in https://crrev.com/c/5385745. +""" +aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" + +[[audits.google.audits.proc-macro2]] +who = "Adrian Taylor " +criteria = "safe-to-deploy" +delta = "1.0.78 -> 1.0.79" +aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" + +[[audits.google.audits.proc-macro2]] +who = "Adrian Taylor " +criteria = "safe-to-deploy" +delta = "1.0.79 -> 1.0.80" +aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" + +[[audits.google.audits.proc-macro2]] +who = "Dustin J. Mitchell " +criteria = "safe-to-deploy" +delta = "1.0.80 -> 1.0.81" +notes = "Comment changes only" +aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" + +[[audits.google.audits.proc-macro2]] +who = "danakj " +criteria = "safe-to-deploy" +delta = "1.0.81 -> 1.0.82" +aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" + +[[audits.google.audits.proc-macro2]] +who = "Dustin J. Mitchell " +criteria = "safe-to-deploy" +delta = "1.0.82 -> 1.0.83" +notes = "Substantive change is replacing String with Box, saving memory." +aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" + +[[audits.google.audits.proc-macro2]] +who = "Lukasz Anforowicz " +criteria = "safe-to-deploy" +delta = "1.0.83 -> 1.0.84" +notes = "Only doc comment changes in `src/lib.rs`." +aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" + +[[audits.google.audits.proc-macro2]] +who = "danakj@chromium.org" +criteria = "safe-to-deploy" +delta = "1.0.84 -> 1.0.85" +notes = "Test-only changes." +aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" + +[[audits.google.audits.proc-macro2]] +who = "Lukasz Anforowicz " +criteria = "safe-to-deploy" +delta = "1.0.85 -> 1.0.86" +notes = """ +Comment-only changes in `build.rs`. +Reordering of `Cargo.toml` entries. +Just bumping up the version number in `lib.rs`. +Config-related changes in `test_size.rs`. +""" +aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" + +[[audits.google.audits.proc-macro2]] +who = "danakj " +criteria = "safe-to-deploy" +delta = "1.0.86 -> 1.0.87" +notes = "No new unsafe interactions." +aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT" + +[[audits.google.audits.proc-macro2]] +who = "Liza Burakova