Remove Legacy code from P10 and future code
Remove Occ control code that supports older hardware models P8 and P9.
This is in preparation for occ control taking over occ poll handling.
Change-Id: Iff99ac8ff3a3fe6e9a6af994b20b06793ead50fc
Signed-off-by: Sheldon Bailey <baileysh@us.ibm.com>
diff --git a/app.cpp b/app.cpp
index 5598177..f0929d7 100644
--- a/app.cpp
+++ b/app.cpp
@@ -2,11 +2,8 @@
#include "occ_events.hpp"
#include "occ_manager.hpp"
-#include "utils.hpp"
-
-#ifdef POWER10
#include "powermode.hpp"
-#endif
+#include "utils.hpp"
#include <org/open_power/OCC/Device/error.hpp>
#include <phosphor-logging/lg2.hpp>
@@ -36,13 +33,12 @@
// Add object manager interfaces (for mapper)
sdbusplus::server::manager_t objManager(bus, OCC_CONTROL_ROOT);
-#ifdef READ_OCC_SENSORS
+
sdbusplus::server::manager_t objManagerXyz(bus, OCC_SENSORS_ROOT);
-#endif
-#ifdef POWER10
+
sdbusplus::server::manager_t objManagerXyzControl(
bus, "/xyz/openbmc_project/control");
-#endif
+
sdbusplus::server::manager_t objManagerXyzInventory(
bus, "/xyz/openbmc_project/inventory");
open_power::occ::Manager mgr(eventP);