From e928111c0004f58ba74580891ef68f0bf62d8948 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Sun, 3 Aug 2025 22:05:37 -0500 Subject: [PATCH] Store name in AsusAuraGPUController to avoid setting it in detector --- .../AsusAuraGPUController/AsusAuraGPUController.cpp | 11 +++++------ .../AsusAuraGPUController/AsusAuraGPUController.h | 4 ++-- .../AsusAuraGPUControllerDetect.cpp | 3 +-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Controllers/AsusAuraGPUController/AsusAuraGPUController.cpp b/Controllers/AsusAuraGPUController/AsusAuraGPUController.cpp index e75b1ca9..c8cfecf4 100644 --- a/Controllers/AsusAuraGPUController/AsusAuraGPUController.cpp +++ b/Controllers/AsusAuraGPUController/AsusAuraGPUController.cpp @@ -13,12 +13,11 @@ #include "AsusAuraGPUController.h" #include "pci_ids.h" -AuraGPUController::AuraGPUController(i2c_smbus_interface* bus, aura_gpu_dev_id dev) +AuraGPUController::AuraGPUController(i2c_smbus_interface* bus, aura_gpu_dev_id dev, std::string dev_name) { - this->bus = bus; - this->dev = dev; - - strcpy(device_name, "ASUS Aura GPU"); // Would be nice to get the actual GPU name. Using this as a placeholder. + this->bus = bus; + this->dev = dev; + this->name = dev_name; } AuraGPUController::~AuraGPUController() @@ -28,7 +27,7 @@ AuraGPUController::~AuraGPUController() std::string AuraGPUController::GetDeviceName() { - return(device_name); + return(name); } std::string AuraGPUController::GetDeviceLocation() diff --git a/Controllers/AsusAuraGPUController/AsusAuraGPUController.h b/Controllers/AsusAuraGPUController/AsusAuraGPUController.h index 99c7d425..fa414342 100644 --- a/Controllers/AsusAuraGPUController/AsusAuraGPUController.h +++ b/Controllers/AsusAuraGPUController/AsusAuraGPUController.h @@ -43,7 +43,7 @@ enum class AuraGPUController { public: - AuraGPUController(i2c_smbus_interface* bus, aura_gpu_dev_id); + AuraGPUController(i2c_smbus_interface* bus, aura_gpu_dev_id, std::string dev_name); ~AuraGPUController(); std::string GetDeviceName(); @@ -62,7 +62,7 @@ public: bool direct = false; // Temporary solution to check if we are in "Direct" mode private: - char device_name[16]; i2c_smbus_interface * bus; aura_gpu_dev_id dev; + std::string name; }; diff --git a/Controllers/AsusAuraGPUController/AsusAuraGPUControllerDetect.cpp b/Controllers/AsusAuraGPUController/AsusAuraGPUControllerDetect.cpp index e6740633..6e500892 100644 --- a/Controllers/AsusAuraGPUController/AsusAuraGPUControllerDetect.cpp +++ b/Controllers/AsusAuraGPUController/AsusAuraGPUControllerDetect.cpp @@ -56,9 +56,8 @@ void DetectAsusAuraGPUControllers(i2c_smbus_interface* bus, uint8_t i2c_addr, co { if(TestForAsusAuraGPUController(bus, i2c_addr)) { - AuraGPUController* controller = new AuraGPUController(bus, i2c_addr); + AuraGPUController* controller = new AuraGPUController(bus, i2c_addr, name); RGBController_AuraGPU* rgb_controller = new RGBController_AuraGPU(controller); - rgb_controller->name = name; ResourceManager::get()->RegisterRGBController(rgb_controller); }