From acca2baa57217e26e4fc2e08477142cd67759b08 Mon Sep 17 00:00:00 2001
From: Oleksii Taranenko <toptaran@gmail.com>
Date: Fri, 4 Apr 2025 08:26:33 +0000
Subject: [PATCH] Fixed Kingston Fury Beast DDR5 do not detect #4725

---
 .../KingstonFuryDRAMControllerDetect.cpp                        | 2 ++
 Detector.h                                                      | 2 +-
 SPDAccessor/SPDCommon.h                                         | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Controllers/KingstonFuryDRAMController/KingstonFuryDRAMControllerDetect.cpp b/Controllers/KingstonFuryDRAMController/KingstonFuryDRAMControllerDetect.cpp
index 2942ba8a..28545c1c 100644
--- a/Controllers/KingstonFuryDRAMController/KingstonFuryDRAMControllerDetect.cpp
+++ b/Controllers/KingstonFuryDRAMController/KingstonFuryDRAMControllerDetect.cpp
@@ -199,3 +199,5 @@ void DetectKingstonFuryDDR5Controllers(i2c_smbus_interface* bus, std::vector<SPD
 
 REGISTER_I2C_DIMM_DETECTOR("Kingston Fury DDR4 DRAM", DetectKingstonFuryDDR4Controllers, JEDEC_KINGSTON, SPD_DDR4_SDRAM);
 REGISTER_I2C_DIMM_DETECTOR("Kingston Fury DDR5 DRAM", DetectKingstonFuryDDR5Controllers, JEDEC_KINGSTON, SPD_DDR5_SDRAM);
+REGISTER_I2C_DIMM_DETECTOR("Kingston JEDEC2 Fury DDR4 DRAM", DetectKingstonFuryDDR4Controllers, JEDEC_KINGSTON_2, SPD_DDR4_SDRAM);
+REGISTER_I2C_DIMM_DETECTOR("Kingston JEDEC2 Fury DDR5 DRAM", DetectKingstonFuryDDR5Controllers, JEDEC_KINGSTON_2, SPD_DDR5_SDRAM);
diff --git a/Detector.h b/Detector.h
index 09bf7211..cdaf9c89 100644
--- a/Detector.h
+++ b/Detector.h
@@ -13,7 +13,7 @@
 
 #define REGISTER_DETECTOR(name, func)                                                   static DeviceDetector           device_detector_obj_##func(name, func)
 #define REGISTER_I2C_DETECTOR(name, func)                                               static I2CDeviceDetector        device_detector_obj_##func(name, func)
-#define REGISTER_I2C_DIMM_DETECTOR(name, func, jedec_id, dimm_type)                     static I2CDIMMDeviceDetector    device_detector_obj_##func(name, func, jedec_id, dimm_type)
+#define REGISTER_I2C_DIMM_DETECTOR(name, func, jedec_id, dimm_type)                     static I2CDIMMDeviceDetector    device_detector_obj_##func##jedec_id(name, func, jedec_id, dimm_type)
 #define REGISTER_I2C_PCI_DETECTOR(name, func, ven, dev, subven, subdev, addr)           static I2CPCIDeviceDetector     device_detector_obj_##ven##dev##subven##subdev##addr##func(name, func, ven, dev, subven, subdev, addr)
 #define REGISTER_I2C_BUS_DETECTOR(func)                                                 static I2CBusDetector           device_detector_obj_##func(func)
 #define REGISTER_HID_DETECTOR(name, func, vid, pid)                                     static HIDDeviceDetector        device_detector_obj_##vid##pid(name, func, vid, pid, HID_INTERFACE_ANY, HID_USAGE_PAGE_ANY, HID_USAGE_ANY)
diff --git a/SPDAccessor/SPDCommon.h b/SPDAccessor/SPDCommon.h
index cc7fcc63..ee176235 100644
--- a/SPDAccessor/SPDCommon.h
+++ b/SPDAccessor/SPDCommon.h
@@ -19,6 +19,7 @@ typedef enum
     JEDEC_ADATA       = 0x044A,
     JEDEC_GSKILL      = 0x044C,
     JEDEC_TEAMGROUP   = 0x046E,
+    JEDEC_KINGSTON_2  = 0x300F,
     JEDEC_MUSHKIN     = 0x8313,
     JEDEC_GIGABYTE    = 0x8971,
     JEDEC_THERMALTAKE = 0x8A41,