power-policy-service: Refactor module structure and renaming

Cargo.toml

@@ -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.*"

battery-service-messages/Cargo.toml

@@ -7,6 +7,7 @@ repository.workspace = true
 
 [dependencies]
 defmt = { workspace = true, optional = true }
+log = { workspace = true, optional = true }
 embedded-batteries-async.workspace = true
 embedded-services.workspace = true
 num_enum.workspace = true
@@ -15,4 +16,9 @@ num_enum.workspace = true
 workspace = true
 
 [features]
-defmt = ["dep:defmt", "embedded-batteries-async/defmt"]
+defmt = [
+    "dep:defmt",
+    "embedded-services/defmt",
+    "embedded-batteries-async/defmt",
+]
+log = ["dep:log", "embedded-services/log"]

battery-service/Cargo.toml

@@ -24,13 +24,15 @@ log = { workspace = true, optional = true }
 zerocopy.workspace = true
 mctp-rs = { workspace = true, features = ["espi"] }
 heapless.workspace = true
+power-policy-interface.workspace = true
 
 [features]
 default = []
 defmt = [
     "dep:defmt",
     "battery-service-messages/defmt",
     "embedded-services/defmt",
+    "power-policy-interface/defmt",
     "embassy-time/defmt",
     "embassy-sync/defmt",
     "embedded-batteries-async/defmt",
@@ -39,6 +41,7 @@ defmt = [
 log = [
     "dep:log",
     "embedded-services/log",
+    "power-policy-interface/log",
     "embassy-time/log",
     "embassy-sync/log",
 ]

battery-service/src/acpi.rs

@@ -2,13 +2,15 @@
 use core::ops::Deref;
 
 use embedded_batteries_async::acpi::{PowerSourceState, PowerUnit};
-use embedded_services::{info, power::policy::PowerCapability, trace};
+use embedded_services::{info, trace};
 
 use battery_service_messages::{
     AcpiBatteryResponse, BixFixedStrings, DeviceId, PifFixedStrings, STD_BIX_BATTERY_SIZE, STD_BIX_MODEL_SIZE,
     STD_BIX_OEM_SIZE, STD_BIX_SERIAL_SIZE, STD_PIF_MODEL_SIZE, STD_PIF_OEM_SIZE, STD_PIF_SERIAL_SIZE,
 };
 
+use power_policy_interface::capability::PowerCapability;
+
 use crate::{
     AcpiBatteryError,
     context::PsuState,

battery-service/src/context.rs

@@ -8,8 +8,8 @@ use embassy_sync::mutex::Mutex;
 use embassy_time::{Duration, with_timeout};
 use embedded_services::GlobalRawMutex;
 use embedded_services::comms::MailboxDelegateError;
-use embedded_services::power::policy::PowerCapability;
 use embedded_services::{IntrusiveList, debug, error, info, intrusive_list, trace, warn};
+use power_policy_interface::capability::PowerCapability;
 
 use core::ops::DerefMut;
 use core::sync::atomic::AtomicUsize;
@@ -519,7 +519,7 @@ impl Context {
 
     pub(crate) fn set_power_info(
         &self,
-        power_info: &embedded_services::power::policy::CommsData,
+        power_info: &power_policy_interface::service::event::CommsData,
     ) -> Result<(), MailboxDelegateError> {
         let mut guard = self
             .power_info
@@ -529,13 +529,13 @@ impl Context {
         let psu_state = guard.deref_mut();
 
         match power_info {
-            embedded_services::power::policy::CommsData::ConsumerDisconnected(_) => {
+            power_policy_interface::service::event::CommsData::ConsumerDisconnected(_) => {
                 *psu_state = PsuState {
                     psu_connected: false,
                     power_capability: None,
                 }
             }
-            embedded_services::power::policy::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/lib.rs

@@ -126,7 +126,12 @@ impl comms::MailboxDelegate for Service {
             self.context.send_event_no_wait(*event).map_err(|e| match e {
                 embassy_sync::channel::TrySendError::Full(_) => comms::MailboxDelegateError::BufferFull,
             })?
-        } else if let Some(power_policy_msg) = message.data.get::<embedded_services::power::policy::CommsMessage>() {
+        } 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_interface::service::event::CommsMessage>()
+        {
             self.context.set_power_info(&power_policy_msg.data)?;
         }
 

embedded-service/Cargo.toml

@@ -22,7 +22,6 @@ document-features.workspace = true
 embassy-sync.workspace = true
 embassy-time.workspace = true
 embassy-futures.workspace = true
-embedded-batteries-async.workspace = true
 embedded-cfu-protocol.workspace = true
 embedded-hal-async.workspace = true
 embedded-io-async.workspace = true

embedded-service/src/lib.rs

@@ -21,10 +21,8 @@ pub mod hid;
 pub mod init;
 pub mod ipc;
 pub mod keyboard;
-pub mod power;
 pub mod relay;
 pub mod sync;
-pub mod type_c;
 
 /// Hidden re-exports used by macros defined in this crate.
 /// Not part of the public API — do not depend on these directly.
@@ -85,5 +83,4 @@ pub async fn init() {
     comms::init();
     activity::init();
     keyboard::init();
-    power::policy::init();
 }