commit e77709916bcbd9700718d2a21f695545991cd2ad
author Jason M. Bills <jason.m.bills@linux.intel.com> Fri May 14 13:24:33 2021 -0700
committer Jason M. Bills <jason.m.bills@linux.intel.com> Fri May 14 14:21:53 2021 -0700
tree 893dabb3848f02d477d4bbf8644b9b92b89f4fb6
parent fbe1b68c96f88a9f9b64ab1cb68757402ab10b77

Fix smbios-mdrv2 CI build

The phosphor-dbus-interface type for memorySizeInKB changed
from uint32_t to size_t.

https://gerrit.openbmc-project.xyz/c/openbmc/phosphor-dbus-interfaces/+/41870

This updates smbios-mdrv2 with that change to fix the CI build.

The phosphor-dbus-interface name for Common::UUID changed
from uUID to uuid.  This updates smbios-mdrv2 with that change
to fix the CI build.

Change-Id: I37994e7b36ea8182c01386d804ff2de1e682fdd8
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>

include/dimm.hpp

diff --git a/include/dimm.hpp b/include/dimm.hpp
index 79da4cf..4230ae4 100644
--- a/include/dimm.hpp
+++ b/include/dimm.hpp
@@ -66,7 +66,7 @@
     void memoryInfoUpdate(void);
 
     uint16_t memoryDataWidth(uint16_t value) override;
-    uint32_t memorySizeInKB(uint32_t value) override;
+    size_t memorySizeInKB(size_t value) override;
     std::string memoryDeviceLocator(std::string value) override;
     DeviceType memoryType(DeviceType value) override;
     std::string memoryTypeDetail(std::string value) override;
@@ -84,7 +84,7 @@
     uint8_t* storage;
 
     void dimmSize(const uint16_t size);
-    void dimmSizeExt(const uint32_t size);
+    void dimmSizeExt(const size_t size);
     void dimmDeviceLocator(const uint8_t positionNum, const uint8_t structLen,
                            uint8_t* dataIn);
     void dimmType(const uint8_t type);
@@ -119,7 +119,7 @@
     uint8_t assetTag;
     uint8_t partNum;
     uint8_t attributes;
-    uint32_t extendedSize;
+    size_t extendedSize;
     uint16_t confClockSpeed;
     uint16_t minimumVoltage;
     uint16_t maximumVoltage;

include/system.hpp

diff --git a/include/system.hpp b/include/system.hpp
index cf69cb7..79f4eab 100644
--- a/include/system.hpp
+++ b/include/system.hpp
@@ -51,11 +51,11 @@
         path(objPath), storage(smbiosTableStorage)
     {
         std::string input = "0";
-        uUID(input);
+        uuid(input);
         version("0.00");
     }
 
-    std::string uUID(std::string value) override;
+    std::string uuid(std::string value) override;
 
     std::string version(std::string value) override;
 
@@ -102,7 +102,7 @@
         uint8_t productName;
         uint8_t version;
         uint8_t serialNum;
-        struct UUID uUID;
+        struct UUID uuid;
         uint8_t wakeupType;
         uint8_t skuNum;
         uint8_t family;