From 793888263494bb77be64aacff2250ed19dd0d545 Mon Sep 17 00:00:00 2001 From: dernerv Date: Tue, 6 Dec 2016 20:43:02 +0100 Subject: [PATCH] Added support for Nuvoton NCT6793D chip. Tested on Asus ASUS Z170 Pro Gaming. --- Hardware/LPC/Chip.cs | 2 ++ Hardware/LPC/LMSensors.cs | 2 ++ Hardware/LPC/LPCIO.cs | 12 ++++++++++-- Hardware/LPC/NCT677X.cs | 3 ++- Hardware/Mainboard/SuperIOHardware.cs | 1 + 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Hardware/LPC/Chip.cs b/Hardware/LPC/Chip.cs index 94e75f6..461ae28 100644 --- a/Hardware/LPC/Chip.cs +++ b/Hardware/LPC/Chip.cs @@ -43,6 +43,7 @@ namespace OpenHardwareMonitor.Hardware.LPC { NCT610X = 0xC452, NCT6779D = 0xC560, NCT6791D = 0xC803, + NCT6793D = 0xD121, W83627DHG = 0xA020, W83627DHGP = 0xB070, @@ -91,6 +92,7 @@ namespace OpenHardwareMonitor.Hardware.LPC { case Chip.NCT6776F: return "Nuvoton NCT6776F"; case Chip.NCT6779D: return "Nuvoton NCT6779D"; case Chip.NCT6791D: return "Nuvoton NCT6791D"; + case Chip.NCT6793D: return "Nuvoton NCT6793D"; case Chip.W83627DHG: return "Winbond W83627DHG"; case Chip.W83627DHGP: return "Winbond W83627DHG-P"; diff --git a/Hardware/LPC/LMSensors.cs b/Hardware/LPC/LMSensors.cs index 414fffa..483db5b 100755 --- a/Hardware/LPC/LMSensors.cs +++ b/Hardware/LPC/LMSensors.cs @@ -73,6 +73,8 @@ namespace OpenHardwareMonitor.Hardware.LPC { lmChips.Add(new LMChip(Chip.NCT6779D, path)); break; case "nct6791": lmChips.Add(new LMChip(Chip.NCT6791D, path)); break; + case "nct6793": + lmChips.Add(new LMChip(Chip.NCT6793D, path)); break; case "w83627ehf": lmChips.Add(new LMChip(Chip.W83627EHF, path)); break; diff --git a/Hardware/LPC/LPCIO.cs b/Hardware/LPC/LPCIO.cs index 8fda66a..a3d06d6 100644 --- a/Hardware/LPC/LPCIO.cs +++ b/Hardware/LPC/LPCIO.cs @@ -209,6 +209,13 @@ namespace OpenHardwareMonitor.Hardware.LPC { logicalDeviceNumber = WINBOND_NUVOTON_HARDWARE_MONITOR_LDN; break; } break; + case 0xD1: + switch (revision) { + case 0x21: + chip = Chip.NCT6793D; + logicalDeviceNumber = WINBOND_NUVOTON_HARDWARE_MONITOR_LDN; + break; + } break; } if (chip == Chip.Unknown) { if (id != 0 && id != 0xff) { @@ -226,8 +233,8 @@ namespace OpenHardwareMonitor.Hardware.LPC { ushort vendorID = port.ReadWord(FINTEK_VENDOR_ID_REGISTER); - // disable the hardware monitor i/o space lock on NCT6791D chips - if (address == verify && chip == Chip.NCT6791D) { + // disable the hardware monitor i/o space lock on NCT6791D or NCT6793D chips + if (address == verify && (chip == Chip.NCT6791D || chip == Chip.NCT6793D)) { port.NuvotonDisableIOSpaceLock(); } @@ -277,6 +284,7 @@ namespace OpenHardwareMonitor.Hardware.LPC { case Chip.NCT6776F: case Chip.NCT6779D: case Chip.NCT6791D: + case Chip.NCT6793D: superIOs.Add(new NCT677X(chip, revision, address, port)); break; case Chip.F71858: diff --git a/Hardware/LPC/NCT677X.cs b/Hardware/LPC/NCT677X.cs index 48d8d0e..71d29e0 100644 --- a/Hardware/LPC/NCT677X.cs +++ b/Hardware/LPC/NCT677X.cs @@ -271,6 +271,7 @@ namespace OpenHardwareMonitor.Hardware.LPC { break; case Chip.NCT6779D: + case Chip.NCT6793D: case Chip.NCT6791D: if (chip == Chip.NCT6779D) { fans = new float?[5]; @@ -414,7 +415,7 @@ namespace OpenHardwareMonitor.Hardware.LPC { public float?[] Controls { get { return controls; } } private void DisableIOSpaceLock() { - if (chip != Chip.NCT6791D) + if (chip != Chip.NCT6791D || chip != Chip.NCT6793D) return; // the lock is disabled already if the vendor ID can be read diff --git a/Hardware/Mainboard/SuperIOHardware.cs b/Hardware/Mainboard/SuperIOHardware.cs index 8d10b28..18578ee 100644 --- a/Hardware/Mainboard/SuperIOHardware.cs +++ b/Hardware/Mainboard/SuperIOHardware.cs @@ -266,6 +266,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard { break; case Chip.NCT6779D: case Chip.NCT6791D: + case Chip.NCT6793D: GetNuvotonConfigurationD(superIO, manufacturer, model, v, t, f, c); break; default: