Skip to content

Commit f1c2a1e

Browse files
TheRogueZetaCalcProgrammer1
authored andcommitted
Update GPU deivce logging to use common string
1 parent 39c0689 commit f1c2a1e

File tree

10 files changed

+20
-9
lines changed

10 files changed

+20
-9
lines changed

Controllers/AsusAuraGPUController/AsusAuraGPUControllerDetect.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ void DetectAsusAuraGPUControllers(std::vector<i2c_smbus_interface*> &busses)
118118
busses[bus]->pci_subsystem_vendor == device_list[dev_idx].pci_subsystem_vendor &&
119119
busses[bus]->pci_subsystem_device == device_list[dev_idx].pci_subsystem_device)
120120
{
121+
LOG_DEBUG(GPU_DETECT_MESSAGE, ASUSGPU_CONTROLLER_NAME, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name );
121122
if (TestForAsusAuraGPUController(busses[bus], device_list[dev_idx].controller_address))
122123
{
123124
new_aura_gpu = new AuraGPUController(busses[bus], device_list[dev_idx].controller_address);

Controllers/EVGAGPUController/EVGAGPUCommon.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,4 @@ union u16_to_u8
1616
uint8_t LSB;
1717
uint8_t MSB;
1818
};
19-
};
20-
21-
#define EVGA_DETECT_MESSAGE "[%s] Found a device match at Bus %02d for Device %04x and SubDevice %04x: %s"
19+
};

Controllers/EVGAGPUController/EVGAGPUControllerDetect.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ void DetectEVGAGPUControllers(std::vector<i2c_smbus_interface*>& busses)
139139
{
140140
case EVGA_RGB_V1:
141141
{
142-
LOG_DEBUG(EVGA_DETECT_MESSAGE, EVGAGPUV1_CONTROLLER_NAME, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name );
142+
LOG_DEBUG(GPU_DETECT_MESSAGE, EVGAGPUV1_CONTROLLER_NAME, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name );
143143
EVGAGPUv1Controller* new_controller;
144144
RGBController_EVGAGPUv1* new_rgbcontroller;
145145

@@ -152,7 +152,7 @@ void DetectEVGAGPUControllers(std::vector<i2c_smbus_interface*>& busses)
152152

153153
case EVGA_RGB_V2:
154154
{
155-
LOG_DEBUG(EVGA_DETECT_MESSAGE, EVGAGPUV2_CONTROLLER_NAME, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name );
155+
LOG_DEBUG(GPU_DETECT_MESSAGE, EVGAGPUV2_CONTROLLER_NAME, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name );
156156
EVGAGPUv2Controller* new_controller;
157157
RGBController_EVGAGPUv2* new_rgbcontroller;
158158

@@ -165,7 +165,7 @@ void DetectEVGAGPUControllers(std::vector<i2c_smbus_interface*>& busses)
165165

166166
case EVGA_RGB_V3:
167167
{
168-
LOG_DEBUG(EVGA_DETECT_MESSAGE, EVGAGPUV3_CONTROLLER_NAME, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name );
168+
LOG_DEBUG(GPU_DETECT_MESSAGE, EVGAGPUV3_CONTROLLER_NAME, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name );
169169
EVGAGPUv3Controller* new_controller;
170170
RGBController_EVGAGPUv3* new_rgbcontroller;
171171

@@ -187,7 +187,7 @@ void DetectEVGAGPUControllers(std::vector<i2c_smbus_interface*>& busses)
187187
break;
188188
case EVGA_RGB_GP102:
189189
{
190-
LOG_DEBUG(EVGA_DETECT_MESSAGE, EVGA_GP102_CONTROLLER_NAME, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name );
190+
LOG_DEBUG(GPU_DETECT_MESSAGE, EVGA_GP102_CONTROLLER_NAME, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name );
191191
RGBController_EVGAGP102* new_rgbcontroller;
192192
std::vector<EVGAGP102Controller*> controllers;
193193

Controllers/GainwardGPUController/GainwardGPUControllerDetect.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "Detector.h"
1010
#include "GainwardGPUv1Controller.h"
1111
#include "GainwardGPUv2Controller.h"
12+
#include "LogManager.h"
1213
#include "RGBController.h"
1314
#include "RGBController_GainwardGPUv1.h"
1415
#include "RGBController_GainwardGPUv2.h"
@@ -109,6 +110,7 @@ void DetectGainwardGPUControllers(std::vector<i2c_smbus_interface*> &busses)
109110
{
110111
case RGB_V1:
111112
{
113+
LOG_DEBUG(GPU_DETECT_MESSAGE, "Gainward v1", bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name );
112114
GainwardGPUv1Controller* new_GainwardGPU;
113115
RGBController_GainwardGPUv1* new_controller;
114116

@@ -121,6 +123,7 @@ void DetectGainwardGPUControllers(std::vector<i2c_smbus_interface*> &busses)
121123

122124
case RGB_V2:
123125
{
126+
LOG_DEBUG(GPU_DETECT_MESSAGE, "Gainward v2", bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name );
124127
GainwardGPUv2Controller* new_GainwardGPU;
125128
RGBController_GainwardGPUv2* new_controller;
126129

Controllers/GalaxGPUController/GalaxGPUControllerDetect.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#include "Detector.h"
1010
#include "GalaxGPUController.h"
11+
#include "LogManager.h"
1112
#include "RGBController.h"
1213
#include "RGBController_GalaxGPU.h"
1314
#include "i2c_smbus.h"
@@ -82,6 +83,7 @@ void DetectGalaxGPUControllers(std::vector<i2c_smbus_interface*> &busses)
8283
busses[bus]->pci_subsystem_vendor == device_list[dev_idx].pci_subsystem_vendor &&
8384
busses[bus]->pci_subsystem_device == device_list[dev_idx].pci_subsystem_device)
8485
{
86+
LOG_DEBUG(GPU_DETECT_MESSAGE, "Galax GPU", bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name );
8587
if (TestForGalaxGPUController(busses[bus], 0x23))
8688
{
8789
new_GalaxGPU = new GalaxGPUController(busses[bus], 0x23);

Controllers/GigabyteRGBFusion2GPUController/GigabyteRGBFusion2GPUControllerDetect.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ typedef struct
1919
const char * name;
2020
} gpu_pci_device;
2121

22-
#define GIGABYTEGPU_DETECT_MESSAGE "[%s] Found a device match at Bus %02d for Device %04x and SubDevice %04x: %s"
2322
#define GIGABYTEGPU_CONTROLLER_NAME2 "Gigabyte RGB Fusion2 GPU"
2423
#define GPU_NUM_DEVICES (sizeof(device_list) / sizeof(device_list[ 0 ]))
2524

@@ -98,7 +97,7 @@ void DetectGigabyteRGBFusion2GPUControllers(std::vector<i2c_smbus_interface*>& b
9897
busses[bus]->pci_subsystem_vendor == device_list[dev_idx].pci_subsystem_vendor &&
9998
busses[bus]->pci_subsystem_device == device_list[dev_idx].pci_subsystem_device)
10099
{
101-
LOG_DEBUG(GIGABYTEGPU_DETECT_MESSAGE, GIGABYTEGPU_CONTROLLER_NAME2, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name );
100+
LOG_DEBUG(GPU_DETECT_MESSAGE, GIGABYTEGPU_CONTROLLER_NAME2, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name );
102101
// Check for RGB Fusion2 controller
103102
if(TestForGigabyteRGBFusion2GPUController(busses[bus], device_list[dev_idx].controller_address))
104103
{

Controllers/GigabyteRGBFusionGPUController/GigabyteRGBFusionGPUControllerDetect.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ void DetectGigabyteRGBFusionGPUControllers(std::vector<i2c_smbus_interface*>& bu
160160
busses[bus]->pci_subsystem_vendor == device_list[dev_idx].pci_subsystem_vendor &&
161161
busses[bus]->pci_subsystem_device == device_list[dev_idx].pci_subsystem_device)
162162
{
163+
LOG_DEBUG(GPU_DETECT_MESSAGE, GIGABYTEGPU_CONTROLLER_NAME, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name );
163164
// Check for RGB Fusion controller
164165
if (TestForGigabyteRGBFusionGPUController(busses[bus], device_list[dev_idx].controller_address))
165166
{

Controllers/MSIGPUController/MSIGPUControllerDetect.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#include "Detector.h"
99
#include "MSIGPUController.h"
10+
#include "LogManager.h"
1011
#include "RGBController.h"
1112
#include "RGBController_MSIGPU.h"
1213
#include "i2c_smbus.h"
@@ -25,6 +26,7 @@ typedef struct
2526
} msi_gpu_pci_device;
2627

2728
#define MSI_GPU_NUM_DEVICES (sizeof(device_list) / sizeof(device_list[ 0 ]))
29+
#define MSI_CONTROLLER_NAME "MSI GPU"
2830

2931
static const msi_gpu_pci_device device_list[] =
3032
{
@@ -99,6 +101,7 @@ void DetectMSIGPUControllers(std::vector<i2c_smbus_interface*> &busses)
99101
busses[bus]->pci_subsystem_vendor == device_list[dev_idx].pci_subsystem_vendor &&
100102
busses[bus]->pci_subsystem_device == device_list[dev_idx].pci_subsystem_device)
101103
{
104+
LOG_DEBUG(GPU_DETECT_MESSAGE, MSI_CONTROLLER_NAME, bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name );
102105
new_msi_gpu = new MSIGPUController(busses[bus]);
103106
new_controller = new RGBController_MSIGPU(new_msi_gpu);
104107
new_controller->name = device_list[dev_idx].name;

Controllers/PNYGPUController/PNYGPUControllerDetect.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "Detector.h"
2+
#include "LogManager.h"
23
#include "PNYGPUController.h"
34
#include "RGBController.h"
45
#include "RGBController_PNYGPU.h"
@@ -80,6 +81,7 @@ void DetectPNYGPUControllers(std::vector<i2c_smbus_interface*>& busses)
8081
{
8182
case PNY_RGB:
8283
{
84+
LOG_DEBUG(GPU_DETECT_MESSAGE, "PNY GPU", bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name );
8385
PNYGPUController* new_controller;
8486
RGBController_PNYGPU* new_rgbcontroller;
8587

LogManager.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
#define SMBUS_CHECK_DEVICE_MESSAGE_EN "[%s] Bus %02d is a motherboard and the subvendor matches the one for %s, looking for a device at %02X"
1616
#define SMBUS_CHECK_DEVICE_FAILURE_EN "[%s] Bus %02d is not a motherboard or the subvendor does not match the one for %s, skipping detection"
1717

18+
#define GPU_DETECT_MESSAGE "[%s] Found a device match at Bus %02d for Device %04x and SubDevice %04x: %s"
19+
1820
using json = nlohmann::json;
1921

2022
enum

0 commit comments

Comments
 (0)