Remove Configuration interface prefix from utils APIs
This eliminates some repetitive verbosity from daemons that handle a lot
of different sensor types (such as hwmontempsensor and psusensor). It
also positions us to more cleanly use a single data structure for both
existing APIs like GetSensorConfiguration() and
setupPropertiesChangedMatches(), as well as upcoming I2C
device-management support.
Tested: hwmontempsensor and adcsensor on romed8hm3 continue to behave as
they did previously.
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
Change-Id: I9d80475ca4160c8d2ff0afab942709496d51238d
diff --git a/src/ADCSensorMain.cpp b/src/ADCSensorMain.cpp
index 3669330..a2f6514 100644
--- a/src/ADCSensorMain.cpp
+++ b/src/ADCSensorMain.cpp
@@ -39,8 +39,7 @@
namespace fs = std::filesystem;
-static constexpr auto sensorTypes{
- std::to_array<const char*>({"xyz.openbmc_project.Configuration.ADC"})};
+static constexpr auto sensorTypes{std::to_array<const char*>({"ADC"})};
static std::regex inputRegex(R"(in(\d+)_input)");
static boost::container::flat_map<size_t, bool> cpuPresence;
@@ -120,7 +119,7 @@
// find base configuration
for (const char* type : sensorTypes)
{
- auto sensorBase = cfgData.find(type);
+ auto sensorBase = cfgData.find(configInterfaceName(type));
if (sensorBase != cfgData.end())
{
baseConfiguration = &(*sensorBase);