From dca81fc4f339db787f4bf1ec2585e88848b3bcc5 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Thu, 18 Nov 2021 09:54:31 -0600 Subject: [PATCH] Use GPU type for ENE ASUS GPU, print out config table to logs --- .../ENESMBusController/ENESMBusController.cpp | 29 +++++++++++++++++++ .../ENESMBusControllerDetect.cpp | 3 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/Controllers/ENESMBusController/ENESMBusController.cpp b/Controllers/ENESMBusController/ENESMBusController.cpp index 506ae45a2..3894db8eb 100644 --- a/Controllers/ENESMBusController/ENESMBusController.cpp +++ b/Controllers/ENESMBusController/ENESMBusController.cpp @@ -11,6 +11,7 @@ \*-----------------------------------------*/ #include "ENESMBusController.h" +#include "LogManager.h" #include static const char* ene_channels[] = /* ENE channel strings */ @@ -41,6 +42,34 @@ ENESMBusController::ENESMBusController(i2c_smbus_interface* bus, ene_dev_id dev) config_table[i] = ENERegisterRead(ENE_REG_CONFIG_TABLE + i); } + /*-----------------------------------------------------------------*\ + | If this is running with TRACE or higher loglevel then | + | dump the entire Feature list to log | + \*-----------------------------------------------------------------*/ + if(LogManager::get()->getLoglevel() >= LL_TRACE) + { + LOG_TRACE("[ENE SMBus] ENE config table for 0x%02X:", dev); + LOG_TRACE(" %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X", config_table[0], config_table[1], config_table[2], config_table[3], + config_table[4], config_table[5], config_table[6], config_table[7], + config_table[8], config_table[9], config_table[10], config_table[11], + config_table[12], config_table[13], config_table[14], config_table[15]); + + LOG_TRACE(" %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X", config_table[16], config_table[17], config_table[18], config_table[19], + config_table[20], config_table[21], config_table[22], config_table[23], + config_table[24], config_table[25], config_table[26], config_table[27], + config_table[28], config_table[29], config_table[30], config_table[31]); + + LOG_TRACE(" %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X", config_table[32], config_table[33], config_table[34], config_table[35], + config_table[36], config_table[37], config_table[38], config_table[39], + config_table[40], config_table[41], config_table[42], config_table[43], + config_table[44], config_table[45], config_table[46], config_table[47]); + + LOG_TRACE(" %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X", config_table[48], config_table[49], config_table[50], config_table[51], + config_table[52], config_table[53], config_table[54], config_table[55], + config_table[56], config_table[57], config_table[58], config_table[59], + config_table[60], config_table[61], config_table[62], config_table[63]); + } + // Read LED count from configuration table led_count = config_table[ENE_CONFIG_LED_COUNT]; diff --git a/Controllers/ENESMBusController/ENESMBusControllerDetect.cpp b/Controllers/ENESMBusController/ENESMBusControllerDetect.cpp index 0420deef7..f2d1c1eb9 100644 --- a/Controllers/ENESMBusController/ENESMBusControllerDetect.cpp +++ b/Controllers/ENESMBusController/ENESMBusControllerDetect.cpp @@ -332,7 +332,8 @@ void DetectENESMBusGPUControllers(std::vector &busses) RGBController_ENESMBus* rgb_controller = new RGBController_ENESMBus(controller); rgb_controller->name = device_list[dev_idx].name; - + rgb_controller->type = DEVICE_TYPE_GPU; + ResourceManager::get()->RegisterRGBController(rgb_controller); } else