power-policy-interface: Break out from power-policy-service

Author: RobertZ2011

Cargo.lock

@@ -22,6 +22,7 @@ members = [
     "debug-service",
     "debug-service-messages",
     "keyboard-service",
+    "power-policy-interface",
 ]
 exclude = ["examples/*"]
 
@@ -86,6 +87,7 @@ embedded-usb-pd = { git = "https://github.com/OpenDevicePartnership/embedded-usb
 mctp-rs = { git = "https://github.com/dymk/mctp-rs" }
 num_enum = { version = "0.7.5", default-features = false }
 portable-atomic = { version = "1.11", default-features = false }
+power-policy-interface = { path = "./power-policy-interface" }
 paste = "1.0.15"
 fixed = "1.23.1"
 heapless = "0.8.*"

Cargo.toml

@@ -24,7 +24,7 @@ log = { workspace = true, optional = true }
 zerocopy.workspace = true
 mctp-rs = { workspace = true, features = ["espi"] }
 heapless.workspace = true
-power-policy-service = { path = "../power-policy-service" }
+power-policy-interface.workspace = true
 
 [features]
 default = []

battery-service/Cargo.toml

@@ -9,7 +9,7 @@ use battery_service_messages::{
     STD_BIX_OEM_SIZE, STD_BIX_SERIAL_SIZE, STD_PIF_MODEL_SIZE, STD_PIF_OEM_SIZE, STD_PIF_SERIAL_SIZE,
 };
 
-use power_policy_service::capability::PowerCapability;
+use power_policy_interface::capability::PowerCapability;
 
 use crate::{
     AcpiBatteryError,

battery-service/src/acpi.rs

@@ -10,7 +10,7 @@ use embassy_time::{Duration, with_timeout};
 use embedded_services::GlobalRawMutex;
 use embedded_services::comms::MailboxDelegateError;
 use embedded_services::{IntrusiveList, debug, error, info, intrusive_list, trace, warn};
-use power_policy_service::capability::PowerCapability;
+use power_policy_interface::capability::PowerCapability;
 
 use core::ops::DerefMut;
 use core::sync::atomic::AtomicUsize;
@@ -530,7 +530,7 @@ impl Context {
 
     pub(crate) fn set_power_info(
         &self,
-        power_info: &power_policy_service::service::event::CommsData,
+        power_info: &power_policy_interface::service::event::CommsData,
     ) -> Result<(), MailboxDelegateError> {
         let mut guard = self
             .power_info
@@ -540,13 +540,13 @@ impl Context {
         let psu_state = guard.deref_mut();
 
         match power_info {
-            power_policy_service::service::event::CommsData::ConsumerDisconnected(_) => {
+            power_policy_interface::service::event::CommsData::ConsumerDisconnected(_) => {
                 *psu_state = PsuState {
                     psu_connected: false,
                     power_capability: None,
                 }
             }
-            power_policy_service::service::event::CommsData::ConsumerConnected(_device_id, power_capability) => {
+            power_policy_interface::service::event::CommsData::ConsumerConnected(_device_id, power_capability) => {
                 *psu_state = PsuState {
                     psu_connected: true,
                     power_capability: Some(power_capability.capability),

battery-service/src/context.rs

@@ -142,7 +142,9 @@ impl comms::MailboxDelegate for Service {
             })?
         } else if let Some(battery_request) = message.data.get::<AcpiBatteryRequest>() {
             self.context.send_acpi_cmd(*battery_request);
-        } else if let Some(power_policy_msg) = message.data.get::<power_policy_service::service::event::CommsMessage>()
+        } else if let Some(power_policy_msg) = message
+            .data
+            .get::<power_policy_interface::service::event::CommsMessage>()
         {
             self.context.set_power_info(&power_policy_msg.data)?;
         }

battery-service/src/lib.rs

@@ -54,6 +54,9 @@ embedded-services = { path = "../../embedded-service", features = ["defmt"] }
 power-button-service = { path = "../../power-button-service", features = [
     "defmt",
 ] }
+power-policy-interface = { path = "../../power-policy-interface", features = [
+    "defmt",
+] }
 power-policy-service = { path = "../../power-policy-service", features = [
     "defmt",
 ] }