Merge pull request #7 from tukl-msd/fix/minor-changes

Fix/minor changes
tukl-msd · Sep 4, 2024 · fae7d45 · fae7d45
2 parents b3ba22f + 95512eb
commit fae7d45
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/include/DRAMUtils/config/toggling_rate.h b/include/DRAMUtils/config/toggling_rate.h
@@ -0,0 +1,34 @@
+#ifndef DRAMUTILS_CONFIG_TOGGLING_RATE_H
+#define DRAMUTILS_CONFIG_TOGGLING_RATE_H
+
+#include <DRAMUtils/util/json_utils.h>
+
+namespace DRAMUtils::Config {
+
+enum class TogglingRateIdlePattern
+{
+    L = 0,
+    H = 1,
+    Z = 2,
+    Invalid = -1
+};
+NLOHMANN_JSON_SERIALIZE_ENUM(TogglingRateIdlePattern,
+                             {{TogglingRateIdlePattern::Invalid, nullptr},
+                              {TogglingRateIdlePattern::L, "L"},
+                              {TogglingRateIdlePattern::H, "H"},
+                              {TogglingRateIdlePattern::Z, "Z"}})
+
+struct ToggleRateDefinition
+{
+    double togglingRateRead;
+    double togglingRateWrite;
+    double dutyCycleRead;
+    double dutyCycleWrite;
+    TogglingRateIdlePattern idlePatternRead;
+    TogglingRateIdlePattern idlePatternWrite;
+};
+NLOHMANN_JSONIFY_ALL_THINGS(ToggleRateDefinition, togglingRateRead, togglingRateWrite, dutyCycleRead, dutyCycleWrite, idlePatternRead, idlePatternWrite)
+
+} // namespace DRAMUtils::Config
+
+#endif /* DRAMUTILS_CONFIG_TOGGLING_RATE_H */
diff --git a/include/DRAMUtils/memspec/standards/MemSpecLPDDR4.h b/include/DRAMUtils/memspec/standards/MemSpecLPDDR4.h
@@ -85,7 +85,6 @@ struct MemTimingSpecTypeLPDDR4
     uint64_t    RAS;
     uint64_t    RCD;
     uint64_t    RL;
-    uint64_t    REFM;
     uint64_t    REFI;
     uint64_t    REFIpb;
     uint64_t    RFCpb;
@@ -113,7 +112,7 @@ struct MemTimingSpecTypeLPDDR4
     uint64_t    XSR;
     uint64_t    RTRS;
 };
-NLOHMANN_JSONIFY_ALL_THINGS(MemTimingSpecTypeLPDDR4, tCK, CKE, ESCKE, CMDCKE, RAS, RCD, RL, REFM, REFI, REFIpb, RFCpb, RFCab, RPpb, RPab, RCpb, RCab, PPD, FAW, RRD, CCD, CCDMW, RPST, DQSCK, RTP, WL, DQSS, DQS2DQ, WR, WPRE, WTR, XP, SR, XSR, RTRS)
+NLOHMANN_JSONIFY_ALL_THINGS(MemTimingSpecTypeLPDDR4, tCK, CKE, ESCKE, CMDCKE, RAS, RCD, RL, REFI, REFIpb, RFCpb, RFCab, RPpb, RPab, RCpb, RCab, PPD, FAW, RRD, CCD, CCDMW, RPST, DQSCK, RTP, WL, DQSS, DQS2DQ, WR, WPRE, WTR, XP, SR, XSR, RTRS)
 
 enum class pasrModesType {
     PASR_0,

diff --git a/tests/tests_memspec/CMakeLists.txt b/tests/tests_memspec/CMakeLists.txt
@@ -2,7 +2,7 @@
 ###               tests_memspec             ###
 ###############################################
 
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.5.0)
 
 project(tests_memspec)