mirror of
https://github.com/CalcProgrammer1/OpenRGB.git
synced 2026-01-21 21:47:54 -05:00
Move HID detector calls to RunHIDDetector/RunHIDWrappedDetector functions and return controller list from detector functions
This commit is contained in:
@@ -12,50 +12,44 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include "DetectionManager.h"
|
||||
#include "PalitGPUController.h"
|
||||
#include "RGBController_PalitGPU.h"
|
||||
#include "i2c_smbus.h"
|
||||
#include "PalitGPUController.h"
|
||||
#include "pci_ids.h"
|
||||
#include "RGBController_PalitGPU.h"
|
||||
|
||||
/******************************************************************************************\
|
||||
* *
|
||||
* DetectPalitGPUControllers *
|
||||
* *
|
||||
* Detect Palit GPU controllers on the enumerated I2C busses at address 0x49. *
|
||||
* *
|
||||
* bus - pointer to i2c_smbus_interface where Palit GPU device is connected *
|
||||
* dev - I2C address of Palit GPU device *
|
||||
* * *
|
||||
* Ligolas Neo Malicdem - Added 1060, 1070, 1070ti support *
|
||||
\******************************************************************************************/
|
||||
|
||||
void DetectPalitGPUControllers(i2c_smbus_interface* bus, uint8_t i2c_addr, const std::string& name)
|
||||
DetectedControllers DetectPalitGPUControllers(i2c_smbus_interface* bus, uint8_t i2c_addr, const std::string& name)
|
||||
{
|
||||
if(bus->port_id != 1)
|
||||
DetectedControllers detected_controllers;
|
||||
|
||||
if(bus->port_id == 1)
|
||||
{
|
||||
return;
|
||||
}
|
||||
/*-----------------------------------------------------*\
|
||||
| Check for PALIT string |
|
||||
\*-----------------------------------------------------*/
|
||||
const uint8_t palit[] = {'P', 'A', 'L', 'I', 'T'};
|
||||
bool match = true;
|
||||
|
||||
/*-----------------------------------------------------*\
|
||||
| Check for PALIT string |
|
||||
\*-----------------------------------------------------*/
|
||||
const uint8_t palit[] = {'P', 'A', 'L', 'I', 'T'};
|
||||
|
||||
for(size_t i = 0; i < sizeof(palit); i++)
|
||||
{
|
||||
int32_t letter = bus->i2c_smbus_read_byte_data(i2c_addr, 0x07 + (u8)i);
|
||||
|
||||
if(palit[i] != letter)
|
||||
for(size_t i = 0; i < sizeof(palit); i++)
|
||||
{
|
||||
return;
|
||||
int32_t letter = bus->i2c_smbus_read_byte_data(i2c_addr, 0x07 + (u8)i);
|
||||
|
||||
if(palit[i] != letter)
|
||||
{
|
||||
match = false;
|
||||
}
|
||||
}
|
||||
|
||||
if(match)
|
||||
{
|
||||
PalitGPUController* controller = new PalitGPUController(bus, i2c_addr, name);
|
||||
RGBController_PalitGPU* rgb_controller = new RGBController_PalitGPU(controller);
|
||||
|
||||
DetectionManager::get()->RegisterRGBController(rgb_controller);
|
||||
}
|
||||
}
|
||||
|
||||
PalitGPUController* controller = new PalitGPUController(bus, i2c_addr, name);
|
||||
RGBController_PalitGPU* rgb_controller = new RGBController_PalitGPU(controller);
|
||||
|
||||
DetectionManager::get()->RegisterRGBController(rgb_controller);
|
||||
} /* DetectPalitGPUControllers() */
|
||||
return(detected_controllers);
|
||||
}
|
||||
|
||||
REGISTER_I2C_PCI_DETECTOR("Palit GeForce GTX 1060", DetectPalitGPUControllers, NVIDIA_VEN, NVIDIA_GTX1060_DEV, NVIDIA_SUB_VEN, NVIDIA_GTX1060_DEV, 0x08);
|
||||
REGISTER_I2C_PCI_DETECTOR("Palit GeForce GTX 1070", DetectPalitGPUControllers, NVIDIA_VEN, NVIDIA_GTX1070_DEV, NVIDIA_SUB_VEN, NVIDIA_GTX1070_DEV, 0x08);
|
||||
|
||||
Reference in New Issue
Block a user