take into account memory type DDR5

Signed-off-by: Slice <[email protected]>
CloverHackyColor · Jan 13, 2024 · 4b62853 · 4b62853
1 parent ce3e437
commit 4b62853
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/buildme b/buildme
@@ -30,7 +30,7 @@ end tell
 tell application "Terminal"
 	activate
 	set bounds of window 1 to {0, 23, 615, 420}
-	set current settings of window 1 to settings set "Pro"
+#	set current settings of window 1 to settings set "Pro"
 #	set font name of window 1 to "Monaco"
 #	set font size of window 1 to "11"
 #	set normal text color of window 1 to {3341, 35186, 50092}

diff --git a/rEFIt_UEFI/Platform/smbios.cpp b/rEFIt_UEFI/Platform/smbios.cpp
@@ -1573,6 +1573,7 @@ void PatchTableType17(const SmbiosInjectedSettings& smbiosSettings, XArray<UINT1
         newSmbiosTable.Type17->MemoryType = smbiosSettings.Memory.getSlotInfoForSlotID(UserIndex).Type;
         if ((newSmbiosTable.Type17->MemoryType != MemoryTypeDdr2) &&
             (newSmbiosTable.Type17->MemoryType != MemoryTypeDdr4) &&
+            (newSmbiosTable.Type17->MemoryType != MemoryTypeDdr5) &&
             (newSmbiosTable.Type17->MemoryType != MemoryTypeDdr)) {
           newSmbiosTable.Type17->MemoryType = MemoryTypeDdr3;
         }
@@ -1876,9 +1877,10 @@ void PatchTableType17(const SmbiosInjectedSettings& smbiosSettings, XArray<UINT1
 
 //    gSettings.MemorySpeed.S8Printf("%d", newSmbiosTable.Type17->Speed);
 
-    // Assume DDR3 unless explicitly set to DDR2/DDR/DDR4
+    // Assume DDR3 unless explicitly set to DDR2/DDR/DDR4/DDR5
     if ((newSmbiosTable.Type17->MemoryType != MemoryTypeDdr2) &&
         (newSmbiosTable.Type17->MemoryType != MemoryTypeDdr4) &&
+        (newSmbiosTable.Type17->MemoryType != MemoryTypeDdr5) &&
         (newSmbiosTable.Type17->MemoryType != MemoryTypeDdr)) {
       newSmbiosTable.Type17->MemoryType = MemoryTypeDdr3;
     }

diff --git a/rEFIt_UEFI/Platform/spd.cpp b/rEFIt_UEFI/Platform/spd.cpp
@@ -24,7 +24,7 @@
 
 #ifndef DEBUG_SPD
 #ifndef DEBUG_ALL
-#define DEBUG_SPD 0
+#define DEBUG_SPD 1
 #else
 #define DEBUG_SPD DEBUG_ALL
 #endif

diff --git a/rEFIt_UEFI/Settings/ConfigPlist/SMBIOSPlist.h b/rEFIt_UEFI/Settings/ConfigPlist/SMBIOSPlist.h
@@ -146,11 +146,13 @@ class SmbiosPlistClass : public ConfigPlistAbstractClass
                return MemoryTypeDdr3;
               } else if (Type.value().isEqualIC("DDR4")) {
                return MemoryTypeDdr4;
-              } else if (Type.value().isEqualIC("DDR")) {
+              } else if (Type.value().isEqualIC("DDR5")) {
+               return MemoryTypeDdr5;
+              } else /*if (Type.value().isEqualIC("DDR"))*/ {
                return MemoryTypeDdr;
               }
               // Cannot happen if validate has been done properly.
-              panic("invalid DDRx value");
+              //panic("invalid DDRx value");
             }
 
           };