Merge remote-tracking branch 'lib/master'

# Conflicts:
#	LibreHardwareMonitorLib/LibreHardwareMonitorLib.csproj
#	OpenHardwareMonitor/OpenHardwareMonitor.csproj
#	OpenHardwareMonitorLib/Hardware/Computer.cs
#	OpenHardwareMonitorLib/Hardware/IComputer.cs
#	OpenHardwareMonitorLib/Hardware/Motherboard/Lpc/LpcIO.cs

Author: sergiye

OpenHardwareMonitorLib/Hardware/Computer.cs

@@ -40,6 +40,7 @@ public class Computer : IComputer
     private bool _psuEnabled;
     private SMBios _smbios;
     private bool _storageEnabled;
+    private bool _ring0Enabled = true;
 
     /// <summary>
     /// Creates a new <see cref="IComputer" /> instance with basic initial <see cref="Settings" />.
@@ -273,6 +274,16 @@ public bool IsStorageEnabled
         }
     }
 
+    /// <inheritdoc />
+    public bool IsRing0Enabled
+    {
+        get { return _ring0Enabled; }
+        set
+        {
+            _ring0Enabled = value;
+        }
+    }
+
     /// <summary>
     /// Contains computer information table read in accordance with <see href="https://www.dmtf.org/standards/smbios">System Management BIOS (SMBIOS) Reference Specification</see>.
     /// </summary>
@@ -486,7 +497,9 @@ public void Open(bool portable)
 
         _smbios = new SMBios();
 
-        Ring0.Open(portable);
+        if (IsRing0Enabled)
+            Ring0.Open(portable);
+
         Mutexes.Open();
         OpCode.Open();
 

OpenHardwareMonitorLib/Hardware/IComputer.cs

@@ -103,7 +103,13 @@ public interface IComputer : IElement
     bool IsStorageEnabled { get; }
 
     /// <summary>
-    /// Generates full OpenHardwareMonitor report for devices that have been enabled.
+    /// Gets or sets a value indicating whether the Ring0 driver should be installed if user privileges is sufficient.
+    /// </summary>
+    /// <returns><see langword="true" /> if Ring0 driver installation is enabled</returns>
+    /// <remarks>Default value is <see langword="true" />. Only affects Windows.</remarks>
+    bool IsRing0Enabled { get; }
+
+    /// <summary>
     /// </summary>
     /// <returns>A formatted text string with library, OS and hardware information.</returns>
     string GetReport();

OpenHardwareMonitorLib/Hardware/Motherboard/Identification.cs

@@ -675,6 +675,10 @@ public static Model GetModel(string name)
                 return Model.Z890P_PRO_WIFI;
             case var _ when name.Equals("PRO Z890-A WIFI (MS-7E32)", StringComparison.OrdinalIgnoreCase):
                 return Model.Z890A_PRO_WIFI;
+            case var _ when name.Equals("Z890 GAMING PLUS WIFI (MS-7E34)", StringComparison.OrdinalIgnoreCase):
+                return Model.Z890_GAMING_PLUS_WIFI;
+            case var _ when name.Equals("PRO Z890-S WIFI PZ (MS-7E58)", StringComparison.OrdinalIgnoreCase):
+                return Model.Z890S_PRO_WIFI_PROJECT_ZERO;
             case var _ when name.Equals("B850M Steel Legend WiFi", StringComparison.OrdinalIgnoreCase):
                 return Model.B850M_STEEL_LEGEND_WIFI;
             case var _ when name.Equals("Base Board Product Name", StringComparison.OrdinalIgnoreCase):

OpenHardwareMonitorLib/Hardware/Motherboard/Lpc/LpcIO.cs

@@ -405,6 +405,8 @@ private bool DetectWinbondFintek(LpcPort port, Motherboard motherboard)
                             case Model.Z890_EDGE_TI_WIFI:
                             case Model.Z890P_PRO_WIFI:
                             case Model.Z890A_PRO_WIFI:
+                            case Model.Z890_GAMING_PLUS_WIFI:
+                            case Model.Z890S_PRO_WIFI_PROJECT_ZERO:
                                 chip = Chip.NCT6687DR; // MSI AM5/LGA1851 Compatibility
                                 break;
                             default:

OpenHardwareMonitorLib/Hardware/Motherboard/Model.cs

@@ -153,6 +153,8 @@ public enum Model
     Z890_EDGE_TI_WIFI,
     Z890P_PRO_WIFI,
     Z890A_PRO_WIFI,
+    Z890_GAMING_PLUS_WIFI,
+    Z890S_PRO_WIFI_PROJECT_ZERO,
 
     // EVGA
     X58_SLI_Classified,

OpenHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs

@@ -622,6 +622,8 @@ private static void GetBoardSpecificConfiguration
                     case Model.Z890_EDGE_TI_WIFI:
                     case Model.Z890P_PRO_WIFI:
                     case Model.Z890A_PRO_WIFI:
+                    case Model.Z890_GAMING_PLUS_WIFI:
+                    case Model.Z890S_PRO_WIFI_PROJECT_ZERO:
                         v.Add(new Voltage("+12V", 0));
                         v.Add(new Voltage("+5V", 1));
                         v.Add(new Voltage("Vcore", 2));