Pass name string into I2C DIMM detectors, store name in KingstonFuryDRAMController to avoid setting it in detector

Author: CalcProgrammer1

Controllers/CorsairVengeanceController/CorsairVengeanceControllerDetect.cpp

@@ -61,7 +61,7 @@ bool TestForCorsairVengeanceController(i2c_smbus_interface* bus, unsigned char a
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectCorsairVengeanceControllers(i2c_smbus_interface* bus, std::vector<SPDWrapper*> &slots)
+void DetectCorsairVengeanceControllers(i2c_smbus_interface* bus, std::vector<SPDWrapper*> &slots, const std::string &/*name*/)
 {
     for(SPDWrapper *slot : slots)
     {

Controllers/HyperXDRAMController/HyperXDRAMControllerDetect.cpp

@@ -67,7 +67,7 @@ bool TestForHyperXDRAMController(i2c_smbus_interface* bus, unsigned char address
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectHyperXDRAMControllers(i2c_smbus_interface* bus, std::vector<SPDWrapper*> &slots)
+void DetectHyperXDRAMControllers(i2c_smbus_interface* bus, std::vector<SPDWrapper*> &slots, const std::string &/*name*/)
 {
     unsigned char slots_valid   = 0x00;
     bool          fury_detected = false;

Controllers/KingstonFuryDRAMController/KingstonFuryDRAMController.cpp

@@ -16,12 +16,12 @@
 #include "RGBController.h"
 #include "LogManager.h"
 
-KingstonFuryDRAMController::KingstonFuryDRAMController(
-    i2c_smbus_interface* bus, unsigned char base_addr, std::vector<int> slots)
+KingstonFuryDRAMController::KingstonFuryDRAMController(i2c_smbus_interface* bus, unsigned char base_addr, std::vector<int> slots, std::string dev_name)
 {
     this->bus       = bus;
     this->base_addr = base_addr;
     this->slots     = slots;
+    this->name      = dev_name;
 
     reg_cache.resize(slots.size());
 }
@@ -47,6 +47,11 @@ std::string KingstonFuryDRAMController::GetDeviceLocation()
     return("I2C: " + return_string);
 }
 
+std::string KingstonFuryDRAMController::GetDeviceName()
+{
+    return(name);
+}
+
 unsigned int KingstonFuryDRAMController::GetLEDCount()
 {
     return(GetLEDPerDIMM() * (unsigned int)slots.size());

Controllers/KingstonFuryDRAMController/KingstonFuryDRAMController.h

@@ -124,9 +124,11 @@ enum
 class KingstonFuryDRAMController
 {
 public:
-    KingstonFuryDRAMController(i2c_smbus_interface* bus, unsigned char base_addr, std::vector<int> slots);
+    KingstonFuryDRAMController(i2c_smbus_interface* bus, unsigned char base_addr, std::vector<int> slots, std::string dev_name);
 
     std::string     GetDeviceLocation();
+    std::string     GetDeviceName();
+
     unsigned int    GetLEDCount();
     unsigned int    GetLEDPerDIMM();
     unsigned int    GetSlotCount();
@@ -152,5 +154,6 @@ class KingstonFuryDRAMController
     i2c_smbus_interface*    bus;
     std::vector<int>        slots;
     unsigned char           base_addr;
+    std::string             name;
     std::vector<std::map<unsigned char, unsigned char>> reg_cache;
 };

Controllers/KingstonFuryDRAMController/KingstonFuryDRAMControllerDetect.cpp

@@ -164,41 +164,37 @@ void DetectKingstonFuryDRAMControllers(i2c_smbus_interface* bus, std::vector<SPD
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectKingstonFuryDDR4Controllers(i2c_smbus_interface* bus, std::vector<SPDWrapper*> &slots)
+void DetectKingstonFuryDDR4Controllers(i2c_smbus_interface* bus, std::vector<SPDWrapper*> &slots, const std::string &name)
 {
     std::vector<int> fury_slots;
 
     DetectKingstonFuryDRAMControllers(bus, slots, FURY_BASE_ADDR_DDR4, TestDDR4Models, fury_slots);
 
     if(!fury_slots.empty())
     {
-        KingstonFuryDRAMController* controller =
-            new KingstonFuryDRAMController(bus, FURY_BASE_ADDR_DDR4, fury_slots);
-        RGBController_KingstonFuryDRAM* rgb_controller =
-            new RGBController_KingstonFuryDRAM(controller);
-        rgb_controller->name = "Kingston Fury DDR4 RGB";
+        KingstonFuryDRAMController*     controller     = new KingstonFuryDRAMController(bus, FURY_BASE_ADDR_DDR4, fury_slots, name);
+        RGBController_KingstonFuryDRAM* rgb_controller = new RGBController_KingstonFuryDRAM(controller);
+
         ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
 }
 
-void DetectKingstonFuryDDR5Controllers(i2c_smbus_interface* bus, std::vector<SPDWrapper*> &slots)
+void DetectKingstonFuryDDR5Controllers(i2c_smbus_interface* bus, std::vector<SPDWrapper*> &slots, const std::string &name)
 {
     std::vector<int> fury_slots;
 
     DetectKingstonFuryDRAMControllers(bus, slots, FURY_BASE_ADDR_DDR5, TestDDR5Models, fury_slots);
 
     if(!fury_slots.empty())
     {
-        KingstonFuryDRAMController* controller =
-            new KingstonFuryDRAMController(bus, FURY_BASE_ADDR_DDR5, fury_slots);
-        RGBController_KingstonFuryDRAM* rgb_controller =
-            new RGBController_KingstonFuryDRAM(controller);
-        rgb_controller->name = "Kingston Fury DDR5 RGB";
+        KingstonFuryDRAMController*     controller     = new KingstonFuryDRAMController(bus, FURY_BASE_ADDR_DDR5, fury_slots, name);
+        RGBController_KingstonFuryDRAM* rgb_controller = new RGBController_KingstonFuryDRAM(controller);
+
         ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
 }
 
-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);
+REGISTER_I2C_DIMM_DETECTOR("Kingston Fury DDR4 DRAM",   DetectKingstonFuryDDR4Controllers,  JEDEC_KINGSTON,     SPD_DDR4_SDRAM);
+REGISTER_I2C_DIMM_DETECTOR("Kingston Fury DDR4 DRAM",   DetectKingstonFuryDDR4Controllers,  JEDEC_KINGSTON_2,   SPD_DDR4_SDRAM);
+REGISTER_I2C_DIMM_DETECTOR("Kingston Fury DDR5 DRAM",   DetectKingstonFuryDDR5Controllers,  JEDEC_KINGSTON,     SPD_DDR5_SDRAM);
+REGISTER_I2C_DIMM_DETECTOR("Kingston Fury DDR5 DRAM",   DetectKingstonFuryDDR5Controllers,  JEDEC_KINGSTON_2,   SPD_DDR5_SDRAM);