commit dc3b7902c874491d1ac46ee08c03081facbe0820
author Patrick Venture <venture@google.com> Sat Mar 24 10:41:19 2018 -0700
committer Patrick Venture <venture@google.com> Thu May 10 09:18:09 2018 -0700
tree 1a4805b17b57d74a2228f148a2842427d28a2707
parent 0d73b108d235cd403f98fbbf72346fdce0bf8fd8

s/Control.FanCtrl.Mode/Control.Mode/

The interface for a Mode is generic enough for
objects beyond strictly fan control.

Change-Id: I3cb7e7564f841e680dc34743908644be9639267d
Signed-off-by: Patrick Venture <venture@google.com>

ipmi/manualcmds.cpp

diff --git a/ipmi/manualcmds.cpp b/ipmi/manualcmds.cpp
index 2d2d53b..d71eedb 100644
--- a/ipmi/manualcmds.cpp
+++ b/ipmi/manualcmds.cpp
@@ -47,7 +47,7 @@
 
 static constexpr auto objectPath = "/xyz/openbmc_project/settings/fanctrl/zone";
 static constexpr auto busName = "xyz.openbmc_project.State.FanCtrl";
-static constexpr auto intf = "xyz.openbmc_project.Control.FanCtrl.Mode";
+static constexpr auto intf = "xyz.openbmc_project.Control.Mode";
 static constexpr auto manualProperty = "Manual";
 static constexpr auto failsafeProperty = "FailSafe";
 static constexpr auto propertiesintf = "org.freedesktop.DBus.Properties";
@@ -68,7 +68,7 @@
  *     org.freedesktop.DBus.Properties \
  *     GetAll \
  *     s \
- *     xyz.openbmc_project.Control.FanCtrl.Mode
+ *     xyz.openbmc_project.Control.Mode
  * a{sv} 2 "Manual" b false "FailSafe" b false
  */
 

pid/zone.hpp

diff --git a/pid/zone.hpp b/pid/zone.hpp
index d75bf59..c7b52c7 100644
--- a/pid/zone.hpp
+++ b/pid/zone.hpp
@@ -12,7 +12,7 @@
 #include "sensors/sensor.hpp"
 #include "sensors/manager.hpp"
 
-#include "xyz/openbmc_project/Control/FanCtrl/Mode/server.hpp"
+#include "xyz/openbmc_project/Control/Mode/server.hpp"
 #include <sdbusplus/bus.hpp>
 #include <sdbusplus/server.hpp>
 
@@ -20,7 +20,7 @@
 template <typename... T>
 using ServerObject = typename sdbusplus::server::object::object<T...>;
 using ModeInterface =
-    sdbusplus::xyz::openbmc_project::Control::FanCtrl::server::Mode;
+    sdbusplus::xyz::openbmc_project::Control::server::Mode;
 using ModeObject = ServerObject<ModeInterface>;
 
 /*

setsensor.cpp

diff --git a/setsensor.cpp b/setsensor.cpp
index 7daa762..cef8090 100644
--- a/setsensor.cpp
+++ b/setsensor.cpp
@@ -7,7 +7,7 @@
 /* Fan Control */
 static constexpr auto objectPath = "/xyz/openbmc_project/settings/fanctrl/zone";
 static constexpr auto busName = "xyz.openbmc_project.State.FanCtrl";
-static constexpr auto intf = "xyz.openbmc_project.Control.FanCtrl.Mode";
+static constexpr auto intf = "xyz.openbmc_project.Control.Mode";
 static constexpr auto property = "Manual";
 using Value = sdbusplus::message::variant<bool>;