From 5e2f395a21179784098b5927ab9ffcc322e9ec7b Mon Sep 17 00:00:00 2001
From: sebastian-dev <dev.sebastian@grams.de>
Date: Fri, 12 Feb 2021 16:39:35 +0100
Subject: [PATCH] Samsung 980 pro NVME Fix (#388)

Closes #370.

Thanks to @sebastian-dev.
---
 .../Hardware/Storage/NVMeSmart.cs               | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/LibreHardwareMonitorLib/Hardware/Storage/NVMeSmart.cs b/LibreHardwareMonitorLib/Hardware/Storage/NVMeSmart.cs
index e4cf24e..2de8960 100644
--- a/LibreHardwareMonitorLib/Hardware/Storage/NVMeSmart.cs
+++ b/LibreHardwareMonitorLib/Hardware/Storage/NVMeSmart.cs
@@ -20,8 +20,11 @@ namespace LibreHardwareMonitor.Hardware.Storage
             _driveNumber = storageInfo.Index;
             NVMeDrive = null;
 
-            //test samsung protocol
-            if (NVMeDrive == null && storageInfo.Name.ToLower().Contains("samsung"))
+            // Test samsung protocol.
+
+            // Exclude Samsung 980 Pro, this SSD uses the NVMeWindows generic protocol.
+            // Samsung 980 Pro can accessed via IdentifyDevice and IdentifyController but not by HealthInfoLog.
+            if (NVMeDrive == null && storageInfo.Name.IndexOf("Samsung", StringComparison.OrdinalIgnoreCase) > -1 && storageInfo.Name.IndexOf("980 Pro", StringComparison.OrdinalIgnoreCase) == -1)
             {
                 _handle = NVMeSamsung.IdentifyDevice(storageInfo);
                 if (_handle != null)
@@ -30,8 +33,8 @@ namespace LibreHardwareMonitor.Hardware.Storage
                 }
             }
 
-            //test intel protocol
-            if (NVMeDrive == null && storageInfo.Name.ToLower().Contains("intel"))
+            // Test Intel protocol.
+            if (NVMeDrive == null && storageInfo.Name.IndexOf("Intel", StringComparison.OrdinalIgnoreCase) > -1)
             {
                 _handle = NVMeIntel.IdentifyDevice(storageInfo);
                 if (_handle != null)
@@ -40,8 +43,8 @@ namespace LibreHardwareMonitor.Hardware.Storage
                 }
             }
 
-            //test intel raid protocol
-            if (NVMeDrive == null && storageInfo.Name.ToLower().Contains("intel"))
+            // Test Intel raid protocol.
+            if (NVMeDrive == null && storageInfo.Name.IndexOf("Intel", StringComparison.OrdinalIgnoreCase) > -1)
             {
                 _handle = NVMeIntelRst.IdentifyDevice(storageInfo);
                 if (_handle != null)
@@ -50,7 +53,7 @@ namespace LibreHardwareMonitor.Hardware.Storage
                 }
             }
 
-            //test windows generic driver protocol
+            // Test Windows generic driver protocol.
             if (NVMeDrive == null)
             {
                 _handle = NVMeWindows.IdentifyDevice(storageInfo);