diff --git a/platform/dev-imxrt/Cargo.lock b/platform/dev-imxrt/Cargo.lock index 862956c..5bf45d8 100644 --- a/platform/dev-imxrt/Cargo.lock +++ b/platform/dev-imxrt/Cargo.lock @@ -35,23 +35,20 @@ dependencies = [ [[package]] name = "battery-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "battery-service-interface", "defmt 0.3.100", - "embassy-futures", - "embassy-sync", "embassy-time", "embedded-batteries-async", "embedded-services", - "odp-service-common", "power-policy-interface", ] [[package]] name = "battery-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embedded-batteries-async", @@ -60,7 +57,7 @@ dependencies = [ [[package]] name = "battery-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "battery-service-interface", "defmt 0.3.100", @@ -79,7 +76,7 @@ dependencies = [ [[package]] name = "bit-register" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/odp-utilities#583015c08ad9855f310bdb25d5cf9abff77b5e08" +source = "git+https://github.com/OpenDevicePartnership/odp-utilities#ff4829bd16c6d9da609c59c98783b474ab9e3d23" dependencies = [ "num-traits", ] @@ -209,6 +206,21 @@ dependencies = [ "syn", ] +[[package]] +name = "crc" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "217698eaf96b4a3f0bc4f3662aaa55bdf913cd54d7204591faa790070c6d0853" + [[package]] name = "critical-section" version = "1.2.0" @@ -453,7 +465,7 @@ dependencies = [ "embedded-io 0.7.1", "embedded-io-async 0.6.1", "embedded-io-async 0.7.0", - "embedded-mcu-hal", + "embedded-mcu-hal 0.2.0", "embedded-storage", "fixed", "itertools", @@ -582,6 +594,9 @@ name = "embedded-hal" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "361a90feb7004eca4019fb28352a9465666b24f840f5c3cddf0ff13920590b89" +dependencies = [ + "defmt 0.3.100", +] [[package]] name = "embedded-hal-async" @@ -589,6 +604,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4c685bbef7fe13c3c6dd4da26841ed3980ef33e841cddfa15ce8a8fb3f1884" dependencies = [ + "defmt 0.3.100", "embedded-hal 1.0.0", ] @@ -642,6 +658,19 @@ dependencies = [ "num_enum", ] +[[package]] +name = "embedded-mcu-hal" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0563f27b8ea59eb57e2c5926db6ee311d0a24ab9912adf82b9f418cc9799b0ff" +dependencies = [ + "defmt 1.1.0", + "embedded-hal 1.0.0", + "embedded-hal-async", + "num_enum", + "smbus-pec", +] + [[package]] name = "embedded-sensors-hal" version = "0.1.1" @@ -666,7 +695,7 @@ dependencies = [ [[package]] name = "embedded-services" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "bitfield 0.17.0", "cortex-m", @@ -698,7 +727,7 @@ dependencies = [ [[package]] name = "espi-device" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#290aa80a4c281857f3bed94581200b330119286c" +source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#e2a7c6f4bc8e0259d85f53b4014847eb276c885a" dependencies = [ "bit-register 0.1.0 (git+https://github.com/OpenDevicePartnership/odp-utilities?tag=v0.1.0)", "bitflags 2.11.1", @@ -859,9 +888,10 @@ dependencies = [ [[package]] name = "mctp-rs" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "bit-register 0.1.0 (git+https://github.com/OpenDevicePartnership/odp-utilities)", + "crc", "defmt 0.3.100", "embedded-batteries", "espi-device", @@ -968,7 +998,7 @@ dependencies = [ [[package]] name = "odp-service-common" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "embedded-services", "static_cell", @@ -1021,7 +1051,7 @@ dependencies = [ "embedded-hal-async", "embedded-io 0.7.1", "embedded-io-async 0.7.0", - "embedded-mcu-hal", + "embedded-mcu-hal 0.2.0", "embedded-sensors-hal-async", "embedded-services", "odp-service-common", @@ -1043,7 +1073,7 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "power-policy-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", @@ -1270,7 +1300,7 @@ dependencies = [ [[package]] name = "thermal-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1287,7 +1317,7 @@ dependencies = [ [[package]] name = "thermal-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embassy-time", @@ -1298,7 +1328,7 @@ dependencies = [ [[package]] name = "thermal-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embedded-services", @@ -1339,13 +1369,13 @@ dependencies = [ [[package]] name = "time-alarm-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embassy-futures", "embassy-sync", "embassy-time", - "embedded-mcu-hal", + "embedded-mcu-hal 0.3.0", "embedded-services", "odp-service-common", "time-alarm-service-interface", @@ -1355,11 +1385,11 @@ dependencies = [ [[package]] name = "time-alarm-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", - "embedded-mcu-hal", + "embedded-mcu-hal 0.3.0", "num_enum", "zerocopy", ] @@ -1367,10 +1397,10 @@ dependencies = [ [[package]] name = "time-alarm-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", - "embedded-mcu-hal", + "embedded-mcu-hal 0.3.0", "embedded-services", "num_enum", "time-alarm-service-interface", @@ -1446,7 +1476,7 @@ checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" [[package]] name = "uart-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embassy-sync", diff --git a/platform/dev-imxrt/supply-chain/config.toml b/platform/dev-imxrt/supply-chain/config.toml index 562fc23..7026250 100644 --- a/platform/dev-imxrt/supply-chain/config.toml +++ b/platform/dev-imxrt/supply-chain/config.toml @@ -43,6 +43,14 @@ criteria = "safe-to-deploy" version = "1.0.4" criteria = "safe-to-deploy" +[[exemptions.crc]] +version = "3.4.0" +criteria = "safe-to-deploy" + +[[exemptions.crc-catalog]] +version = "2.5.0" +criteria = "safe-to-deploy" + [[exemptions.darling]] version = "0.20.11" criteria = "safe-to-deploy" @@ -87,6 +95,10 @@ criteria = "safe-to-deploy" version = "0.1.0@git:6524cbabcc12016f1aea4c0ffa2f1354c3f8c6d1" criteria = "safe-to-deploy" +[[exemptions.embedded-mcu-hal]] +version = "0.3.0" +criteria = "safe-to-deploy" + [[exemptions.embedded-sensors-hal]] version = "0.1.1" criteria = "safe-to-deploy" diff --git a/platform/dev-mcxa/Cargo.lock b/platform/dev-mcxa/Cargo.lock index e907b05..b4979f2 100644 --- a/platform/dev-mcxa/Cargo.lock +++ b/platform/dev-mcxa/Cargo.lock @@ -29,23 +29,20 @@ dependencies = [ [[package]] name = "battery-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "battery-service-interface", "defmt 0.3.100", - "embassy-futures", - "embassy-sync", "embassy-time", "embedded-batteries-async", "embedded-services", - "odp-service-common", "power-policy-interface", ] [[package]] name = "battery-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embedded-batteries-async", @@ -54,7 +51,7 @@ dependencies = [ [[package]] name = "battery-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "battery-service-interface", "defmt 0.3.100", @@ -84,7 +81,7 @@ dependencies = [ [[package]] name = "bit-register" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/odp-utilities#583015c08ad9855f310bdb25d5cf9abff77b5e08" +source = "git+https://github.com/OpenDevicePartnership/odp-utilities#ff4829bd16c6d9da609c59c98783b474ab9e3d23" dependencies = [ "num-traits", ] @@ -223,6 +220,21 @@ dependencies = [ "syn", ] +[[package]] +name = "crc" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "217698eaf96b4a3f0bc4f3662aaa55bdf913cd54d7204591faa790070c6d0853" + [[package]] name = "critical-section" version = "1.2.0" @@ -565,6 +577,9 @@ name = "embedded-hal" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "361a90feb7004eca4019fb28352a9465666b24f840f5c3cddf0ff13920590b89" +dependencies = [ + "defmt 0.3.100", +] [[package]] name = "embedded-hal-async" @@ -572,6 +587,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4c685bbef7fe13c3c6dd4da26841ed3980ef33e841cddfa15ce8a8fb3f1884" dependencies = [ + "defmt 0.3.100", "embedded-hal 1.0.0", ] @@ -625,6 +641,19 @@ dependencies = [ "num_enum", ] +[[package]] +name = "embedded-mcu-hal" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0563f27b8ea59eb57e2c5926db6ee311d0a24ab9912adf82b9f418cc9799b0ff" +dependencies = [ + "defmt 1.1.0", + "embedded-hal 1.0.0", + "embedded-hal-async", + "num_enum", + "smbus-pec", +] + [[package]] name = "embedded-sensors-hal" version = "0.1.1" @@ -649,7 +678,7 @@ dependencies = [ [[package]] name = "embedded-services" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "bitfield 0.17.0", "cortex-m", @@ -687,7 +716,7 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "espi-device" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#290aa80a4c281857f3bed94581200b330119286c" +source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#e2a7c6f4bc8e0259d85f53b4014847eb276c885a" dependencies = [ "bit-register 0.1.0 (git+https://github.com/OpenDevicePartnership/odp-utilities?tag=v0.1.0)", "bitflags 2.11.1", @@ -857,9 +886,10 @@ dependencies = [ [[package]] name = "mctp-rs" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "bit-register 0.1.0 (git+https://github.com/OpenDevicePartnership/odp-utilities)", + "crc", "defmt 0.3.100", "embedded-batteries", "espi-device", @@ -954,7 +984,7 @@ dependencies = [ [[package]] name = "odp-service-common" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "embedded-services", "static_cell", @@ -1027,7 +1057,7 @@ dependencies = [ "embedded-hal-async", "embedded-io 0.7.1", "embedded-io-async 0.7.0", - "embedded-mcu-hal", + "embedded-mcu-hal 0.2.0", "embedded-sensors-hal-async", "embedded-services", "odp-service-common", @@ -1052,7 +1082,7 @@ dependencies = [ [[package]] name = "power-policy-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", @@ -1298,7 +1328,7 @@ dependencies = [ [[package]] name = "thermal-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1315,7 +1345,7 @@ dependencies = [ [[package]] name = "thermal-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embassy-time", @@ -1326,7 +1356,7 @@ dependencies = [ [[package]] name = "thermal-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embedded-services", @@ -1367,13 +1397,13 @@ dependencies = [ [[package]] name = "time-alarm-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embassy-futures", "embassy-sync", "embassy-time", - "embedded-mcu-hal", + "embedded-mcu-hal 0.3.0", "embedded-services", "odp-service-common", "time-alarm-service-interface", @@ -1383,11 +1413,11 @@ dependencies = [ [[package]] name = "time-alarm-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", - "embedded-mcu-hal", + "embedded-mcu-hal 0.3.0", "num_enum", "zerocopy", ] @@ -1395,10 +1425,10 @@ dependencies = [ [[package]] name = "time-alarm-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", - "embedded-mcu-hal", + "embedded-mcu-hal 0.3.0", "embedded-services", "num_enum", "time-alarm-service-interface", @@ -1468,7 +1498,7 @@ dependencies = [ [[package]] name = "uart-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embassy-sync", diff --git a/platform/dev-mcxa/supply-chain/config.toml b/platform/dev-mcxa/supply-chain/config.toml index dc92635..567b103 100644 --- a/platform/dev-mcxa/supply-chain/config.toml +++ b/platform/dev-mcxa/supply-chain/config.toml @@ -93,6 +93,14 @@ criteria = "safe-to-deploy" version = "0.7.5" criteria = "safe-to-deploy" +[[exemptions.crc]] +version = "3.4.0" +criteria = "safe-to-deploy" + +[[exemptions.crc-catalog]] +version = "2.5.0" +criteria = "safe-to-deploy" + [[exemptions.critical-section]] version = "1.2.0" criteria = "safe-to-deploy" @@ -153,6 +161,10 @@ criteria = "safe-to-deploy" version = "0.2.7" criteria = "safe-to-deploy" +[[exemptions.embedded-mcu-hal]] +version = "0.3.0" +criteria = "safe-to-deploy" + [[exemptions.grounded]] version = "0.2.1" criteria = "safe-to-deploy" diff --git a/platform/dev-mec/Cargo.lock b/platform/dev-mec/Cargo.lock index 9d33d54..ad61448 100644 --- a/platform/dev-mec/Cargo.lock +++ b/platform/dev-mec/Cargo.lock @@ -35,23 +35,20 @@ dependencies = [ [[package]] name = "battery-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#5cc395f101ad574214a49b2894c484cc19d41695" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "battery-service-interface", "defmt 0.3.100", - "embassy-futures", - "embassy-sync", "embassy-time", "embedded-batteries-async", "embedded-services", - "odp-service-common", "power-policy-interface", ] [[package]] name = "battery-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#5cc395f101ad574214a49b2894c484cc19d41695" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embedded-batteries-async", @@ -60,7 +57,7 @@ dependencies = [ [[package]] name = "battery-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#5cc395f101ad574214a49b2894c484cc19d41695" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "battery-service-interface", "defmt 0.3.100", @@ -79,7 +76,7 @@ dependencies = [ [[package]] name = "bit-register" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/odp-utilities#583015c08ad9855f310bdb25d5cf9abff77b5e08" +source = "git+https://github.com/OpenDevicePartnership/odp-utilities#ff4829bd16c6d9da609c59c98783b474ab9e3d23" dependencies = [ "num-traits", ] @@ -203,6 +200,21 @@ dependencies = [ "syn", ] +[[package]] +name = "crc" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "217698eaf96b4a3f0bc4f3662aaa55bdf913cd54d7204591faa790070c6d0853" + [[package]] name = "critical-section" version = "1.2.0" @@ -540,6 +552,9 @@ name = "embedded-hal" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "361a90feb7004eca4019fb28352a9465666b24f840f5c3cddf0ff13920590b89" +dependencies = [ + "defmt 0.3.100", +] [[package]] name = "embedded-hal-async" @@ -547,6 +562,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4c685bbef7fe13c3c6dd4da26841ed3980ef33e841cddfa15ce8a8fb3f1884" dependencies = [ + "defmt 0.3.100", "embedded-hal 1.0.0", ] @@ -600,6 +616,19 @@ dependencies = [ "num_enum", ] +[[package]] +name = "embedded-mcu-hal" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0563f27b8ea59eb57e2c5926db6ee311d0a24ab9912adf82b9f418cc9799b0ff" +dependencies = [ + "defmt 1.1.0", + "embedded-hal 1.0.0", + "embedded-hal-async", + "num_enum", + "smbus-pec", +] + [[package]] name = "embedded-sensors-hal" version = "0.1.1" @@ -624,7 +653,7 @@ dependencies = [ [[package]] name = "embedded-services" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#5cc395f101ad574214a49b2894c484cc19d41695" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "bitfield 0.17.0", "cortex-m", @@ -656,7 +685,7 @@ dependencies = [ [[package]] name = "espi-device" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#290aa80a4c281857f3bed94581200b330119286c" +source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#e2a7c6f4bc8e0259d85f53b4014847eb276c885a" dependencies = [ "bit-register 0.1.0 (git+https://github.com/OpenDevicePartnership/odp-utilities?tag=v0.1.0)", "bitflags 2.11.1", @@ -808,9 +837,10 @@ dependencies = [ [[package]] name = "mctp-rs" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#5cc395f101ad574214a49b2894c484cc19d41695" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "bit-register 0.1.0 (git+https://github.com/OpenDevicePartnership/odp-utilities)", + "crc", "defmt 0.3.100", "embedded-batteries", "espi-device", @@ -893,7 +923,7 @@ dependencies = [ [[package]] name = "odp-service-common" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#5cc395f101ad574214a49b2894c484cc19d41695" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "embedded-services", "static_cell", @@ -946,7 +976,7 @@ dependencies = [ "embedded-hal-async", "embedded-io 0.7.1", "embedded-io-async 0.7.0", - "embedded-mcu-hal", + "embedded-mcu-hal 0.2.0", "embedded-sensors-hal-async", "embedded-services", "odp-service-common", @@ -968,7 +998,7 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "power-policy-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#5cc395f101ad574214a49b2894c484cc19d41695" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", @@ -1184,7 +1214,7 @@ dependencies = [ [[package]] name = "thermal-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#5cc395f101ad574214a49b2894c484cc19d41695" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1201,7 +1231,7 @@ dependencies = [ [[package]] name = "thermal-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#5cc395f101ad574214a49b2894c484cc19d41695" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embassy-time", @@ -1212,7 +1242,7 @@ dependencies = [ [[package]] name = "thermal-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#5cc395f101ad574214a49b2894c484cc19d41695" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embedded-services", @@ -1253,13 +1283,13 @@ dependencies = [ [[package]] name = "time-alarm-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#5cc395f101ad574214a49b2894c484cc19d41695" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embassy-futures", "embassy-sync", "embassy-time", - "embedded-mcu-hal", + "embedded-mcu-hal 0.3.0", "embedded-services", "odp-service-common", "time-alarm-service-interface", @@ -1269,11 +1299,11 @@ dependencies = [ [[package]] name = "time-alarm-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#5cc395f101ad574214a49b2894c484cc19d41695" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", - "embedded-mcu-hal", + "embedded-mcu-hal 0.3.0", "num_enum", "zerocopy", ] @@ -1281,10 +1311,10 @@ dependencies = [ [[package]] name = "time-alarm-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#5cc395f101ad574214a49b2894c484cc19d41695" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", - "embedded-mcu-hal", + "embedded-mcu-hal 0.3.0", "embedded-services", "num_enum", "time-alarm-service-interface", @@ -1360,7 +1390,7 @@ checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" [[package]] name = "uart-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#5cc395f101ad574214a49b2894c484cc19d41695" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embassy-sync", diff --git a/platform/dev-npcx/Cargo.lock b/platform/dev-npcx/Cargo.lock index 1924c21..9eb1b8a 100644 --- a/platform/dev-npcx/Cargo.lock +++ b/platform/dev-npcx/Cargo.lock @@ -29,23 +29,20 @@ dependencies = [ [[package]] name = "battery-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "battery-service-interface", "defmt 0.3.100", - "embassy-futures", - "embassy-sync 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "embassy-time", "embedded-batteries-async", "embedded-services", - "odp-service-common", "power-policy-interface", ] [[package]] name = "battery-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embedded-batteries-async", @@ -54,7 +51,7 @@ dependencies = [ [[package]] name = "battery-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "battery-service-interface", "defmt 0.3.100", @@ -73,7 +70,7 @@ dependencies = [ [[package]] name = "bit-register" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/odp-utilities#583015c08ad9855f310bdb25d5cf9abff77b5e08" +source = "git+https://github.com/OpenDevicePartnership/odp-utilities#ff4829bd16c6d9da609c59c98783b474ab9e3d23" dependencies = [ "num-traits", ] @@ -191,6 +188,21 @@ dependencies = [ "syn", ] +[[package]] +name = "crc" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "217698eaf96b4a3f0bc4f3662aaa55bdf913cd54d7204591faa790070c6d0853" + [[package]] name = "critical-section" version = "1.2.0" @@ -522,6 +534,9 @@ name = "embedded-hal" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "361a90feb7004eca4019fb28352a9465666b24f840f5c3cddf0ff13920590b89" +dependencies = [ + "defmt 0.3.100", +] [[package]] name = "embedded-hal-async" @@ -529,6 +544,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4c685bbef7fe13c3c6dd4da26841ed3980ef33e841cddfa15ce8a8fb3f1884" dependencies = [ + "defmt 0.3.100", "embedded-hal 1.0.0", ] @@ -581,6 +597,19 @@ dependencies = [ "num_enum", ] +[[package]] +name = "embedded-mcu-hal" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0563f27b8ea59eb57e2c5926db6ee311d0a24ab9912adf82b9f418cc9799b0ff" +dependencies = [ + "defmt 1.1.0", + "embedded-hal 1.0.0", + "embedded-hal-async", + "num_enum", + "smbus-pec", +] + [[package]] name = "embedded-sensors-hal" version = "0.1.1" @@ -605,7 +634,7 @@ dependencies = [ [[package]] name = "embedded-services" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "bitfield 0.17.0", "cortex-m", @@ -622,7 +651,7 @@ dependencies = [ [[package]] name = "espi-device" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#290aa80a4c281857f3bed94581200b330119286c" +source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#e2a7c6f4bc8e0259d85f53b4014847eb276c885a" dependencies = [ "bit-register 0.1.0 (git+https://github.com/OpenDevicePartnership/odp-utilities?tag=v0.1.0)", "bitflags 2.11.1", @@ -777,9 +806,10 @@ dependencies = [ [[package]] name = "mctp-rs" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "bit-register 0.1.0 (git+https://github.com/OpenDevicePartnership/odp-utilities)", + "crc", "defmt 0.3.100", "embedded-batteries", "espi-device", @@ -874,7 +904,7 @@ dependencies = [ [[package]] name = "odp-service-common" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "embedded-services", "static_cell", @@ -947,7 +977,7 @@ dependencies = [ "embedded-hal-async", "embedded-io 0.7.1", "embedded-io-async 0.7.0", - "embedded-mcu-hal", + "embedded-mcu-hal 0.2.0", "embedded-sensors-hal-async", "embedded-services", "odp-service-common", @@ -972,7 +1002,7 @@ dependencies = [ [[package]] name = "power-policy-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", @@ -1188,7 +1218,7 @@ dependencies = [ [[package]] name = "thermal-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1205,7 +1235,7 @@ dependencies = [ [[package]] name = "thermal-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embassy-time", @@ -1216,7 +1246,7 @@ dependencies = [ [[package]] name = "thermal-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embedded-services", @@ -1257,13 +1287,13 @@ dependencies = [ [[package]] name = "time-alarm-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embassy-futures", "embassy-sync 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "embassy-time", - "embedded-mcu-hal", + "embedded-mcu-hal 0.3.0", "embedded-services", "odp-service-common", "time-alarm-service-interface", @@ -1273,11 +1303,11 @@ dependencies = [ [[package]] name = "time-alarm-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", - "embedded-mcu-hal", + "embedded-mcu-hal 0.3.0", "num_enum", "zerocopy", ] @@ -1285,10 +1315,10 @@ dependencies = [ [[package]] name = "time-alarm-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", - "embedded-mcu-hal", + "embedded-mcu-hal 0.3.0", "embedded-services", "num_enum", "time-alarm-service-interface", @@ -1358,7 +1388,7 @@ dependencies = [ [[package]] name = "uart-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" 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/supply-chain/config.toml b/platform/dev-npcx/supply-chain/config.toml index d41f413..33b8594 100644 --- a/platform/dev-npcx/supply-chain/config.toml +++ b/platform/dev-npcx/supply-chain/config.toml @@ -38,6 +38,14 @@ criteria = "safe-to-deploy" version = "1.0.4" criteria = "safe-to-deploy" +[[exemptions.crc]] +version = "3.4.0" +criteria = "safe-to-deploy" + +[[exemptions.crc-catalog]] +version = "2.5.0" +criteria = "safe-to-deploy" + [[exemptions.darling]] version = "0.20.11" criteria = "safe-to-deploy" @@ -82,6 +90,10 @@ criteria = "safe-to-deploy" version = "0.8.0@git:e9c32931b906649d65fc502fe8e8f2c70ef1e6ab" criteria = "safe-to-deploy" +[[exemptions.embedded-mcu-hal]] +version = "0.3.0" +criteria = "safe-to-deploy" + [[exemptions.embedded-sensors-hal]] version = "0.1.1" criteria = "safe-to-deploy" diff --git a/platform/dev-qemu/Cargo.lock b/platform/dev-qemu/Cargo.lock index 9b9ae18..ad3a333 100644 --- a/platform/dev-qemu/Cargo.lock +++ b/platform/dev-qemu/Cargo.lock @@ -29,23 +29,20 @@ dependencies = [ [[package]] name = "battery-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "battery-service-interface", "defmt 0.3.100", - "embassy-futures", - "embassy-sync 0.8.0", "embassy-time", "embedded-batteries-async", "embedded-services", - "odp-service-common", "power-policy-interface", ] [[package]] name = "battery-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embedded-batteries-async", @@ -54,7 +51,7 @@ dependencies = [ [[package]] name = "battery-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "battery-service-interface", "defmt 0.3.100", @@ -73,7 +70,7 @@ dependencies = [ [[package]] name = "bit-register" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/odp-utilities#583015c08ad9855f310bdb25d5cf9abff77b5e08" +source = "git+https://github.com/OpenDevicePartnership/odp-utilities#ff4829bd16c6d9da609c59c98783b474ab9e3d23" dependencies = [ "num-traits", ] @@ -170,6 +167,21 @@ dependencies = [ "volatile-register", ] +[[package]] +name = "crc" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "217698eaf96b4a3f0bc4f3662aaa55bdf913cd54d7204591faa790070c6d0853" + [[package]] name = "critical-section" version = "1.2.0" @@ -376,7 +388,7 @@ dependencies = [ [[package]] name = "embassy-qemu-riscv" version = "0.2.1" -source = "git+https://github.com/kurtjd/qemu-riscv-rs#7e6200200acb8a0156eb09a9d57694f3d50a136b" +source = "git+https://github.com/kurtjd/qemu-riscv-rs#60430f9284ecc00ca79fb3b3d5e23b851b7e0336" dependencies = [ "critical-section", "defmt 1.1.0", @@ -583,7 +595,8 @@ dependencies = [ [[package]] name = "embedded-mcu-hal" version = "0.3.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-mcu#38acdc22911dc3c4e8278c315b6e458b6007fbbb" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0563f27b8ea59eb57e2c5926db6ee311d0a24ab9912adf82b9f418cc9799b0ff" dependencies = [ "defmt 1.1.0", "embedded-hal 1.0.0", @@ -616,7 +629,7 @@ dependencies = [ [[package]] name = "embedded-services" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "bitfield 0.17.0", "cortex-m", @@ -633,7 +646,7 @@ dependencies = [ [[package]] name = "espi-device" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#290aa80a4c281857f3bed94581200b330119286c" +source = "git+https://github.com/OpenDevicePartnership/haf-ec-service#e2a7c6f4bc8e0259d85f53b4014847eb276c885a" dependencies = [ "bit-register 0.1.0 (git+https://github.com/OpenDevicePartnership/odp-utilities?tag=v0.1.0)", "bitflags 2.11.1", @@ -785,9 +798,10 @@ dependencies = [ [[package]] name = "mctp-rs" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "bit-register 0.1.0 (git+https://github.com/OpenDevicePartnership/odp-utilities)", + "crc", "defmt 0.3.100", "embedded-batteries", "espi-device", @@ -859,7 +873,7 @@ dependencies = [ [[package]] name = "odp-service-common" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "embedded-services", "static_cell", @@ -924,7 +938,7 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "power-policy-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", @@ -968,7 +982,7 @@ dependencies = [ [[package]] name = "qemu-riscv-pac" version = "0.1.0" -source = "git+https://github.com/kurtjd/qemu-riscv-rs#7e6200200acb8a0156eb09a9d57694f3d50a136b" +source = "git+https://github.com/kurtjd/qemu-riscv-rs#60430f9284ecc00ca79fb3b3d5e23b851b7e0336" dependencies = [ "critical-section", "riscv", @@ -1228,7 +1242,7 @@ dependencies = [ [[package]] name = "thermal-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embassy-futures", @@ -1245,7 +1259,7 @@ dependencies = [ [[package]] name = "thermal-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embassy-time", @@ -1256,7 +1270,7 @@ dependencies = [ [[package]] name = "thermal-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embedded-services", @@ -1297,13 +1311,13 @@ dependencies = [ [[package]] name = "time-alarm-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embassy-futures", "embassy-sync 0.8.0", "embassy-time", - "embedded-mcu-hal 0.2.0", + "embedded-mcu-hal 0.3.0", "embedded-services", "odp-service-common", "time-alarm-service-interface", @@ -1313,11 +1327,11 @@ dependencies = [ [[package]] name = "time-alarm-service-interface" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "bitfield 0.17.0", "defmt 0.3.100", - "embedded-mcu-hal 0.2.0", + "embedded-mcu-hal 0.3.0", "num_enum", "zerocopy", ] @@ -1325,10 +1339,10 @@ dependencies = [ [[package]] name = "time-alarm-service-relay" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", - "embedded-mcu-hal 0.2.0", + "embedded-mcu-hal 0.3.0", "embedded-services", "num_enum", "time-alarm-service-interface", @@ -1398,7 +1412,7 @@ dependencies = [ [[package]] name = "uart-service" version = "0.1.0" -source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#62d4ea9a87588c6096e1c2f149ac3263064cbde9" +source = "git+https://github.com/OpenDevicePartnership/embedded-services?branch=main#6d7dbbf71a7e386ae75949fa2b792392df0d857a" dependencies = [ "defmt 0.3.100", "embassy-sync 0.8.0", diff --git a/platform/dev-qemu/Cargo.toml b/platform/dev-qemu/Cargo.toml index 00af45a..81724c1 100644 --- a/platform/dev-qemu/Cargo.toml +++ b/platform/dev-qemu/Cargo.toml @@ -64,7 +64,7 @@ hid-service = { git = "https://github.com/OpenDevicePartnership/embedded-service "defmt", ] } platform-common = { path = "../platform-common", features = ["mock"] } -embedded-mcu-hal = { git = "https://github.com/OpenDevicePartnership/embedded-mcu" } +embedded-mcu-hal = "0.3.0" static_cell = "2.1.0" embassy-sync = "0.8.0" diff --git a/platform/dev-qemu/supply-chain/config.toml b/platform/dev-qemu/supply-chain/config.toml index 645e891..9d5fca8 100644 --- a/platform/dev-qemu/supply-chain/config.toml +++ b/platform/dev-qemu/supply-chain/config.toml @@ -36,6 +36,14 @@ criteria = "safe-to-deploy" version = "1.0.4" criteria = "safe-to-deploy" +[[exemptions.crc]] +version = "3.4.0" +criteria = "safe-to-deploy" + +[[exemptions.crc-catalog]] +version = "2.5.0" +criteria = "safe-to-deploy" + [[exemptions.darling]] version = "0.20.11" criteria = "safe-to-deploy" @@ -76,6 +84,10 @@ criteria = "safe-to-deploy" version = "0.7.2" criteria = "safe-to-deploy" +[[exemptions.embedded-mcu-hal]] +version = "0.3.0" +criteria = "safe-to-deploy" + [[exemptions.embedded-sensors-hal]] version = "0.1.1" criteria = "safe-to-deploy" diff --git a/platform/platform-common/src/mock/battery.rs b/platform/platform-common/src/mock/battery.rs index 5ab0733..71edc3b 100644 --- a/platform/platform-common/src/mock/battery.rs +++ b/platform/platform-common/src/mock/battery.rs @@ -1,81 +1,57 @@ use battery_service as bs; -use bs::mock::{MockBattery, MockBatteryDriver}; +use bs::mock::MockFuelGauge; +use bs::FuelGauge as _; +use embassy_sync::mutex::Mutex; use embassy_time::Timer; -use embedded_services::{error, info}; +use embedded_services::{error, info, GlobalRawMutex}; use static_cell::StaticCell; -type BatteryService = bs::Service<'static, 1>; - -// The mock battery requires device ID of 0 -const BAT_ID: bs::device::DeviceId = bs::device::DeviceId(0); +/// The fuel gauge, behind a mutex so the service and the driving task can share it. +type FuelGauge = Mutex; +/// A single registered fuel gauge, which becomes battery `0`. +type Reg = bs::ArrayRegistration<'static, FuelGauge, 1>; +pub type BatteryService = bs::Service<'static, Reg>; pub async fn init(spawner: embassy_executor::Spawner) -> BatteryService { info!("Initializing battery service..."); - static BATTERY_DEVICE: StaticCell = StaticCell::new(); - let device = BATTERY_DEVICE.init(bs::device::Device::new(BAT_ID)); - let driver = MockBatteryDriver::new(); - let battery = MockBattery::new(device, driver); - - let service = odp_service_common::spawn_service!( - spawner, - BatteryService, - bs::InitParams { - devices: [device], - config: bs::context::Config::default(), - } - ) - .expect("Failed to initialize battery service"); + static FUEL_GAUGE: StaticCell = StaticCell::new(); + let fuel_gauge: &'static FuelGauge = FUEL_GAUGE.init(Mutex::new(MockFuelGauge::new())); - spawner.spawn(battery_device_controller_task(battery).expect("Failed to spawn battery device controller task")); + let service = bs::Service::new(bs::ArrayRegistration { + fuel_gauges: [fuel_gauge], + }); - bs::mock::init_state_machine(&service) + bs::mock::init_state_machine(fuel_gauge) .await .expect("Failed to initialize battery state machine"); - spawner.spawn(update_data_task(service.clone()).expect("Failed to spawn battery update data task")); + spawner.spawn(update_data_task(fuel_gauge).expect("Failed to spawn battery update data task")); service } #[embassy_executor::task] -async fn battery_device_controller_task(battery: MockBattery<'static>) { - battery.process().await; -} - -#[embassy_executor::task] -pub async fn update_data_task(service: BatteryService) -> ! { +pub async fn update_data_task(fuel_gauge: &'static FuelGauge) -> ! { let mut failures: u32 = 0; let mut count: usize = 0; loop { Timer::after_secs(1).await; if count.is_multiple_of(const { 60 * 60 * 60 }) { - if let Err(e) = service - .execute_event(bs::context::BatteryEvent { - event: bs::context::BatteryEventInner::PollStaticData, - device_id: BAT_ID, - }) - .await - { + if let Err(e) = fuel_gauge.lock().await.update_static_data().await { failures += 1; - error!("FG: Static data error: {:#?}", e); + error!("FG: Static data error: {:?}", defmt::Debug2Format(&e)); } } - if let Err(e) = service - .execute_event(bs::context::BatteryEvent { - event: bs::context::BatteryEventInner::PollDynamicData, - device_id: BAT_ID, - }) - .await - { + if let Err(e) = fuel_gauge.lock().await.update_dynamic_data().await { failures += 1; - error!("FG: Dynamic data error: {:#?}", e); + error!("FG: Dynamic data error: {:?}", defmt::Debug2Format(&e)); } if failures > 10 { failures = 0; count = 0; error!("FG: Too many errors, timing out and starting recovery..."); - if bs::mock::recover_state_machine(&service).await.is_err() { + if bs::mock::recover_state_machine(fuel_gauge).await.is_err() { error!("FG: Failed to recover state machine!"); } } diff --git a/platform/platform-common/src/mock/mod.rs b/platform/platform-common/src/mock/mod.rs index 1aafb95..a9ac63c 100644 --- a/platform/platform-common/src/mock/mod.rs +++ b/platform/platform-common/src/mock/mod.rs @@ -8,7 +8,7 @@ pub mod time_alarm; crate::impl_relay_handler!( MockOdpRelayHandler, - battery_service::Service<'static, 1>, + crate::mock::battery::BatteryService, crate::mock::thermal::ThermalService ); diff --git a/platform/platform-common/src/mock/thermal.rs b/platform/platform-common/src/mock/thermal.rs index f943ba9..a05672c 100644 --- a/platform/platform-common/src/mock/thermal.rs +++ b/platform/platform-common/src/mock/thermal.rs @@ -19,28 +19,27 @@ pub async fn init(spawner: embassy_executor::Spawner) -> ThermalService { info!("Initializing thermal service..."); // Create and spawn mock sensor service - let sensor_service = odp_service_common::spawn_service!( - spawner, - SensorService, - ts::sensor::InitParams { - driver: MockSensor::new(), - config: MockSensor::config(), - event_senders: &mut [], - } - ) - .expect("Failed to spawn mock sensor service"); + let sensor_service = + odp_service_common::spawn_service!(spawner, SensorService, |resources| ts::sensor::Service::new( + resources, + ts::sensor::InitParams { + driver: MockSensor::new(), + config: MockSensor::config(), + event_senders: &mut [], + }, + )) + .expect("Failed to spawn mock sensor service"); // Create and spawn mock fan service - let fan_service = odp_service_common::spawn_service!( - spawner, - FanService, + let fan_service = odp_service_common::spawn_service!(spawner, FanService, |resources| ts::fan::Service::new( + resources, ts::fan::InitParams { driver: MockFan::new(), config: MockFan::config(), sensor_service, event_senders: &mut [], - } - ) + }, + )) .expect("Failed to spawn mock fan service"); // Create the thermal service diff --git a/platform/platform-common/src/mock/time_alarm.rs b/platform/platform-common/src/mock/time_alarm.rs index ca6d802..68005d5 100644 --- a/platform/platform-common/src/mock/time_alarm.rs +++ b/platform/platform-common/src/mock/time_alarm.rs @@ -25,18 +25,15 @@ pub async fn init(spawner: embassy_executor::Spawner) -> TimeAlarmService { static CLOCK: StaticCell = StaticCell::new(); let clock = CLOCK.init(tas::mock::MockDatetimeClock::new_running()); - let service = odp_service_common::spawn_service!( - spawner, - TimeAlarmService, - tas::InitParams { - backing_clock: clock, - tz_storage, - ac_expiration_storage: ac_exp_storage, - ac_policy_storage: ac_pol_storage, - dc_expiration_storage: dc_exp_storage, - dc_policy_storage: dc_pol_storage, - } - ) + let service = odp_service_common::spawn_service!(spawner, TimeAlarmService, |resources| tas::Service::new( + resources, + clock, + tz_storage, + ac_exp_storage, + ac_pol_storage, + dc_exp_storage, + dc_pol_storage, + )) .expect("Failed to initialize time-alarm service"); service