diff options
| author | Ed Tanous <edtanous@google.com> | 2021-09-27 19:07:55 +0300 |
|---|---|---|
| committer | Ed Tanous <edtanous@google.com> | 2021-09-27 21:22:24 +0300 |
| commit | 36ea1cefb542a70be3e567c4b256e7b103c70b2a (patch) | |
| tree | e751b1c9a1a9660f6a772b7d3d4ed0c2abdba2fd /redfish-core/lib | |
| parent | 3e8c7dfce4869711e22ccc76c90cebb55984d36c (diff) | |
| download | bmcweb-36ea1cefb542a70be3e567c4b256e7b103c70b2a.tar.xz | |
Revert "PCIe: Implement "PcieType" PCIe device property"
This reverts commit 3e8c7dfce4869711e22ccc76c90cebb55984d36c.
As pointed out in the review. The patchset doesn't implement the latest
phosphor-dbus-interfaces interface. It was a mistake to merged it. To
the submitter, please resubmit it once we have the right interface
sorted out, and we'll be able to get this in.
Change-Id: Id433b354cbebc11f12c49bcd965e931e72075008
Signed-off-by: Ed Tanous <edtanous@google.com>
Diffstat (limited to 'redfish-core/lib')
| -rw-r--r-- | redfish-core/lib/pcie.hpp | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/redfish-core/lib/pcie.hpp b/redfish-core/lib/pcie.hpp index 79d9c1e36e..e53443404f 100644 --- a/redfish-core/lib/pcie.hpp +++ b/redfish-core/lib/pcie.hpp @@ -94,38 +94,6 @@ inline void requestRoutesSystemPCIeDeviceCollection(App& app) }); } -inline std::string analysisGeneration(const std::string& pcieType) -{ - if (pcieType == - "xyz.openbmc_project.Inventory.Item.PCIeSlot.Generations.Gen1") - { - return "Gen1"; - } - if (pcieType == - "xyz.openbmc_project.Inventory.Item.PCIeSlot.Generations.Gen2") - { - return "Gen2"; - } - if (pcieType == - "xyz.openbmc_project.Inventory.Item.PCIeSlot.Generations.Gen3") - { - return "Gen3"; - } - if (pcieType == - "xyz.openbmc_project.Inventory.Item.PCIeSlot.Generations.Gen4") - { - return "Gen4"; - } - if (pcieType == - "xyz.openbmc_project.Inventory.Item.PCIeSlot.Generations.Gen5") - { - return "Gen5"; - } - - // Unknown or others - return ""; -} - inline void requestRoutesSystemPCIeDevice(App& app) { BMCWEB_ROUTE(app, "/redfish/v1/Systems/system/PCIeDevices/<str>/") @@ -182,19 +150,6 @@ inline void requestRoutesSystemPCIeDevice(App& app) asyncResp->res.jsonValue["DeviceType"] = *property; } - if (std::string* property = std::get_if<std::string>( - &pcieDevProperties["PcieType"]); - property) - { - std::string pcieType = analysisGeneration(*property); - if (!pcieType.empty()) - { - asyncResp->res - .jsonValue["PCIeInterface"]["PcieType"] = - pcieType; - } - } - asyncResp->res.jsonValue["PCIeFunctions"] = { {"@odata.id", "/redfish/v1/Systems/system/PCIeDevices/" + device + |