diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index d61a456..ec13dd2 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -333,7 +333,7 @@ jobs: # if there are breaking changes in `ec-test-cli` # # We can update this commit when we want to pull in a new `ec-test-cli` - EC_TEST_CLI_REV: e674ca93 + EC_TEST_CLI_REV: d705cd4f steps: - uses: actions/checkout@v4 diff --git a/platform/dev-imxrt/Cargo.lock b/platform/dev-imxrt/Cargo.lock index 7b17660..886ef38 100644 --- a/platform/dev-imxrt/Cargo.lock +++ b/platform/dev-imxrt/Cargo.lock @@ -35,7 +35,7 @@ dependencies = [ [[package]] name = "battery-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "battery-service-interface", "defmt 0.3.100", @@ -51,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#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embedded-batteries-async", @@ -60,7 +60,7 @@ dependencies = [ [[package]] name = "battery-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "battery-service-interface", "defmt 0.3.100", @@ -144,9 +144,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.2.60" +version = "1.2.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20" +checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98" dependencies = [ "find-msvc-tools", "shlex", @@ -254,14 +254,14 @@ version = "0.3.100" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0963443817029b2024136fc4dd07a5107eb8f977eaf18fcd1fdeb11306b64ad" dependencies = [ - "defmt 1.0.1", + "defmt 1.1.0", ] [[package]] name = "defmt" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "548d977b6da32fa1d1fda2876453da1e7df63ad0304c8b3dae4dbe7b96f39b78" +checksum = "a6e524506490a1953d237cb87b1cfc1e46f88c18f10a22dfe0f507dc6bfc7f7f" dependencies = [ "bitflags 1.3.2", "defmt-macros", @@ -269,9 +269,9 @@ dependencies = [ [[package]] name = "defmt-macros" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d4fc12a85bcf441cfe44344c4b72d58493178ce635338a3f3b78943aceb258e" +checksum = "f0a27770e9c8f719a79d8b638281f4d828f77d8fd61e0bd94451b9b85e576a0b" dependencies = [ "defmt-parser", "proc-macro-error2", @@ -318,9 +318,9 @@ dependencies = [ [[package]] name = "device-driver" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3aa3d97b2acf349b9d52c75470e2ccfc7224c49597ec12c2fb0e28826e910495" +checksum = "c2e4547bd66511372d2a38ac3c1b2892c7ebf83cf0d5411c3406e496c85a1d96" dependencies = [ "embedded-io 0.6.1", "embedded-io-async 0.6.1", @@ -337,9 +337,9 @@ dependencies = [ [[package]] name = "either" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e" [[package]] name = "embassy-embedded-hal" @@ -368,7 +368,7 @@ dependencies = [ "cordyceps", "cortex-m", "critical-section", - "defmt 1.0.1", + "defmt 1.1.0", "document-features", "embassy-executor-macros", "embassy-executor-timer-queue", @@ -406,7 +406,7 @@ checksum = "95285007a91b619dc9f26ea8f55452aa6c60f7115a4edc05085cd2bd3127cd7a" dependencies = [ "cortex-m", "critical-section", - "defmt 1.0.1", + "defmt 1.1.0", "num-traits", ] @@ -422,13 +422,13 @@ dependencies = [ [[package]] name = "embassy-imxrt" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embassy-imxrt#f3be03ca74bfefb062b4536848c2f1d1b7e06186" +source = "git+https://github.com/OpenDevicePartnership/embassy-imxrt#6524cbabcc12016f1aea4c0ffa2f1354c3f8c6d1" dependencies = [ "cfg-if", "cortex-m", "cortex-m-rt", "critical-section", - "defmt 1.0.1", + "defmt 1.1.0", "document-features", "embassy-embedded-hal", "embassy-futures", @@ -466,11 +466,11 @@ checksum = "7bbd85cf5a5ae56bdf26f618364af642d1d0a4e245cdd75cd9aabda382f65a81" dependencies = [ "cfg-if", "critical-section", - "defmt 1.0.1", + "defmt 1.1.0", "embedded-io-async 0.7.0", "futures-core", "futures-sink", - "heapless 0.9.2", + "heapless", ] [[package]] @@ -481,7 +481,7 @@ checksum = "592b0c143ec626e821d4d90da51a2bd91d559d6c442b7c74a47d368c9e23d97a" dependencies = [ "cfg-if", "critical-section", - "defmt 1.0.1", + "defmt 1.1.0", "document-features", "embassy-time-driver", "embedded-hal 0.2.7", @@ -506,7 +506,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168297bf80aaf114b3c9ad589bf38b01b3009b9af7f97cd18086c5bbf96f5693" dependencies = [ "embassy-executor-timer-queue", - "heapless 0.9.2", + "heapless", ] [[package]] @@ -546,7 +546,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e5007eb97aabfe3606c0b02823b3120e861c748ed3560756aa4fd231ef9ebf0" dependencies = [ - "defmt 1.0.1", + "defmt 1.1.0", ] [[package]] @@ -555,7 +555,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bafd19dc3b6aaa5027856818e19ccbfe84ebfb094c8a0ecf84a20e75c3b8e959" dependencies = [ - "defmt 1.0.1", + "defmt 1.1.0", "embedded-fans", ] @@ -630,7 +630,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f02b992c2b871b7fc616e4539258d92ea8b085e2f09cc0ad2862aa4d0e185ad1" dependencies = [ - "defmt 1.0.1", + "defmt 1.1.0", "num_enum", ] @@ -640,7 +640,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c703756bee31e7aaf55d8fb6dcf7337cfc231cfb4a3ad34b9df509846fd9001" dependencies = [ - "defmt 1.0.1", + "defmt 1.1.0", "paste", ] @@ -650,7 +650,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51c524a78b2804eca0d9ec05154e51d9af948b40cd0a6bbcc4d5832ff7e47b5b" dependencies = [ - "defmt 1.0.1", + "defmt 1.1.0", "embedded-sensors-hal", "paste", ] @@ -658,7 +658,7 @@ dependencies = [ [[package]] name = "embedded-services" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "bitfield 0.17.0", "cortex-m", @@ -690,7 +690,7 @@ dependencies = [ [[package]] name = "espi-device" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#09eda26a729738adbd177231600acdb981690375" +source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#54439c76d567fe8c65337cc4461c93a8a4fd434c" dependencies = [ "bit-register", "bitflags 2.11.1", @@ -773,19 +773,9 @@ dependencies = [ [[package]] name = "heapless" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" -dependencies = [ - "hash32", - "stable_deref_trait", -] - -[[package]] -name = "heapless" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af2455f757db2b292a9b1768c4b70186d443bcb3b316252d6b540aec1cd89ed" +checksum = "25ba4bd83f9415b58b4ed8dc5714c76e626a105be4646c02630ad730ad3b5aa4" dependencies = [ "hash32", "stable_deref_trait", @@ -820,9 +810,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.185" +version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f" +checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] name = "litrs" @@ -861,7 +851,7 @@ dependencies = [ [[package]] name = "mctp-rs" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "bit-register", "defmt 0.3.100", @@ -896,7 +886,7 @@ dependencies = [ "cortex-m", "cortex-m-rt", "critical-section", - "defmt 1.0.1", + "defmt 1.1.0", "vcell", ] @@ -909,7 +899,7 @@ dependencies = [ "cortex-m", "cortex-m-rt", "critical-section", - "defmt 1.0.1", + "defmt 1.1.0", "vcell", ] @@ -970,7 +960,7 @@ dependencies = [ [[package]] name = "odp-service-common" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "embedded-services", "static_cell", @@ -989,7 +979,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd402d00b0fb94c5aee000029204a46884b1262e0c443f166d86d2c0747e1a1a" dependencies = [ "cortex-m", - "defmt 1.0.1", + "defmt 1.1.0", ] [[package]] @@ -1045,7 +1035,7 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "power-policy-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", @@ -1238,7 +1228,7 @@ dependencies = [ [[package]] name = "storage_bus" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-mcu#528045934782abc704531aa423169c75016e7727" +source = "git+https://github.com/OpenDevicePartnership/embedded-mcu?tag=storage_bus_v0.1.0#8580385bf4a035299cacddef8796c17694655a17" [[package]] name = "strsim" @@ -1248,9 +1238,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subenum" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3d08fe7078c57309d5c3d938e50eba95ba1d33b9c3a101a8465fc6861a5416" +checksum = "5eee3fb942ed39f3971438fcc7e05e20717e599e14c5c7cb50edd0df2a44b274" dependencies = [ "heck", "proc-macro2", @@ -1272,7 +1262,7 @@ dependencies = [ [[package]] name = "thermal-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1281,7 +1271,7 @@ dependencies = [ "embedded-fans-async", "embedded-sensors-hal-async", "embedded-services", - "heapless 0.8.0", + "heapless", "odp-service-common", "thermal-service-interface", ] @@ -1289,7 +1279,7 @@ dependencies = [ [[package]] name = "thermal-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embassy-time", @@ -1300,7 +1290,7 @@ dependencies = [ [[package]] name = "thermal-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embedded-services", @@ -1341,7 +1331,7 @@ dependencies = [ [[package]] name = "time-alarm-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1357,7 +1347,7 @@ dependencies = [ [[package]] name = "time-alarm-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", @@ -1369,7 +1359,7 @@ dependencies = [ [[package]] name = "time-alarm-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embedded-mcu-hal", @@ -1441,14 +1431,14 @@ dependencies = [ [[package]] name = "typenum" -version = "1.19.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" +checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" [[package]] name = "uart-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embassy-sync", diff --git a/platform/dev-imxrt/src/main.rs b/platform/dev-imxrt/src/main.rs index 3d3a50a..edaed89 100644 --- a/platform/dev-imxrt/src/main.rs +++ b/platform/dev-imxrt/src/main.rs @@ -17,8 +17,8 @@ use static_cell::StaticCell; #[embassy_executor::task] async fn uart_service(uart: uart::Uart<'static, uart::Async>, relay: MockOdpRelayHandler) { info!("Starting uart service"); - static UART_SERVICE: StaticCell> = StaticCell::new(); - let uart_service = uart_service::Service::new(relay).unwrap(); + static UART_SERVICE: StaticCell> = StaticCell::new(); + let uart_service = uart_service::DefaultService::default_smbusespi(relay).unwrap(); let uart_service = UART_SERVICE.init(uart_service); let Err(e) = uart_service::task::uart_service(uart_service, uart).await; diff --git a/platform/dev-imxrt/supply-chain/config.toml b/platform/dev-imxrt/supply-chain/config.toml index cc7358d..16960e5 100644 --- a/platform/dev-imxrt/supply-chain/config.toml +++ b/platform/dev-imxrt/supply-chain/config.toml @@ -39,6 +39,10 @@ criteria = "safe-to-deploy" version = "1.2.59" criteria = "safe-to-deploy" +[[exemptions.cc]] +version = "1.2.62" +criteria = "safe-to-deploy" + [[exemptions.cfg-if]] version = "1.0.4" criteria = "safe-to-deploy" @@ -55,6 +59,14 @@ criteria = "safe-to-deploy" version = "0.20.11" criteria = "safe-to-deploy" +[[exemptions.defmt]] +version = "1.1.0" +criteria = "safe-to-deploy" + +[[exemptions.defmt-macros]] +version = "1.1.0" +criteria = "safe-to-deploy" + [[exemptions.defmt-rtt]] version = "0.4.2" criteria = "safe-to-deploy" @@ -63,10 +75,18 @@ criteria = "safe-to-deploy" version = "1.0.8" criteria = "safe-to-deploy" +[[exemptions.device-driver]] +version = "1.0.9" +criteria = "safe-to-deploy" + [[exemptions.document-features]] version = "0.2.12" criteria = "safe-to-deploy" +[[exemptions.either]] +version = "1.16.0" +criteria = "safe-to-deploy" + [[exemptions.embassy-executor]] version = "0.9.1" criteria = "safe-to-deploy" @@ -75,6 +95,10 @@ criteria = "safe-to-deploy" version = "0.7.0" criteria = "safe-to-deploy" +[[exemptions.embassy-imxrt]] +version = "0.1.0@git:6524cbabcc12016f1aea4c0ffa2f1354c3f8c6d1" +criteria = "safe-to-deploy" + [[exemptions.embedded-sensors-hal]] version = "0.1.1" criteria = "safe-to-deploy" @@ -103,6 +127,10 @@ criteria = "safe-to-deploy" version = "2.7.1" criteria = "safe-to-deploy" +[[exemptions.heapless]] +version = "0.9.3" +criteria = "safe-to-deploy" + [[exemptions.ident_case]] version = "1.0.1" criteria = "safe-to-deploy" @@ -111,6 +139,10 @@ criteria = "safe-to-deploy" version = "0.2.184" criteria = "safe-to-deploy" +[[exemptions.libc]] +version = "0.2.186" +criteria = "safe-to-deploy" + [[exemptions.litrs]] version = "1.0.0" criteria = "safe-to-deploy" @@ -163,6 +195,10 @@ criteria = "safe-to-deploy" version = "1.1.3" criteria = "safe-to-deploy" +[[exemptions.subenum]] +version = "1.2.0" +criteria = "safe-to-deploy" + [[exemptions.syn]] version = "2.0.117" criteria = "safe-to-deploy" @@ -195,6 +231,10 @@ criteria = "safe-to-deploy" version = "1.19.0" criteria = "safe-to-deploy" +[[exemptions.typenum]] +version = "1.20.0" +criteria = "safe-to-deploy" + [[exemptions.unicode-ident]] version = "1.0.24" criteria = "safe-to-deploy" diff --git a/platform/dev-mcxa/Cargo.lock b/platform/dev-mcxa/Cargo.lock index f18e9e6..b5fefc9 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#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" 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#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" 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#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "battery-service-interface", "defmt 0.3.100", @@ -137,9 +137,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.2.61" +version = "1.2.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16d90359e986641506914ba71350897565610e87ce0ad9e6f28569db3dd5c6d" +checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98" dependencies = [ "find-msvc-tools", "shlex", @@ -262,14 +262,14 @@ version = "0.3.100" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0963443817029b2024136fc4dd07a5107eb8f977eaf18fcd1fdeb11306b64ad" dependencies = [ - "defmt 1.0.1", + "defmt 1.1.0", ] [[package]] name = "defmt" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "548d977b6da32fa1d1fda2876453da1e7df63ad0304c8b3dae4dbe7b96f39b78" +checksum = "a6e524506490a1953d237cb87b1cfc1e46f88c18f10a22dfe0f507dc6bfc7f7f" dependencies = [ "bitflags 1.3.2", "defmt-macros", @@ -277,9 +277,9 @@ dependencies = [ [[package]] name = "defmt-macros" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d4fc12a85bcf441cfe44344c4b72d58493178ce635338a3f3b78943aceb258e" +checksum = "f0a27770e9c8f719a79d8b638281f4d828f77d8fd61e0bd94451b9b85e576a0b" dependencies = [ "defmt-parser", "proc-macro-error2", @@ -299,12 +299,12 @@ dependencies = [ [[package]] name = "defmt-rtt" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d5a25c99d89c40f5676bec8cefe0614f17f0f40e916f98e345dae941807f9e" +checksum = "c0f73a4a4a91609e977ae3b7bd831ffa292edfd42ad140a3244a61d805b0e05e" dependencies = [ "critical-section", - "defmt 1.0.1", + "defmt 1.1.0", ] [[package]] @@ -313,7 +313,7 @@ version = "0.1.0" dependencies = [ "cortex-m", "cortex-m-rt", - "defmt 1.0.1", + "defmt 1.1.0", "defmt-rtt", "embassy-executor", "embassy-mcxa", @@ -366,7 +366,7 @@ dependencies = [ "cordyceps", "cortex-m", "critical-section", - "defmt 1.0.1", + "defmt 1.1.0", "document-features", "embassy-executor-macros", "embassy-executor-timer-queue", @@ -413,7 +413,7 @@ dependencies = [ "cortex-m", "cortex-m-rt", "critical-section", - "defmt 1.0.1", + "defmt 1.1.0", "embassy-embedded-hal", "embassy-executor", "embassy-futures", @@ -430,7 +430,7 @@ dependencies = [ "embedded-io-async 0.7.0", "embedded-storage", "grounded", - "heapless 0.9.3", + "heapless", "indexmap", "maitake-sync", "nb 1.1.0", @@ -452,11 +452,11 @@ source = "git+https://github.com/embassy-rs/embassy?rev=bef4118731ac69092bee4489 dependencies = [ "cfg-if", "critical-section", - "defmt 1.0.1", + "defmt 1.1.0", "embedded-io-async 0.7.0", "futures-core", "futures-sink", - "heapless 0.9.3", + "heapless", ] [[package]] @@ -466,7 +466,7 @@ source = "git+https://github.com/embassy-rs/embassy?rev=bef4118731ac69092bee4489 dependencies = [ "cfg-if", "critical-section", - "defmt 1.0.1", + "defmt 1.1.0", "document-features", "embassy-time-driver", "embedded-hal 0.2.7", @@ -489,7 +489,7 @@ version = "0.3.2" source = "git+https://github.com/embassy-rs/embassy?rev=bef4118731ac69092bee4489240f59c89af0d944#bef4118731ac69092bee4489240f59c89af0d944" dependencies = [ "embassy-executor-timer-queue", - "heapless 0.9.3", + "heapless", ] [[package]] @@ -529,7 +529,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e5007eb97aabfe3606c0b02823b3120e861c748ed3560756aa4fd231ef9ebf0" dependencies = [ - "defmt 1.0.1", + "defmt 1.1.0", ] [[package]] @@ -538,7 +538,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bafd19dc3b6aaa5027856818e19ccbfe84ebfb094c8a0ecf84a20e75c3b8e959" dependencies = [ - "defmt 1.0.1", + "defmt 1.1.0", "embedded-fans", ] @@ -613,7 +613,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f02b992c2b871b7fc616e4539258d92ea8b085e2f09cc0ad2862aa4d0e185ad1" dependencies = [ - "defmt 1.0.1", + "defmt 1.1.0", "num_enum", ] @@ -623,7 +623,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c703756bee31e7aaf55d8fb6dcf7337cfc231cfb4a3ad34b9df509846fd9001" dependencies = [ - "defmt 1.0.1", + "defmt 1.1.0", "paste", ] @@ -633,7 +633,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51c524a78b2804eca0d9ec05154e51d9af948b40cd0a6bbcc4d5832ff7e47b5b" dependencies = [ - "defmt 1.0.1", + "defmt 1.1.0", "embedded-sensors-hal", "paste", ] @@ -641,7 +641,7 @@ dependencies = [ [[package]] name = "embedded-services" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "bitfield 0.17.0", "cortex-m", @@ -679,7 +679,7 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "espi-device" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#09eda26a729738adbd177231600acdb981690375" +source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#54439c76d567fe8c65337cc4461c93a8a4fd434c" dependencies = [ "bit-register", "bitflags 2.11.1", @@ -748,19 +748,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" - -[[package]] -name = "heapless" -version = "0.8.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" -dependencies = [ - "hash32", - "stable_deref_trait", -] +checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" [[package]] name = "heapless" @@ -859,7 +849,7 @@ dependencies = [ [[package]] name = "mctp-rs" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "bit-register", "defmt 0.3.100", @@ -956,7 +946,7 @@ dependencies = [ [[package]] name = "odp-service-common" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "embedded-services", "static_cell", @@ -975,7 +965,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd402d00b0fb94c5aee000029204a46884b1262e0c443f166d86d2c0747e1a1a" dependencies = [ "cortex-m", - "defmt 1.0.1", + "defmt 1.1.0", ] [[package]] @@ -986,18 +976,18 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pin-project" -version = "1.1.12" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf0d9e68100b3a7989b4901972f265cd542e560a3a8a724e1e20322f4d06ce9" +checksum = "2466b2336ed02bcdca6b294417127b90ec92038d1d5c4fbeac971a922e0e0924" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.12" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a990e22f43e84855daf260dded30524ef4a9021cc7541c26540500a50b624389" +checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b" dependencies = [ "proc-macro2", "quote", @@ -1054,7 +1044,7 @@ dependencies = [ [[package]] name = "power-policy-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", @@ -1300,7 +1290,7 @@ dependencies = [ [[package]] name = "thermal-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1309,7 +1299,7 @@ dependencies = [ "embedded-fans-async", "embedded-sensors-hal-async", "embedded-services", - "heapless 0.8.0", + "heapless", "odp-service-common", "thermal-service-interface", ] @@ -1317,7 +1307,7 @@ dependencies = [ [[package]] name = "thermal-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embassy-time", @@ -1328,7 +1318,7 @@ dependencies = [ [[package]] name = "thermal-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embedded-services", @@ -1369,7 +1359,7 @@ dependencies = [ [[package]] name = "time-alarm-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1385,7 +1375,7 @@ dependencies = [ [[package]] name = "time-alarm-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", @@ -1397,7 +1387,7 @@ dependencies = [ [[package]] name = "time-alarm-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embedded-mcu-hal", @@ -1470,7 +1460,7 @@ dependencies = [ [[package]] name = "uart-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embassy-sync", diff --git a/platform/dev-mcxa/src/main.rs b/platform/dev-mcxa/src/main.rs index 0dfac52..d894468 100644 --- a/platform/dev-mcxa/src/main.rs +++ b/platform/dev-mcxa/src/main.rs @@ -17,8 +17,8 @@ use static_cell::StaticCell; #[embassy_executor::task] 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(); + static UART_SERVICE: StaticCell> = StaticCell::new(); + let uart_service = uart_service::DefaultService::default_smbusespi(relay).unwrap(); let uart_service = UART_SERVICE.init(uart_service); let Err(e) = uart_service::task::uart_service(uart_service, uart).await; diff --git a/platform/dev-mcxa/supply-chain/config.toml b/platform/dev-mcxa/supply-chain/config.toml index b0da212..d460c26 100644 --- a/platform/dev-mcxa/supply-chain/config.toml +++ b/platform/dev-mcxa/supply-chain/config.toml @@ -73,6 +73,10 @@ criteria = "safe-to-deploy" version = "1.2.61" criteria = "safe-to-deploy" +[[exemptions.cc]] +version = "1.2.62" +criteria = "safe-to-deploy" + [[exemptions.cfg-if]] version = "1.0.4" criteria = "safe-to-deploy" @@ -117,10 +121,18 @@ criteria = "safe-to-deploy" version = "1.0.1" criteria = "safe-to-deploy" +[[exemptions.defmt]] +version = "1.1.0" +criteria = "safe-to-deploy" + [[exemptions.defmt-macros]] version = "1.0.1" criteria = "safe-to-deploy" +[[exemptions.defmt-macros]] +version = "1.1.0" +criteria = "safe-to-deploy" + [[exemptions.defmt-parser]] version = "1.0.0" criteria = "safe-to-deploy" @@ -129,6 +141,10 @@ criteria = "safe-to-deploy" version = "1.1.0" criteria = "safe-to-deploy" +[[exemptions.defmt-rtt]] +version = "1.2.0" +criteria = "safe-to-deploy" + [[exemptions.document-features]] version = "0.2.12" criteria = "safe-to-deploy" @@ -189,6 +205,10 @@ criteria = "safe-to-deploy" version = "0.17.0" criteria = "safe-to-deploy" +[[exemptions.hashbrown]] +version = "0.17.1" +criteria = "safe-to-deploy" + [[exemptions.heapless]] version = "0.9.3" criteria = "safe-to-deploy" @@ -237,10 +257,18 @@ criteria = "safe-to-deploy" version = "1.1.12" criteria = "safe-to-deploy" +[[exemptions.pin-project]] +version = "1.1.13" +criteria = "safe-to-deploy" + [[exemptions.pin-project-internal]] version = "1.1.12" criteria = "safe-to-deploy" +[[exemptions.pin-project-internal]] +version = "1.1.13" +criteria = "safe-to-deploy" + [[exemptions.pin-project-lite]] version = "0.2.17" criteria = "safe-to-deploy" diff --git a/platform/dev-npcx/Cargo.lock b/platform/dev-npcx/Cargo.lock index b32de60..327fac9 100644 --- a/platform/dev-npcx/Cargo.lock +++ b/platform/dev-npcx/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#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" 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#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" 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#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "battery-service-interface", "defmt 0.3.100", @@ -126,9 +126,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.2.60" +version = "1.2.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20" +checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98" dependencies = [ "find-msvc-tools", "shlex", @@ -230,14 +230,14 @@ version = "0.3.100" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0963443817029b2024136fc4dd07a5107eb8f977eaf18fcd1fdeb11306b64ad" dependencies = [ - "defmt 1.0.1", + "defmt 1.1.0", ] [[package]] name = "defmt" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "548d977b6da32fa1d1fda2876453da1e7df63ad0304c8b3dae4dbe7b96f39b78" +checksum = "a6e524506490a1953d237cb87b1cfc1e46f88c18f10a22dfe0f507dc6bfc7f7f" dependencies = [ "bitflags 1.3.2", "defmt-macros", @@ -245,9 +245,9 @@ dependencies = [ [[package]] name = "defmt-macros" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d4fc12a85bcf441cfe44344c4b72d58493178ce635338a3f3b78943aceb258e" +checksum = "f0a27770e9c8f719a79d8b638281f4d828f77d8fd61e0bd94451b9b85e576a0b" dependencies = [ "defmt-parser", "proc-macro-error2", @@ -267,12 +267,12 @@ dependencies = [ [[package]] name = "defmt-rtt" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d5a25c99d89c40f5676bec8cefe0614f17f0f40e916f98e345dae941807f9e" +checksum = "c0f73a4a4a91609e977ae3b7bd831ffa292edfd42ad140a3244a61d805b0e05e" dependencies = [ "critical-section", - "defmt 1.0.1", + "defmt 1.1.0", ] [[package]] @@ -281,7 +281,7 @@ version = "0.1.0" dependencies = [ "cortex-m", "cortex-m-rt", - "defmt 1.0.1", + "defmt 1.1.0", "defmt-rtt", "embassy-executor", "embassy-npcx", @@ -294,9 +294,9 @@ dependencies = [ [[package]] name = "device-driver" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3aa3d97b2acf349b9d52c75470e2ccfc7224c49597ec12c2fb0e28826e910495" +checksum = "c2e4547bd66511372d2a38ac3c1b2892c7ebf83cf0d5411c3406e496c85a1d96" dependencies = [ "embedded-io 0.6.1", "embedded-io-async 0.6.1", @@ -320,7 +320,7 @@ dependencies = [ "cordyceps", "cortex-m", "critical-section", - "defmt 1.0.1", + "defmt 1.1.0", "document-features", "embassy-executor-macros", "embassy-executor-timer-queue", @@ -353,7 +353,7 @@ checksum = "dc2d050bdc5c21e0862a89256ed8029ae6c290a93aecefc73084b3002cdebb01" [[package]] name = "embassy-hal-internal" version = "0.5.0" -source = "git+https://github.com/embassy-rs/embassy#c8715fc1026a58f74df0b41483274e439d82aa4c" +source = "git+https://github.com/embassy-rs/embassy#e9c32931b906649d65fc502fe8e8f2c70ef1e6ab" dependencies = [ "cortex-m", "critical-section", @@ -369,7 +369,7 @@ dependencies = [ "cortex-m", "cortex-m-rt", "critical-section", - "defmt 1.0.1", + "defmt 1.1.0", "embassy-futures", "embassy-hal-internal", "embassy-sync 0.8.0 (git+https://github.com/embassy-rs/embassy)", @@ -393,35 +393,35 @@ checksum = "7bbd85cf5a5ae56bdf26f618364af642d1d0a4e245cdd75cd9aabda382f65a81" dependencies = [ "cfg-if", "critical-section", - "defmt 1.0.1", + "defmt 1.1.0", "embedded-io-async 0.7.0", "futures-core", "futures-sink", - "heapless 0.9.2", + "heapless 0.9.3", ] [[package]] name = "embassy-sync" version = "0.8.0" -source = "git+https://github.com/embassy-rs/embassy#c8715fc1026a58f74df0b41483274e439d82aa4c" +source = "git+https://github.com/embassy-rs/embassy#e9c32931b906649d65fc502fe8e8f2c70ef1e6ab" dependencies = [ "cfg-if", "critical-section", "embedded-io-async 0.7.0", "futures-core", "futures-sink", - "heapless 0.9.2", + "heapless 0.9.3", ] [[package]] name = "embassy-time" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa65b9284d974dad7a23bb72835c4ec85c0b540d86af7fc4098c88cff51d65" +checksum = "592b0c143ec626e821d4d90da51a2bd91d559d6c442b7c74a47d368c9e23d97a" dependencies = [ "cfg-if", "critical-section", - "defmt 1.0.1", + "defmt 1.1.0", "document-features", "embassy-time-driver", "embedded-hal 0.2.7", @@ -432,9 +432,9 @@ dependencies = [ [[package]] name = "embassy-time-driver" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0a244c7dc22c8d0289379c8d8830cae06bb93d8f990194d0de5efb3b5ae7ba6" +checksum = "6ee71af1b3a0deaa53eaf2d39252f83504c853646e472400b763060389b9fcc9" dependencies = [ "document-features", ] @@ -486,7 +486,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e5007eb97aabfe3606c0b02823b3120e861c748ed3560756aa4fd231ef9ebf0" dependencies = [ - "defmt 1.0.1", + "defmt 1.1.0", ] [[package]] @@ -495,7 +495,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bafd19dc3b6aaa5027856818e19ccbfe84ebfb094c8a0ecf84a20e75c3b8e959" dependencies = [ - "defmt 1.0.1", + "defmt 1.1.0", "embedded-fans", ] @@ -569,7 +569,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f02b992c2b871b7fc616e4539258d92ea8b085e2f09cc0ad2862aa4d0e185ad1" dependencies = [ - "defmt 1.0.1", + "defmt 1.1.0", "num_enum", ] @@ -579,7 +579,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c703756bee31e7aaf55d8fb6dcf7337cfc231cfb4a3ad34b9df509846fd9001" dependencies = [ - "defmt 1.0.1", + "defmt 1.1.0", "paste", ] @@ -589,7 +589,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51c524a78b2804eca0d9ec05154e51d9af948b40cd0a6bbcc4d5832ff7e47b5b" dependencies = [ - "defmt 1.0.1", + "defmt 1.1.0", "embedded-sensors-hal", "paste", ] @@ -597,7 +597,7 @@ dependencies = [ [[package]] name = "embedded-services" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "bitfield 0.17.0", "cortex-m", @@ -614,7 +614,7 @@ dependencies = [ [[package]] name = "espi-device" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#09eda26a729738adbd177231600acdb981690375" +source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#54439c76d567fe8c65337cc4461c93a8a4fd434c" dependencies = [ "bit-register", "bitflags 2.11.1", @@ -684,9 +684,9 @@ dependencies = [ [[package]] name = "heapless" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af2455f757db2b292a9b1768c4b70186d443bcb3b316252d6b540aec1cd89ed" +checksum = "25ba4bd83f9415b58b4ed8dc5714c76e626a105be4646c02630ad730ad3b5aa4" dependencies = [ "hash32", "stable_deref_trait", @@ -712,9 +712,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.185" +version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f" +checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] name = "litrs" @@ -769,7 +769,7 @@ dependencies = [ [[package]] name = "mctp-rs" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "bit-register", "defmt 0.3.100", @@ -866,7 +866,7 @@ dependencies = [ [[package]] name = "odp-service-common" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "embedded-services", "static_cell", @@ -885,7 +885,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd402d00b0fb94c5aee000029204a46884b1262e0c443f166d86d2c0747e1a1a" dependencies = [ "cortex-m", - "defmt 1.0.1", + "defmt 1.1.0", ] [[package]] @@ -896,18 +896,18 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pin-project" -version = "1.1.11" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1749c7ed4bcaf4c3d0a3efc28538844fb29bcdd7d2b67b2be7e20ba861ff517" +checksum = "2466b2336ed02bcdca6b294417127b90ec92038d1d5c4fbeac971a922e0e0924" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.11" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b20ed30f105399776b9c883e68e536ef602a16ae6f596d2c473591d6ad64c6" +checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b" dependencies = [ "proc-macro2", "quote", @@ -964,7 +964,7 @@ dependencies = [ [[package]] name = "power-policy-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", @@ -1156,9 +1156,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subenum" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3d08fe7078c57309d5c3d938e50eba95ba1d33b9c3a101a8465fc6861a5416" +checksum = "5eee3fb942ed39f3971438fcc7e05e20717e599e14c5c7cb50edd0df2a44b274" dependencies = [ "heck", "proc-macro2", @@ -1180,7 +1180,7 @@ dependencies = [ [[package]] name = "thermal-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1189,7 +1189,7 @@ dependencies = [ "embedded-fans-async", "embedded-sensors-hal-async", "embedded-services", - "heapless 0.8.0", + "heapless 0.9.3", "odp-service-common", "thermal-service-interface", ] @@ -1197,7 +1197,7 @@ dependencies = [ [[package]] name = "thermal-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embassy-time", @@ -1208,7 +1208,7 @@ dependencies = [ [[package]] name = "thermal-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embedded-services", @@ -1249,7 +1249,7 @@ dependencies = [ [[package]] name = "time-alarm-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1265,7 +1265,7 @@ dependencies = [ [[package]] name = "time-alarm-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", @@ -1277,7 +1277,7 @@ dependencies = [ [[package]] name = "time-alarm-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embedded-mcu-hal", @@ -1350,7 +1350,7 @@ dependencies = [ [[package]] name = "uart-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embassy-sync 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/platform/dev-npcx/Cargo.toml b/platform/dev-npcx/Cargo.toml index ce702bb..6f25ade 100644 --- a/platform/dev-npcx/Cargo.toml +++ b/platform/dev-npcx/Cargo.toml @@ -47,7 +47,7 @@ embassy-npcx = { git = "https://github.com/OpenDevicePartnership/embassy-npcx", "defmt", "time-driver-mft16-3", ] } -embassy-time = { version = "0.5.0", features = [ +embassy-time = { version = "0.5.1", features = [ "defmt", "defmt-timestamp-uptime-us", "tick-hz-32_768", @@ -72,6 +72,6 @@ ignored = ["cortex-m", "cortex-m-rt", "embassy-time"] [patch."https://github.com/embassy-rs/embassy"] embassy-executor = "=0.10.0" embassy-futures = "=0.1.2" -embassy-time-driver = "=0.2.1" +embassy-time-driver = "=0.2.2" embassy-time-queue-utils = "=0.3.0" -embassy-time = "=0.5.0" +embassy-time = "=0.5.1" diff --git a/platform/dev-npcx/src/main.rs b/platform/dev-npcx/src/main.rs index 57ddc00..c42e8c0 100644 --- a/platform/dev-npcx/src/main.rs +++ b/platform/dev-npcx/src/main.rs @@ -18,8 +18,8 @@ async fn uart_service( ) { info!("Starting uart service"); - static UART_SERVICE: StaticCell> = StaticCell::new(); - let uart_service = uart_service::Service::new(relay).unwrap(); + static UART_SERVICE: StaticCell> = StaticCell::new(); + let uart_service = uart_service::DefaultService::default_smbusespi(relay).unwrap(); let uart_service = UART_SERVICE.init(uart_service); let Err(e) = uart_service::task::uart_service(uart_service, uart).await; panic!("uart-service error: {:?}", e); diff --git a/platform/dev-npcx/supply-chain/config.toml b/platform/dev-npcx/supply-chain/config.toml index 74fec72..67ce5d4 100644 --- a/platform/dev-npcx/supply-chain/config.toml +++ b/platform/dev-npcx/supply-chain/config.toml @@ -19,7 +19,7 @@ url = "https://raw.githubusercontent.com/mozilla/supply-chain/main/audits.toml" [policy.embassy-hal-internal] audit-as-crates-io = true -[policy."embassy-sync:0.8.0@git:c8715fc1026a58f74df0b41483274e439d82aa4c"] +[policy.embassy-sync] audit-as-crates-io = true [[exemptions.aho-corasick]] @@ -34,6 +34,10 @@ criteria = "safe-to-deploy" version = "1.2.59" criteria = "safe-to-deploy" +[[exemptions.cc]] +version = "1.2.62" +criteria = "safe-to-deploy" + [[exemptions.cfg-if]] version = "1.0.4" criteria = "safe-to-deploy" @@ -50,14 +54,30 @@ criteria = "safe-to-deploy" version = "0.20.11" criteria = "safe-to-deploy" +[[exemptions.defmt]] +version = "1.1.0" +criteria = "safe-to-deploy" + +[[exemptions.defmt-macros]] +version = "1.1.0" +criteria = "safe-to-deploy" + [[exemptions.defmt-rtt]] version = "1.1.0" criteria = "safe-to-deploy" +[[exemptions.defmt-rtt]] +version = "1.2.0" +criteria = "safe-to-deploy" + [[exemptions.device-driver]] version = "1.0.8" criteria = "safe-to-deploy" +[[exemptions.device-driver]] +version = "1.0.9" +criteria = "safe-to-deploy" + [[exemptions.document-features]] version = "0.2.12" criteria = "safe-to-deploy" @@ -70,6 +90,22 @@ criteria = "safe-to-deploy" version = "0.7.0" criteria = "safe-to-deploy" +[[exemptions.embassy-hal-internal]] +version = "0.5.0@git:e9c32931b906649d65fc502fe8e8f2c70ef1e6ab" +criteria = "safe-to-deploy" + +[[exemptions.embassy-sync]] +version = "0.8.0@git:e9c32931b906649d65fc502fe8e8f2c70ef1e6ab" +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-sensors-hal]] version = "0.1.1" criteria = "safe-to-deploy" @@ -90,6 +126,10 @@ criteria = "safe-to-deploy" version = "0.8.8" criteria = "safe-to-deploy" +[[exemptions.heapless]] +version = "0.9.3" +criteria = "safe-to-deploy" + [[exemptions.ident_case]] version = "1.0.1" criteria = "safe-to-deploy" @@ -98,6 +138,10 @@ criteria = "safe-to-deploy" version = "0.2.184" criteria = "safe-to-deploy" +[[exemptions.libc]] +version = "0.2.186" +criteria = "safe-to-deploy" + [[exemptions.litrs]] version = "1.0.0" criteria = "safe-to-deploy" @@ -126,10 +170,18 @@ criteria = "safe-to-deploy" version = "1.1.11" criteria = "safe-to-deploy" +[[exemptions.pin-project]] +version = "1.1.13" +criteria = "safe-to-deploy" + [[exemptions.pin-project-internal]] version = "1.1.11" criteria = "safe-to-deploy" +[[exemptions.pin-project-internal]] +version = "1.1.13" +criteria = "safe-to-deploy" + [[exemptions.pin-project-lite]] version = "0.2.17" criteria = "safe-to-deploy" @@ -158,6 +210,10 @@ criteria = "safe-to-deploy" version = "1.1.3" criteria = "safe-to-deploy" +[[exemptions.subenum]] +version = "1.2.0" +criteria = "safe-to-deploy" + [[exemptions.syn]] version = "2.0.117" criteria = "safe-to-deploy" diff --git a/platform/dev-qemu/Cargo.lock b/platform/dev-qemu/Cargo.lock index 4f75993..c48ae75 100644 --- a/platform/dev-qemu/Cargo.lock +++ b/platform/dev-qemu/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#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" 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#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" 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#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "battery-service-interface", "defmt 0.3.100", @@ -126,9 +126,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.2.60" +version = "1.2.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20" +checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98" dependencies = [ "find-msvc-tools", "shlex", @@ -209,14 +209,14 @@ version = "0.3.100" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0963443817029b2024136fc4dd07a5107eb8f977eaf18fcd1fdeb11306b64ad" dependencies = [ - "defmt 1.0.1", + "defmt 1.1.0", ] [[package]] name = "defmt" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "548d977b6da32fa1d1fda2876453da1e7df63ad0304c8b3dae4dbe7b96f39b78" +checksum = "a6e524506490a1953d237cb87b1cfc1e46f88c18f10a22dfe0f507dc6bfc7f7f" dependencies = [ "bitflags 1.3.2", "defmt-macros", @@ -224,9 +224,9 @@ dependencies = [ [[package]] name = "defmt-macros" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d4fc12a85bcf441cfe44344c4b72d58493178ce635338a3f3b78943aceb258e" +checksum = "f0a27770e9c8f719a79d8b638281f4d828f77d8fd61e0bd94451b9b85e576a0b" dependencies = [ "defmt-parser", "proc-macro-error2", @@ -252,7 +252,7 @@ checksum = "63b0302c696f9080df24a40eed6d34e34de9a610723b8176df52272798971250" dependencies = [ "cortex-m", "critical-section", - "defmt 1.0.1", + "defmt 1.1.0", "semihosting", ] @@ -273,9 +273,9 @@ dependencies = [ [[package]] name = "device-driver" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3aa3d97b2acf349b9d52c75470e2ccfc7224c49597ec12c2fb0e28826e910495" +checksum = "c2e4547bd66511372d2a38ac3c1b2892c7ebf83cf0d5411c3406e496c85a1d96" dependencies = [ "embedded-io 0.6.1", "embedded-io-async 0.6.1", @@ -310,7 +310,7 @@ checksum = "5d0d3b15c9d7dc4fec1d8cb77112472fb008b3b28c51ad23838d83587a6d2f1e" dependencies = [ "cordyceps", "critical-section", - "defmt 1.0.1", + "defmt 1.1.0", "document-features", "embassy-executor-macros 0.8.0", "embassy-executor-timer-queue", @@ -367,7 +367,7 @@ version = "0.2.1" source = "git+https://github.com/kurtjd/qemu-riscv-rs#702ab97339894ac996da80c88f70b2f6d4ae8f94" dependencies = [ "critical-section", - "defmt 1.0.1", + "defmt 1.1.0", "embassy-executor 0.9.1", "embassy-futures", "embassy-hal-internal", @@ -405,11 +405,11 @@ checksum = "7bbd85cf5a5ae56bdf26f618364af642d1d0a4e245cdd75cd9aabda382f65a81" dependencies = [ "cfg-if", "critical-section", - "defmt 1.0.1", + "defmt 1.1.0", "embedded-io-async 0.7.0", "futures-core", "futures-sink", - "heapless 0.9.2", + "heapless 0.9.3", ] [[package]] @@ -420,7 +420,7 @@ checksum = "592b0c143ec626e821d4d90da51a2bd91d559d6c442b7c74a47d368c9e23d97a" dependencies = [ "cfg-if", "critical-section", - "defmt 1.0.1", + "defmt 1.1.0", "document-features", "embassy-time-driver", "embedded-hal 0.2.7", @@ -440,12 +440,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.3", ] [[package]] @@ -485,7 +485,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e5007eb97aabfe3606c0b02823b3120e861c748ed3560756aa4fd231ef9ebf0" dependencies = [ - "defmt 1.0.1", + "defmt 1.1.0", ] [[package]] @@ -494,7 +494,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bafd19dc3b6aaa5027856818e19ccbfe84ebfb094c8a0ecf84a20e75c3b8e959" dependencies = [ - "defmt 1.0.1", + "defmt 1.1.0", "embedded-fans", ] @@ -559,7 +559,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f02b992c2b871b7fc616e4539258d92ea8b085e2f09cc0ad2862aa4d0e185ad1" dependencies = [ - "defmt 1.0.1", + "defmt 1.1.0", "num_enum", ] @@ -569,7 +569,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c703756bee31e7aaf55d8fb6dcf7337cfc231cfb4a3ad34b9df509846fd9001" dependencies = [ - "defmt 1.0.1", + "defmt 1.1.0", "paste", ] @@ -579,7 +579,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51c524a78b2804eca0d9ec05154e51d9af948b40cd0a6bbcc4d5832ff7e47b5b" dependencies = [ - "defmt 1.0.1", + "defmt 1.1.0", "embedded-sensors-hal", "paste", ] @@ -587,7 +587,7 @@ dependencies = [ [[package]] name = "embedded-services" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "bitfield 0.17.0", "cortex-m", @@ -604,7 +604,7 @@ dependencies = [ [[package]] name = "espi-device" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#09eda26a729738adbd177231600acdb981690375" +source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#54439c76d567fe8c65337cc4461c93a8a4fd434c" dependencies = [ "bit-register", "bitflags 2.11.1", @@ -674,9 +674,9 @@ dependencies = [ [[package]] name = "heapless" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af2455f757db2b292a9b1768c4b70186d443bcb3b316252d6b540aec1cd89ed" +checksum = "25ba4bd83f9415b58b4ed8dc5714c76e626a105be4646c02630ad730ad3b5aa4" dependencies = [ "hash32", "stable_deref_trait", @@ -702,9 +702,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.185" +version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f" +checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] name = "litrs" @@ -743,7 +743,7 @@ dependencies = [ [[package]] name = "mctp-rs" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "bit-register", "defmt 0.3.100", @@ -817,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#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "embedded-services", "static_cell", @@ -882,7 +882,7 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "power-policy-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", @@ -1162,9 +1162,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subenum" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3d08fe7078c57309d5c3d938e50eba95ba1d33b9c3a101a8465fc6861a5416" +checksum = "5eee3fb942ed39f3971438fcc7e05e20717e599e14c5c7cb50edd0df2a44b274" dependencies = [ "heck", "proc-macro2", @@ -1186,7 +1186,7 @@ dependencies = [ [[package]] name = "thermal-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1195,7 +1195,7 @@ dependencies = [ "embedded-fans-async", "embedded-sensors-hal-async", "embedded-services", - "heapless 0.8.0", + "heapless 0.9.3", "odp-service-common", "thermal-service-interface", ] @@ -1203,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#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embassy-time", @@ -1214,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#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embedded-services", @@ -1255,7 +1255,7 @@ dependencies = [ [[package]] name = "time-alarm-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1271,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#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", @@ -1283,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#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embedded-mcu-hal", @@ -1356,7 +1356,7 @@ dependencies = [ [[package]] name = "uart-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#bd46037d63c0b39ccd73a23fffeb328dea8fea00" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=v0.2.0#f1f1e087563085f853215ae24e7bc1290aa07168" dependencies = [ "defmt 0.3.100", "embassy-sync 0.8.0", diff --git a/platform/dev-qemu/src/main.rs b/platform/dev-qemu/src/main.rs index 534bbbf..b57d1ed 100644 --- a/platform/dev-qemu/src/main.rs +++ b/platform/dev-qemu/src/main.rs @@ -16,8 +16,8 @@ use static_cell::StaticCell; #[embassy_executor::task] async fn uart_service(uart: buffered::Uart<'static, Async>, relay: MockOdpRelayHandler) { info!("Starting uart service"); - static UART_SERVICE: StaticCell> = StaticCell::new(); - let uart_service = uart_service::Service::new(relay).unwrap(); + static UART_SERVICE: StaticCell> = StaticCell::new(); + let uart_service = uart_service::DefaultService::default_smbusespi(relay).unwrap(); let uart_service = UART_SERVICE.init(uart_service); let Err(e) = uart_service::task::uart_service(uart_service, uart).await; panic!("uart-service error: {:?}", e); diff --git a/platform/dev-qemu/supply-chain/config.toml b/platform/dev-qemu/supply-chain/config.toml index 31abe06..08eafa3 100644 --- a/platform/dev-qemu/supply-chain/config.toml +++ b/platform/dev-qemu/supply-chain/config.toml @@ -28,6 +28,10 @@ criteria = "safe-to-deploy" version = "1.2.59" criteria = "safe-to-deploy" +[[exemptions.cc]] +version = "1.2.62" +criteria = "safe-to-deploy" + [[exemptions.cfg-if]] version = "1.0.4" criteria = "safe-to-deploy" @@ -44,6 +48,14 @@ criteria = "safe-to-deploy" version = "0.20.11" criteria = "safe-to-deploy" +[[exemptions.defmt]] +version = "1.1.0" +criteria = "safe-to-deploy" + +[[exemptions.defmt-macros]] +version = "1.1.0" +criteria = "safe-to-deploy" + [[exemptions.defmt-semihosting]] version = "0.3.0" criteria = "safe-to-deploy" @@ -52,6 +64,10 @@ criteria = "safe-to-deploy" version = "1.0.8" criteria = "safe-to-deploy" +[[exemptions.device-driver]] +version = "1.0.9" +criteria = "safe-to-deploy" + [[exemptions.document-features]] version = "0.2.12" criteria = "safe-to-deploy" @@ -68,6 +84,10 @@ criteria = "safe-to-deploy" version = "0.7.2" criteria = "safe-to-deploy" +[[exemptions.embassy-time-queue-utils]] +version = "0.3.2" +criteria = "safe-to-deploy" + [[exemptions.embedded-sensors-hal]] version = "0.1.1" criteria = "safe-to-deploy" @@ -88,6 +108,10 @@ criteria = "safe-to-deploy" version = "0.8.8" criteria = "safe-to-deploy" +[[exemptions.heapless]] +version = "0.9.3" +criteria = "safe-to-deploy" + [[exemptions.ident_case]] version = "1.0.1" criteria = "safe-to-deploy" @@ -96,6 +120,10 @@ criteria = "safe-to-deploy" version = "0.2.184" criteria = "safe-to-deploy" +[[exemptions.libc]] +version = "0.2.186" +criteria = "safe-to-deploy" + [[exemptions.litrs]] version = "1.0.0" criteria = "safe-to-deploy" @@ -176,6 +204,10 @@ criteria = "safe-to-deploy" version = "1.1.3" criteria = "safe-to-deploy" +[[exemptions.subenum]] +version = "1.2.0" +criteria = "safe-to-deploy" + [[exemptions.syn]] version = "2.0.117" criteria = "safe-to-deploy"