summaryrefslogtreecommitdiff
path: root/include/dimm.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'include/dimm.hpp')
-rw-r--r--include/dimm.hpp47
1 files changed, 37 insertions, 10 deletions
diff --git a/include/dimm.hpp b/include/dimm.hpp
index caac229..00fa9bb 100644
--- a/include/dimm.hpp
+++ b/include/dimm.hpp
@@ -15,9 +15,14 @@
*/
#pragma once
+#include "smbios.hpp"
+
#include <xyz/openbmc_project/Inventory/Decorator/Asset/server.hpp>
#include <xyz/openbmc_project/Inventory/Item/Dimm/server.hpp>
-#include "smbios.hpp"
+#include <xyz/openbmc_project/Inventory/Decorator/LocationCode/server.hpp>
+#include <xyz/openbmc_project/Inventory/Item/server.hpp>
+#include <xyz/openbmc_project/State/Decorator/OperationalStatus/server.hpp>
+#include <xyz/openbmc_project/Inventory/Connector/Slot/server.hpp>
namespace phosphor
{
@@ -28,11 +33,19 @@ namespace smbios
using DeviceType =
sdbusplus::xyz::openbmc_project::Inventory::Item::server::Dimm::DeviceType;
-class Dimm
- : sdbusplus::server::object::object<
- sdbusplus::xyz::openbmc_project::Inventory::Item::server::Dimm>,
- sdbusplus::server::object::object<
- sdbusplus::xyz::openbmc_project::Inventory::Decorator::server::Asset>
+class Dimm :
+ sdbusplus::server::object_t<
+ sdbusplus::xyz::openbmc_project::Inventory::Item::server::Dimm>,
+ sdbusplus::server::object_t<
+ sdbusplus::xyz::openbmc_project::Inventory::Decorator::server::Asset>,
+ sdbusplus::server::object_t<sdbusplus::xyz::openbmc_project::Inventory::
+ Decorator::server::LocationCode>,
+ sdbusplus::server::object_t<
+ sdbusplus::xyz::openbmc_project::Inventory::server::Item>,
+ sdbusplus::server::object_t<sdbusplus::xyz::openbmc_project::State::
+ Decorator::server::OperationalStatus>,
+ sdbusplus::server::object_t<
+ sdbusplus::xyz::openbmc_project::Inventory::Connector::server::Slot>
{
public:
@@ -46,12 +59,24 @@ class Dimm
Dimm(sdbusplus::bus::bus &bus, const std::string &objPath,
const uint8_t &dimmId, struct ManagedDataRegion *region) :
- sdbusplus::server::object::object<
+ sdbusplus::server::object_t<
sdbusplus::xyz::openbmc_project::Inventory::Item::server::Dimm>(
bus, objPath.c_str()),
- sdbusplus::server::object::object<
- sdbusplus::xyz::openbmc_project::Inventory::Decorator::server::
- Asset>(bus, objPath.c_str()),
+ sdbusplus::server::object_t<sdbusplus::xyz::openbmc_project::Inventory::
+ Decorator::server::Asset>(
+ bus, objPath.c_str()),
+ sdbusplus::server::object_t<sdbusplus::xyz::openbmc_project::Inventory::
+ Decorator::server::LocationCode>(
+ bus, objPath.c_str()),
+ sdbusplus::server::object_t<
+ sdbusplus::xyz::openbmc_project::Inventory::server::Item>(
+ bus, objPath.c_str()),
+ sdbusplus::server::object_t<sdbusplus::xyz::openbmc_project::State::
+ Decorator::server::OperationalStatus>(
+ bus, objPath.c_str()),
+ sdbusplus::server::object_t<sdbusplus::xyz::openbmc_project::Inventory::
+ Connector::server::Slot>(
+ bus, objPath.c_str()),
dimmNum(dimmId), regionS(region)
{
memoryInfoUpdate();
@@ -66,8 +91,10 @@ class Dimm
std::string memoryTypeDetail(std::string value) override;
uint16_t maxMemorySpeedInMhz(uint16_t value) override;
std::string manufacturer(std::string value) override;
+ bool present(bool value) override;
std::string serialNumber(std::string value) override;
std::string partNumber(std::string value) override;
+ std::string locationCode(std::string value) override;
uint8_t memoryAttributes(uint8_t value) override;
uint16_t memoryConfiguredSpeedInMhz(uint16_t value) override;