pseq: Move bus/addr higher in class hierarchy
Update the PowerSequencerDevice class hierarchy within the
phosphor-power-sequencer application.
The I2C bus and address for the power sequencer device(s) in the system
are now defined in the JSON configuration file.
Move the I2C bus and address properties to the top of the
PowerSequencerDevice class hierarchy.
For sub-classes that already had these properties, order the constructor
parameters to match the order in the JSON.
Tested:
* Ran automated test cases
Change-Id: Ida6886cbc62a9c8abd3bed294f6ddcd1851ccd62
Signed-off-by: Shawn McCarney <shawnmm@us.ibm.com>
diff --git a/phosphor-power-sequencer/src/standard_device.hpp b/phosphor-power-sequencer/src/standard_device.hpp
index 227e3bc..03a6bf0 100644
--- a/phosphor-power-sequencer/src/standard_device.hpp
+++ b/phosphor-power-sequencer/src/standard_device.hpp
@@ -19,6 +19,7 @@
#include "rail.hpp"
#include "services.hpp"
+#include <cstdint>
#include <map>
#include <memory>
#include <string>
@@ -53,11 +54,14 @@
* Constructor.
*
* @param name device name
+ * @param bus I2C bus for the device
+ * @param address I2C address for the device
* @param rails voltage rails that are enabled and monitored by this device
*/
- explicit StandardDevice(const std::string& name,
+ explicit StandardDevice(const std::string& name, uint8_t bus,
+ uint16_t address,
std::vector<std::unique_ptr<Rail>> rails) :
- name{name}, rails{std::move(rails)}
+ name{name}, bus{bus}, address{address}, rails{std::move(rails)}
{}
/** @copydoc PowerSequencerDevice::getName() */
@@ -66,6 +70,18 @@
return name;
}
+ /** @copydoc PowerSequencerDevice::getBus() */
+ virtual uint8_t getBus() const override
+ {
+ return bus;
+ }
+
+ /** @copydoc PowerSequencerDevice::getAddress() */
+ virtual uint16_t getAddress() const override
+ {
+ return address;
+ }
+
/** @copydoc PowerSequencerDevice::getRails() */
virtual const std::vector<std::unique_ptr<Rail>>& getRails() const override
{
@@ -173,6 +189,16 @@
std::string name{};
/**
+ * I2C bus for the device.
+ */
+ uint8_t bus;
+
+ /**
+ * I2C address for the device.
+ */
+ uint16_t address;
+
+ /**
* Voltage rails that are enabled and monitored by this device.
*/
std::vector<std::unique_ptr<Rail>> rails{};