Merge commit '418e9ec85f2878b09782ba0d64a0bd841ea880cb'

# Conflicts:
#	OpenHardwareMonitorLib/Hardware/Memory/MemoryGroup.cs
#	OpenHardwareMonitorLib/Hardware/Storage/NVMeSmart.cs

Author: sergiye

OpenHardwareMonitorLib/Hardware/Memory/MemoryGroup.cs

@@ -21,7 +21,7 @@ internal class MemoryGroup : IGroup, IHardwareChanged
 
     private CancellationTokenSource _cancellationTokenSource;
     private Exception _lastException;
-    private bool _opened = false;
+    private bool _disposed = false;
 
     public MemoryGroup(ISettings settings)
     {
@@ -44,8 +44,6 @@ public MemoryGroup(ISettings settings)
         {
             StartRetryTask(settings);
         }
-
-        _opened = true;
     }
 
     public event HardwareEventHandler HardwareAdded;
@@ -77,17 +75,17 @@ public string GetReport()
 
     public void Close()
     {
+        _cancellationTokenSource?.Cancel();
+        _cancellationTokenSource?.Dispose();
+        _cancellationTokenSource = null;
+
         lock (_lock)
         {
-            _opened = false;
             foreach (Hardware ram in _hardware)
                 ram.Close();
 
-            _hardware.Clear();
-
-            _cancellationTokenSource?.Cancel();
-            _cancellationTokenSource?.Dispose();
-            _cancellationTokenSource = null;
+            _hardware = [];
+            _disposed = true;
         }
     }
 
@@ -97,9 +95,9 @@ private bool TryAddDimms(ISettings settings)
         {
             lock (_lock)
             {
-                if (!_opened)
+                if (_disposed)
                 {
-                    return true;
+                    return false;
                 }
 
                 if (DetectThermalSensors(out List<SPDAccessor> accessors))
@@ -132,24 +130,7 @@ private void StartRetryTask(ISettings settings)
 
                 if (TryAddDimms(settings))
                 {
-                    lock (_lock)
-                    {
-                        if (!_opened)
-                        {
-                            return;
-                        }
-
-                        foreach (Hardware hardware in _hardware.OfType<DimmMemory>())
-                        {
-                            HardwareAdded?.Invoke(hardware);
-                        }
-
-                        _cancellationTokenSource.Dispose();
-                        _cancellationTokenSource = null;
-
-                        break;
-                    }
-
+                    break;
                 }
             }
         }, _cancellationTokenSource.Token);
@@ -189,8 +170,6 @@ private static bool DetectThermalSensors(out List<SPDAccessor> accessors)
 
     private void AddDimms(List<SPDAccessor> accessors, ISettings settings)
     {
-        List<Hardware> newHardwareList = [.. _hardware];
-
         foreach (SPDAccessor ram in accessors)
         {
             //Default value
@@ -201,9 +180,9 @@ private void AddDimms(List<SPDAccessor> accessors, ISettings settings)
                 name = $"{ram.GetModuleManufacturerString()} - {ram.ModulePartNumber()} (#{ram.Index})";
 
             DimmMemory memory = new(ram, name, new Identifier($"memory/dimm/{ram.Index}"), settings);
-            newHardwareList.Add(memory);
-        }
 
-        _hardware = newHardwareList;
+            _hardware.Add(memory);
+            HardwareAdded?.Invoke(memory);
+        }
     }
 }

OpenHardwareMonitorLib/Hardware/Storage/NVMeSamsung.cs

@@ -31,7 +31,6 @@ public bool IdentifyController(SafeHandle hDevice, out Kernel32.NVME_IDENTIFY_CO
         buffers.Spt.TargetId = 0;
         buffers.Spt.Lun = 0;
         buffers.Spt.SenseInfoLength = 24;
-        buffers.Spt.DataIn = 1;
         buffers.Spt.DataTransferLength = (uint)buffers.DataBuf.Length;
         buffers.Spt.TimeOutValue = 2;
         buffers.Spt.DataBufferOffset = Marshal.OffsetOf(typeof(Kernel32.SCSI_PASS_THROUGH_WITH_BUFFERS), nameof(Kernel32.SCSI_PASS_THROUGH_WITH_BUFFERS.DataBuf));
@@ -62,7 +61,6 @@ public bool IdentifyController(SafeHandle hDevice, out Kernel32.NVME_IDENTIFY_CO
             buffers.Spt.Lun = 0;
             buffers.Spt.SenseInfoLength = 24;
             buffers.Spt.DataTransferLength = (uint)buffers.DataBuf.Length;
-            buffers.Spt.DataIn = 1;
             buffers.Spt.TimeOutValue = 2;
             buffers.Spt.DataBufferOffset = Marshal.OffsetOf<Kernel32.SCSI_PASS_THROUGH_WITH_BUFFERS>(nameof(Kernel32.SCSI_PASS_THROUGH_WITH_BUFFERS.DataBuf));
             buffers.Spt.SenseInfoOffset = (uint)Marshal.OffsetOf<Kernel32.SCSI_PASS_THROUGH_WITH_BUFFERS>(nameof(Kernel32.SCSI_PASS_THROUGH_WITH_BUFFERS.SenseBuf));

OpenHardwareMonitorLib/Hardware/Storage/NVMeSmart.cs

@@ -16,6 +16,16 @@ internal NVMeSmart(StorageInfo storageInfo)
         NVMeDrive = null;
         string name = storageInfo.Name;
 
+        // Test Windows generic driver protocol.
+        if (NVMeDrive == null)
+        {
+            _handle = NVMeWindows.IdentifyDevice(storageInfo);
+            if (_handle != null)
+            {
+                NVMeDrive = new NVMeWindows();
+            }
+        }
+
         // Test Samsung protocol.
         if (NVMeDrive == null && name.IndexOf("Samsung", StringComparison.OrdinalIgnoreCase) > -1)
         {
@@ -49,16 +59,6 @@ internal NVMeSmart(StorageInfo storageInfo)
                 NVMeDrive = new NVMeIntelRst();
             }
         }
-
-        // Test Windows generic driver protocol.
-        if (NVMeDrive == null)
-        {
-            _handle = NVMeWindows.IdentifyDevice(storageInfo);
-            if (_handle != null)
-            {
-                NVMeDrive = new NVMeWindows();
-            }
-        }
     }
 
     public bool IsValid