From 2d4647a91805b803e56500ad43587fe09a063e8d Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Tue, 27 Aug 2024 19:51:14 -0700
Subject: [PATCH] manager/user: Rename GpuTdpLimit1 to TdpLimit1

---
 com.steampowered.SteamOSManager1.xml          | 62 ++++++++--------
 src/bin/steamosctl.rs                         | 13 ++--
 src/manager/user.rs                           | 70 +++++++++----------
 src/proxy/mod.rs                              |  4 +-
 .../{gpu_tdp_limit1.rs => tdp_limit1.rs}      |  6 +-
 5 files changed, 77 insertions(+), 78 deletions(-)
 rename src/proxy/{gpu_tdp_limit1.rs => tdp_limit1.rs} (91%)

diff --git a/com.steampowered.SteamOSManager1.xml b/com.steampowered.SteamOSManager1.xml
index f3bf527..891e18d 100644
--- a/com.steampowered.SteamOSManager1.xml
+++ b/com.steampowered.SteamOSManager1.xml
@@ -162,37 +162,6 @@
 
   </interface>
 
-  <!--
-      com.steampowered.SteamOSManager1.GpuTdpLimit1
-      @short_description: Optional interface for GPU TDP limits.
-  -->
-  <interface name="com.steampowered.SteamOSManager1.GpuTdpLimit1">
-
-    <!--
-        TdpLimit:
-
-        Controls the GPU TDP limit.
-
-        Valid states: In range of [ TdpLimitMin, TdpLimitMax ]
-    -->
-    <property name="TdpLimit" type="u" access="readwrite"/>
-
-    <!--
-        TdpLimitMin:
-
-        Minimum allowed TDP Limit.
-    -->
-    <property name="TdpLimitMin" type="u" access="read"/>
-
-    <!--
-        TdpLimitMax:
-
-        Maximum allowed TDP Limit.
-    -->
-    <property name="TdpLimitMax" type="u" access="read"/>
-
-  </interface>
-
   <!--
       com.steampowered.SteamOSManager1.HdmiCec1
       @short_description: Optional interface for HDMI-CEC.
@@ -278,6 +247,37 @@
 
   </interface>
 
+  <!--
+      com.steampowered.SteamOSManager1.TdpLimit1
+      @short_description: Optional interface for TDP limits.
+  -->
+  <interface name="com.steampowered.SteamOSManager1.TdpLimit1">
+
+    <!--
+        TdpLimit:
+
+        Controls the TDP limit.
+
+        Valid states: In range of [ TdpLimitMin, TdpLimitMax ]
+    -->
+    <property name="TdpLimit" type="u" access="readwrite"/>
+
+    <!--
+        TdpLimitMin:
+
+        Minimum allowed TDP Limit.
+    -->
+    <property name="TdpLimitMin" type="u" access="read"/>
+
+    <!--
+        TdpLimitMax:
+
+        Maximum allowed TDP Limit.
+    -->
+    <property name="TdpLimitMax" type="u" access="read"/>
+
+  </interface>
+
   <!--
       com.steampowered.SteamOSManager1.UpdateBios1
       @short_description: Optional interface for hardware that can update its
diff --git a/src/bin/steamosctl.rs b/src/bin/steamosctl.rs
index 212396f..2b40ff7 100644
--- a/src/bin/steamosctl.rs
+++ b/src/bin/steamosctl.rs
@@ -16,9 +16,8 @@ use steamos_manager::hardware::FanControlState;
 use steamos_manager::power::{CPUScalingGovernor, GPUPerformanceLevel, GPUPowerProfile};
 use steamos_manager::proxy::{
     AmbientLightSensor1Proxy, CpuScaling1Proxy, FactoryReset1Proxy, FanControl1Proxy,
-    GpuPerformanceLevel1Proxy, GpuPowerProfile1Proxy, GpuTdpLimit1Proxy, HdmiCec1Proxy,
-    Manager2Proxy, Storage1Proxy, UpdateBios1Proxy, UpdateDock1Proxy, WifiDebug1Proxy,
-    WifiPowerManagement1Proxy,
+    GpuPerformanceLevel1Proxy, GpuPowerProfile1Proxy, HdmiCec1Proxy, Manager2Proxy, Storage1Proxy,
+    TdpLimit1Proxy, UpdateBios1Proxy, UpdateDock1Proxy, WifiDebug1Proxy, WifiPowerManagement1Proxy,
 };
 use steamos_manager::wifi::{WifiBackend, WifiDebugMode, WifiPowerManagement};
 use zbus::fdo::{IntrospectableProxy, PropertiesProxy};
@@ -329,21 +328,21 @@ async fn main() -> Result<()> {
             println!("Manual GPU Clock Min: {value}");
         }
         Commands::SetTDPLimit { limit } => {
-            let proxy = GpuTdpLimit1Proxy::new(&conn).await?;
+            let proxy = TdpLimit1Proxy::new(&conn).await?;
             proxy.set_tdp_limit(*limit).await?;
         }
         Commands::GetTDPLimit => {
-            let proxy = GpuTdpLimit1Proxy::new(&conn).await?;
+            let proxy = TdpLimit1Proxy::new(&conn).await?;
             let limit = proxy.tdp_limit().await?;
             println!("TDP limit: {limit}");
         }
         Commands::GetTDPLimitMax => {
-            let proxy = GpuTdpLimit1Proxy::new(&conn).await?;
+            let proxy = TdpLimit1Proxy::new(&conn).await?;
             let value = proxy.tdp_limit_max().await?;
             println!("TDP limit max: {value}");
         }
         Commands::GetTDPLimitMin => {
-            let proxy = GpuTdpLimit1Proxy::new(&conn).await?;
+            let proxy = TdpLimit1Proxy::new(&conn).await?;
             let value = proxy.tdp_limit_min().await?;
             println!("TDP limit min: {value}");
         }
diff --git a/src/manager/user.rs b/src/manager/user.rs
index 55b7242..7a4ac7f 100644
--- a/src/manager/user.rs
+++ b/src/manager/user.rs
@@ -121,7 +121,7 @@ struct GpuPowerProfile1 {
     proxy: Proxy<'static>,
 }
 
-struct GpuTdpLimit1 {
+struct TdpLimit1 {
     proxy: Proxy<'static>,
 }
 
@@ -348,31 +348,6 @@ impl GpuPowerProfile1 {
     }
 }
 
-#[interface(name = "com.steampowered.SteamOSManager1.GpuTdpLimit1")]
-impl GpuTdpLimit1 {
-    #[zbus(property(emits_changed_signal = "false"))]
-    async fn tdp_limit(&self) -> fdo::Result<u32> {
-        get_tdp_limit().await.map_err(to_zbus_fdo_error)
-    }
-
-    #[zbus(property)]
-    async fn set_tdp_limit(&self, limit: u32) -> zbus::Result<()> {
-        self.proxy.call("SetTdpLimit", &(limit)).await
-    }
-
-    #[zbus(property(emits_changed_signal = "const"))]
-    async fn tdp_limit_min(&self) -> u32 {
-        // TODO: Can this be queried from somewhere?
-        3
-    }
-
-    #[zbus(property(emits_changed_signal = "const"))]
-    async fn tdp_limit_max(&self) -> u32 {
-        // TODO: Can this be queried from somewhere?
-        15
-    }
-}
-
 impl HdmiCec1 {
     async fn new(connection: &Connection) -> Result<HdmiCec1> {
         let hdmi_cec = HdmiCecControl::new(connection).await?;
@@ -440,6 +415,31 @@ impl Storage1 {
     }
 }
 
+#[interface(name = "com.steampowered.SteamOSManager1.TdpLimit1")]
+impl TdpLimit1 {
+    #[zbus(property(emits_changed_signal = "false"))]
+    async fn tdp_limit(&self) -> fdo::Result<u32> {
+        get_tdp_limit().await.map_err(to_zbus_fdo_error)
+    }
+
+    #[zbus(property)]
+    async fn set_tdp_limit(&self, limit: u32) -> zbus::Result<()> {
+        self.proxy.call("SetTdpLimit", &(limit)).await
+    }
+
+    #[zbus(property(emits_changed_signal = "const"))]
+    async fn tdp_limit_min(&self) -> u32 {
+        // TODO: Can this be queried from somewhere?
+        3
+    }
+
+    #[zbus(property(emits_changed_signal = "const"))]
+    async fn tdp_limit_max(&self) -> u32 {
+        // TODO: Can this be queried from somewhere?
+        15
+    }
+}
+
 #[interface(name = "com.steampowered.SteamOSManager1.UpdateBios1")]
 impl UpdateBios1 {
     async fn update_bios(&mut self) -> fdo::Result<zvariant::OwnedObjectPath> {
@@ -540,9 +540,6 @@ pub(crate) async fn create_interfaces(
     let gpu_power_profile = GpuPowerProfile1 {
         proxy: proxy.clone(),
     };
-    let gpu_tdp_limit = GpuTdpLimit1 {
-        proxy: proxy.clone(),
-    };
     let hdmi_cec = HdmiCec1::new(&session).await?;
     let manager2 = Manager2 {
         proxy: proxy.clone(),
@@ -552,6 +549,9 @@ pub(crate) async fn create_interfaces(
         proxy: proxy.clone(),
         job_manager: job_manager.clone(),
     };
+    let tdp_limit = TdpLimit1 {
+        proxy: proxy.clone(),
+    };
     let update_bios = UpdateBios1 {
         proxy: proxy.clone(),
         job_manager: job_manager.clone(),
@@ -609,10 +609,6 @@ pub(crate) async fn create_interfaces(
         object_server.at(MANAGER_PATH, gpu_power_profile).await?;
     }
 
-    if get_tdp_limit().await.is_ok() {
-        object_server.at(MANAGER_PATH, gpu_tdp_limit).await?;
-    }
-
     if hdmi_cec.hdmi_cec.get_enabled_state().await.is_ok() {
         object_server.at(MANAGER_PATH, hdmi_cec).await?;
     }
@@ -626,6 +622,10 @@ pub(crate) async fn create_interfaces(
         object_server.at(MANAGER_PATH, storage).await?;
     }
 
+    if get_tdp_limit().await.is_ok() {
+        object_server.at(MANAGER_PATH, tdp_limit).await?;
+    }
+
     if config
         .as_ref()
         .is_some_and(|config| config.update_bios.is_some())
@@ -836,10 +836,10 @@ mod test {
     }
 
     #[tokio::test]
-    async fn interface_matches_gpu_tdp_limit1() {
+    async fn interface_matches_tdp_limit1() {
         let test = start(all_config()).await.expect("start");
 
-        assert!(test_interface_matches::<GpuTdpLimit1>(&test.connection)
+        assert!(test_interface_matches::<TdpLimit1>(&test.connection)
             .await
             .unwrap());
     }
diff --git a/src/proxy/mod.rs b/src/proxy/mod.rs
index 8b5048c..d1eab37 100644
--- a/src/proxy/mod.rs
+++ b/src/proxy/mod.rs
@@ -26,10 +26,10 @@ mod factory_reset1;
 mod fan_control1;
 mod gpu_performance_level1;
 mod gpu_power_profile1;
-mod gpu_tdp_limit1;
 mod hdmi_cec1;
 mod manager2;
 mod storage1;
+mod tdp_limit1;
 mod update_bios1;
 mod update_dock1;
 mod wifi_debug1;
@@ -40,10 +40,10 @@ pub use crate::proxy::factory_reset1::FactoryReset1Proxy;
 pub use crate::proxy::fan_control1::FanControl1Proxy;
 pub use crate::proxy::gpu_performance_level1::GpuPerformanceLevel1Proxy;
 pub use crate::proxy::gpu_power_profile1::GpuPowerProfile1Proxy;
-pub use crate::proxy::gpu_tdp_limit1::GpuTdpLimit1Proxy;
 pub use crate::proxy::hdmi_cec1::HdmiCec1Proxy;
 pub use crate::proxy::manager2::Manager2Proxy;
 pub use crate::proxy::storage1::Storage1Proxy;
+pub use crate::proxy::tdp_limit1::TdpLimit1Proxy;
 pub use crate::proxy::update_bios1::UpdateBios1Proxy;
 pub use crate::proxy::update_dock1::UpdateDock1Proxy;
 pub use crate::proxy::wifi_debug1::WifiDebug1Proxy;
diff --git a/src/proxy/gpu_tdp_limit1.rs b/src/proxy/tdp_limit1.rs
similarity index 91%
rename from src/proxy/gpu_tdp_limit1.rs
rename to src/proxy/tdp_limit1.rs
index 5f75e14..137dbc0 100644
--- a/src/proxy/gpu_tdp_limit1.rs
+++ b/src/proxy/tdp_limit1.rs
@@ -1,4 +1,4 @@
-//! # D-Bus interface proxy for: `com.steampowered.SteamOSManager1.GpuTdpLimit1`
+//! # D-Bus interface proxy for: `com.steampowered.SteamOSManager1.TdpLimit1`
 //!
 //! This code was generated by `zbus-xmlgen` `4.1.0` from D-Bus introspection data.
 //! Source: `com.steampowered.SteamOSManager1.xml`.
@@ -13,12 +13,12 @@
 //! [D-Bus standard interfaces]: https://dbus.freedesktop.org/doc/dbus-specification.html#standard-interfaces,
 use zbus::proxy;
 #[proxy(
-    interface = "com.steampowered.SteamOSManager1.GpuTdpLimit1",
+    interface = "com.steampowered.SteamOSManager1.TdpLimit1",
     default_service = "com.steampowered.SteamOSManager1",
     default_path = "/com/steampowered/SteamOSManager1",
     assume_defaults = true
 )]
-trait GpuTdpLimit1 {
+trait TdpLimit1 {
     /// TdpLimit property
     #[zbus(property)]
     fn tdp_limit(&self) -> zbus::Result<u32>;