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/test/ucd90x_device_tests.cpp b/phosphor-power-sequencer/test/ucd90x_device_tests.cpp
index 2571e9b..5212d65 100644
--- a/phosphor-power-sequencer/test/ucd90x_device_tests.cpp
+++ b/phosphor-power-sequencer/test/ucd90x_device_tests.cpp
@@ -65,19 +65,19 @@
MockServices services;
std::string name{"ucd90320"};
+ uint8_t bus{3};
+ uint16_t address{0x72};
std::vector<std::unique_ptr<Rail>> rails;
rails.emplace_back(createRail("VDD", 5));
rails.emplace_back(createRail("VIO", 7));
- uint8_t bus{3};
- uint16_t address{0x72};
- UCD90xDevice device{name, std::move(rails), services, bus, address};
+ UCD90xDevice device{name, bus, address, std::move(rails), services};
EXPECT_EQ(device.getName(), name);
+ EXPECT_EQ(device.getBus(), bus);
+ EXPECT_EQ(device.getAddress(), address);
EXPECT_EQ(device.getRails().size(), 2);
EXPECT_EQ(device.getRails()[0]->getName(), "VDD");
EXPECT_EQ(device.getRails()[1]->getName(), "VIO");
- EXPECT_EQ(device.getBus(), bus);
- EXPECT_EQ(device.getAddress(), address);
EXPECT_EQ(device.getDriverName(), "ucd9000");
EXPECT_EQ(device.getInstance(), 0);
EXPECT_NE(&(device.getPMBusInterface()), nullptr);
@@ -90,10 +90,10 @@
MockServices services;
std::string name{"ucd90320"};
- std::vector<std::unique_ptr<Rail>> rails;
uint8_t bus{3};
uint16_t address{0x72};
- UCD90xDevice device{name, std::move(rails), services, bus, address};
+ std::vector<std::unique_ptr<Rail>> rails;
+ UCD90xDevice device{name, bus, address, std::move(rails), services};
MockPMBus& pmbus = static_cast<MockPMBus&>(device.getPMBusInterface());
uint64_t mfrStatus{0x123456789abcull};
@@ -109,10 +109,10 @@
MockServices services;
std::string name{"ucd90320"};
- std::vector<std::unique_ptr<Rail>> rails;
uint8_t bus{3};
uint16_t address{0x72};
- UCD90xDevice device{name, std::move(rails), services, bus, address};
+ std::vector<std::unique_ptr<Rail>> rails;
+ UCD90xDevice device{name, bus, address, std::move(rails), services};
MockPMBus& pmbus = static_cast<MockPMBus&>(device.getPMBusInterface());
EXPECT_CALL(pmbus, read("mfr_status", Type::HwmonDeviceDebug, true))
@@ -165,11 +165,11 @@
.Times(1);
std::string name{"ucd90320"};
- std::vector<std::unique_ptr<Rail>> rails;
- rails.emplace_back(createRail("VDD", 2));
uint8_t bus{3};
uint16_t address{0x72};
- UCD90xDevice device{name, std::move(rails), services, bus, address};
+ std::vector<std::unique_ptr<Rail>> rails;
+ rails.emplace_back(createRail("VDD", 2));
+ UCD90xDevice device{name, bus, address, std::move(rails), services};
MockPMBus& pmbus = static_cast<MockPMBus&>(device.getPMBusInterface());
EXPECT_CALL(pmbus, getPath(Type::Hwmon))
@@ -219,11 +219,11 @@
.Times(1);
std::string name{"ucd90320"};
- std::vector<std::unique_ptr<Rail>> rails;
- rails.emplace_back(createRail("VDD", 2));
uint8_t bus{3};
uint16_t address{0x72};
- UCD90xDevice device{name, std::move(rails), services, bus, address};
+ std::vector<std::unique_ptr<Rail>> rails;
+ rails.emplace_back(createRail("VDD", 2));
+ UCD90xDevice device{name, bus, address, std::move(rails), services};
MockPMBus& pmbus = static_cast<MockPMBus&>(device.getPMBusInterface());
EXPECT_CALL(pmbus, getPath(Type::Hwmon))