diff --git a/Hardware/LPC/LPCGroup.cs b/Hardware/LPC/LPCGroup.cs index 882b770..ab7d619 100644 --- a/Hardware/LPC/LPCGroup.cs +++ b/Hardware/LPC/LPCGroup.cs @@ -206,17 +206,24 @@ namespace OpenHardwareMonitor.Hardware.LPC { if (chip != Chip.Unknown) { Select(logicalDeviceNumber); - ushort address = ReadWord(BASE_ADDRESS_REGISTER); + ushort address = ReadWord(BASE_ADDRESS_REGISTER); Thread.Sleep(1); ushort verify = ReadWord(BASE_ADDRESS_REGISTER); - + ushort vendorID = 0; if (chip == Chip.F71862 || chip == Chip.F71882 || chip == Chip.F71889) vendorID = ReadWord(FINTEK_VENDOR_ID_REGISTER); WinbondFintekExit(); - if (address != verify || address < 0x100 || (address & 0xF007) != 0) + if (address != verify) + return; + + // some Fintek chips have address register offset 0x05 added already + if ((address & 0x07) == 0x05) + address &= 0xFFF8; + + if (address < 0x100 || (address & 0xF007) != 0) return; switch (chip) { diff --git a/Hardware/Nvidia/NVAPI.cs b/Hardware/Nvidia/NVAPI.cs index 036188e..9f31088 100644 --- a/Hardware/Nvidia/NVAPI.cs +++ b/Hardware/Nvidia/NVAPI.cs @@ -122,7 +122,7 @@ namespace OpenHardwareMonitor.Hardware.Nvidia { UNKNOWN = -1 }; - [StructLayout(LayoutKind.Sequential)] + [StructLayout(LayoutKind.Sequential, Pack = 1)] public struct NvSensor { public NvThermalController Controller; public int DefaultMinTemp; @@ -131,7 +131,7 @@ namespace OpenHardwareMonitor.Hardware.Nvidia { public NvThermalTarget Target; } - [StructLayout(LayoutKind.Sequential)] + [StructLayout(LayoutKind.Sequential, Pack = 1)] public struct NvGPUThermalSettings { public int Version; public int Count; @@ -140,12 +140,12 @@ namespace OpenHardwareMonitor.Hardware.Nvidia { public NvSensor[] Sensor; } - [StructLayout(LayoutKind.Sequential)] + [StructLayout(LayoutKind.Sequential, Pack = 1)] public struct NvDisplayHandle { private int handle; } - [StructLayout(LayoutKind.Sequential)] + [StructLayout(LayoutKind.Sequential, Pack = 1)] public struct NvPhysicalGpuHandle { private int handle; } diff --git a/OpenHardwareMonitor.csproj b/OpenHardwareMonitor.csproj index 48d4b24..6c82ca4 100644 --- a/OpenHardwareMonitor.csproj +++ b/OpenHardwareMonitor.csproj @@ -4,7 +4,7 @@ Debug AnyCPU {F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880} - 9.0.30729 + 9.0.21022 2.0 WinExe false @@ -68,7 +68,6 @@ - @@ -124,12 +123,15 @@ AboutBox.cs + Designer MainForm.cs + Designer PlotPanel.cs + Designer diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 45aef32..c055159 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -69,5 +69,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.1.23.0")] -[assembly: AssemblyFileVersion("0.1.23.0")] +[assembly: AssemblyVersion("0.1.23.1")] +[assembly: AssemblyFileVersion("0.1.23.1")]