summaryrefslogtreecommitdiff
path: root/psu-manager/include
diff options
context:
space:
mode:
Diffstat (limited to 'psu-manager/include')
-rw-r--r--psu-manager/include/cold_redundancy.hpp9
-rw-r--r--psu-manager/include/utility.hpp6
2 files changed, 5 insertions, 10 deletions
diff --git a/psu-manager/include/cold_redundancy.hpp b/psu-manager/include/cold_redundancy.hpp
index cd7a5f6..81c56d1 100644
--- a/psu-manager/include/cold_redundancy.hpp
+++ b/psu-manager/include/cold_redundancy.hpp
@@ -21,7 +21,6 @@
const constexpr char* psuInterface =
"/xyz/openbmc_project/inventory/system/powersupply/";
const constexpr int secondsInOneDay = 86400;
-const constexpr uint8_t bmcSpecific = 0;
using Association = std::tuple<std::string, std::string, std::string>;
@@ -47,14 +46,10 @@ class ColdRedundancy
private:
bool crSupported = true;
- bool crEnabled = true;
- bool rotationEnabled = true;
- std::string rotationAlgo =
- "xyz.openbmc_project.Control.PowerSupplyRedundancy.Algo.bmcSpecific";
uint8_t psOrder;
uint8_t numberOfPSU = 0;
- uint32_t rotationPeriod = 7 * secondsInOneDay;
uint8_t redundancyPSURequire = 1;
+ std::vector<uint8_t> settingsOrder = {};
void startRotateCR(void);
void startCRCheck(void);
@@ -91,7 +86,7 @@ class PowerSupply
{
public:
PowerSupply(
- std::string name, uint8_t bus, uint8_t address,
+ std::string& name, uint8_t bus, uint8_t address, uint8_t order,
const std::shared_ptr<sdbusplus::asio::connection>& dbusConnection);
~PowerSupply();
std::string name;
diff --git a/psu-manager/include/utility.hpp b/psu-manager/include/utility.hpp
index d0df858..33bca75 100644
--- a/psu-manager/include/utility.hpp
+++ b/psu-manager/include/utility.hpp
@@ -28,9 +28,9 @@ static const constexpr std::array<const char*, 1> psuEventInterface = {
"xyz.openbmc_project.State.Decorator.OperationalStatus"};
using BasicVariantType =
- std::variant<std::vector<std::string>, std::vector<uint64_t>, std::string,
- int64_t, uint64_t, double, int32_t, uint32_t, int16_t,
- uint16_t, uint8_t, bool>;
+ std::variant<std::vector<std::string>, std::vector<uint64_t>,
+ std::vector<uint8_t>, std::string, int64_t, uint64_t, double,
+ int32_t, uint32_t, int16_t, uint16_t, uint8_t, bool>;
using PropertyMapType =
boost::container::flat_map<std::string, BasicVariantType>;