Skip to content

Commit b349c3f

Browse files
Update PawnIO SMBus driver to use standardized API between all drivers, add NCT6793 driver, and remove WinRing0 SMBus drivers
1 parent 30a250c commit b349c3f

File tree

12 files changed

+127
-328
lines changed

12 files changed

+127
-328
lines changed

Controllers/ENESMBusController/ENESMBusControllerDetect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ void DetectENESMBusMotherboardControllers(std::vector<i2c_smbus_interface*> &bus
277277
// Add ENE (ASUS Aura) motherboard controllers
278278
IF_MOBO_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device)
279279
{
280-
if(busses[bus]->pci_subsystem_vendor == ASUS_SUB_VEN || busses[bus]->pci_subsystem_vendor == 0)
280+
if(busses[bus]->pci_subsystem_vendor == ASUS_SUB_VEN || busses[bus]->pci_subsystem_vendor == 0 || busses[bus]->pci_subsystem_vendor == 0xFFFF)
281281
{
282282
for (unsigned int address_list_idx = 0; address_list_idx < AURA_MOBO_ADDRESS_COUNT; address_list_idx++)
283283
{

OpenRGB.pro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,7 @@ win32:contains(QMAKE_TARGET.arch, x86_64) {
431431
copydata.commands += $(COPY_FILE) \"$$shell_path($$PWD/dependencies/PawnIO/PawnIOLib.dll )\" \"$$shell_path($$DESTDIR)\" $$escape_expand(\n\t)
432432
copydata.commands += $(COPY_FILE) \"$$shell_path($$PWD/dependencies/PawnIO/modules/SmbusPIIX4.bin )\" \"$$shell_path($$DESTDIR)\" $$escape_expand(\n\t)
433433
copydata.commands += $(COPY_FILE) \"$$shell_path($$PWD/dependencies/PawnIO/modules/SmbusI801.bin )\" \"$$shell_path($$DESTDIR)\" $$escape_expand(\n\t)
434+
copydata.commands += $(COPY_FILE) \"$$shell_path($$PWD/dependencies/PawnIO/modules/SmbusNCT6793.bin )\" \"$$shell_path($$DESTDIR)\" $$escape_expand(\n\t)
434435
copydata.commands += $(COPY_FILE) \"$$shell_path($$PWD/dependencies/PawnIO/modules/LpcIO.bin )\" \"$$shell_path($$DESTDIR)\" $$escape_expand(\n\t)
435436
first.depends = $(first) copydata
436437
export(first.depends)
-9.82 KB
Binary file not shown.
952 Bytes
Binary file not shown.
17.1 KB
Binary file not shown.
2.17 KB
Binary file not shown.

i2c_smbus/MacOS/i2c_smbus_nct6775.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -232,12 +232,12 @@ bool i2c_smbus_nct6775_detect()
232232
case SIO_NCT6793_ID:
233233
case SIO_NCT6796_ID:
234234
case SIO_NCT6798_ID:
235-
// Create new nct6775 bus and zero out the PCI ID information
235+
// Create new nct6775 bus and invalidate the PCI ID information
236236
bus = new i2c_smbus_nct6775();
237-
bus->pci_vendor = 0;
238-
bus->pci_device = 0;
239-
bus->pci_subsystem_vendor = 0;
240-
bus->pci_subsystem_device = 0;
237+
bus->pci_vendor = 0xFFFF;
238+
bus->pci_device = 0xFFFF;
239+
bus->pci_subsystem_vendor = 0xFFFF;
240+
bus->pci_subsystem_device = 0xFFFF;
241241

242242
// Set logical device register to get SMBus base address
243243
superio_outb(sioaddr, SIO_REG_LOGDEV, SIO_LOGDEV_SMBUS);

0 commit comments

Comments
 (0)