JMR-dev/ReLibreHardwareMonitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'pr/5'

Browse Source
This commit is contained in:
Phyxion
2017-08-07 09:58:14 +02:00
parent 37f7f872d2 90b7fa0243
commit 6e74850dcc
5 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Hardware/LPC/Chip.cs
+4
View File
@@ -43,6 +43,8 @@ namespace OpenHardwareMonitor.Hardware.LPC {
NCT610X = 0xC452,
NCT6779D = 0xC560,
NCT6791D = 0xC803,
NCT6793D = 0xD121,
NCT6795D = 0xD352,
NCT6796D = 0xD423,
W83627DHG = 0xA020,
@@ -92,6 +94,8 @@ 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.NCT6795D: return "Nuvoton NCT6795D";
case Chip.NCT6796D: return "Nuvoton NCT6796D";
case Chip.W83627DHG: return "Winbond W83627DHG";
Hardware/LPC/LMSensors.cs
+4
View File
@@ -73,6 +73,10 @@ 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 "nct6795":
lmChips.Add(new LMChip(Chip.NCT6795D, path)); break;
case "nct6796":
lmChips.Add(new LMChip(Chip.NCT6796D, path)); break;
Hardware/LPC/LPCIO.cs
+19 -3
View File
@@ -215,6 +215,20 @@ namespace OpenHardwareMonitor.Hardware.LPC {
chip = Chip.NCT6796D;
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;
case 0xD3:
switch (revision) {
case 0x52:
chip = Chip.NCT6795D;
logicalDeviceNumber = WINBOND_NUVOTON_HARDWARE_MONITOR_LDN;
break;
} break;
}
if (chip == Chip.Unknown) {
@@ -232,9 +246,9 @@ namespace OpenHardwareMonitor.Hardware.LPC {
ushort verify = port.ReadWord(BASE_ADDRESS_REGISTER);
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 || chip == Chip.NCT6796D)) {
// disable the hardware monitor i/o space lock on NCT679*D chips
if (address == verify && (chip == Chip.NCT6791D || chip == Chip.NCT6796D || chip == Chip.NCT6793D || chip == Chip.NCT6795D)) {
port.NuvotonDisableIOSpaceLock();
}
@@ -285,6 +299,8 @@ namespace OpenHardwareMonitor.Hardware.LPC {
case Chip.NCT6779D:
case Chip.NCT6791D:
case Chip.NCT6796D:
case Chip.NCT6793D:
case Chip.NCT6795D:
superIOs.Add(new NCT677X(chip, revision, address, port));
break;
case Chip.F71858:
Hardware/LPC/NCT677X.cs
+3 -1
View File
@@ -271,6 +271,8 @@ namespace OpenHardwareMonitor.Hardware.LPC {
break;
case Chip.NCT6779D:
case Chip.NCT6795D:
case Chip.NCT6793D:
case Chip.NCT6791D:
case Chip.NCT6796D:
if (chip == Chip.NCT6779D) {
@@ -415,7 +417,7 @@ namespace OpenHardwareMonitor.Hardware.LPC {
public float?[] Controls { get { return controls; } }
private void DisableIOSpaceLock() {
if (chip != Chip.NCT6791D && chip != Chip.NCT6796D)
if (chip != Chip.NCT6791D && chip != Chip.NCT6796D && chip != Chip.NCT6793D && chip != Chip.NCT6795D)
return;
// the lock is disabled already if the vendor ID can be read
Hardware/Mainboard/SuperIOHardware.cs
+2
View File
@@ -267,6 +267,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
case Chip.NCT6779D:
case Chip.NCT6791D:
case Chip.NCT6796D:
case Chip.NCT6793D:
case Chip.NCT6795D:
GetNuvotonConfigurationD(superIO, manufacturer, model, v, t, f, c);
break;
default: