From 3155743791776e36221645b6351f0a286aa0ac0b Mon Sep 17 00:00:00 2001
From: dipohl <dipohl@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Fri, 22 Apr 2022 19:48:15 +0000
Subject: [PATCH] drivedb.h: - SanDisk SDSSDH3 1T00 (#1590) - Merge two entries
 into new group 'Seagate IronWolf (Pro) 125 SSDs'

git-svn-id: https://svn.code.sf.net/p/smartmontools/code/trunk@5355 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
 smartmontools/ChangeLog |  6 ++++++
 smartmontools/drivedb.h | 34 ++++++----------------------------
 2 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/smartmontools/ChangeLog b/smartmontools/ChangeLog
index 10b4346f6..cb4d347ba 100644
--- a/smartmontools/ChangeLog
+++ b/smartmontools/ChangeLog
@@ -1,5 +1,11 @@
 $Id$
 
+2022-04-22  Gabriele Pohl  <contact@dipohl.de>
+
+	drivedb.h:
+	- SanDisk SDSSDH3 1T00 (#1590)
+	- Merge two entries into new group 'Seagate IronWolf (Pro) 125 SSDs'
+
 2022-04-22  Christian Franke  <franke@computer.org>
 
 	smartctl.cpp: Add 'smartctl.pre_release' boolean to JSON output.
diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index fee5a5bf9..97a48abf0 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -1969,9 +1969,9 @@ const drive_settings builtin_knowndrives[] = {
     "SanDisk (SDSSDHII|Ultra II )[0-9]*GB?|" // Ultra II (88SS9190/88SS9189), tested with
       // SanDisk SDSSDHII120G/X31200RL, SanDisk Ultra II 960GB/X41100RL
     "SanDisk SDSSDH2(128|256)G|" // SanDisk SDSSDH2128G/X211200
-    "SanDisk SDSSDH3((250|500|1000|1024|2000)G| [24]T00)|" // Ultra 3D, tested with SanDisk SDSSDH3250G/X61170RL,
+    "SanDisk SDSSDH3((250|500|1000|1024|2000)G| [124]T00)|" // Ultra 3D, tested with SanDisk SDSSDH3250G/X61170RL,
       // SanDisk SDSSDH3500G/X61110RL, SanDisk SDSSDH31024G/X6107000, SanDisk SDSSDH3 2T00/411040RL,
-      // SanDisk SDSSDH3 4T00/411040RL
+      // SanDisk SDSSDH3 4T00/411040RL, SanDisk SDSSDH3 1T00/415020RL
     "SanDisk SDSSDXPS?[0-9]*G|" // Extreme II/Pro (88SS9187), tested with SanDisk SDSSDXP480G/R1311,
       // SanDisk SDSSDXPS480G/X21200RL
     "SanDisk SSD G5 BICS4|" // WD Blue SSD WDS100T2B0A (#1378), tested with SanDisk SSD G5 BICS4/415000WD
@@ -4536,7 +4536,10 @@ const drive_settings builtin_knowndrives[] = {
     "-v 242,raw48,Lifetime_Rds_Frm_Hst_GB "
     "-v 243,hex56,Free_Space "
   },
-  { "Seagate IronWolf Pro 125 SSDs", // IronWolf_Pro_125_SSD_Product_Manual_100866982_A.pdf
+  { "Seagate IronWolf (Pro) 125 SSDs", // IronWolf_Pro_125_SSD_Product_Manual_100866982_A.pdf 
+				       // IronWolf_125_SSD_Product_Manual_100866980_C.pdf
+    "Seagate IronWolf ZA(250|500|1000|2000|4000)NM10002-.*|" // tested with
+      // Seagate IronWolf ZA500NM10002-2ZG101/SU3SC013
     "Seagate IronWolfPro ZA(240|480|960|1920|3840)NX10001-.*", // tested with
       // Seagate IronWolfPro ZA3840NX10001-2ZH104/SU4SC01B
     "", "",
@@ -4563,31 +4566,6 @@ const drive_settings builtin_knowndrives[] = {
     "-v 246,hex64,Write_Protect_Detail " // prevents interpretation of bogus threshold 255 (ticket #1396)
     "-v 247,raw48,Health_Check_Timer "
   },
-  { "Seagate IronWolf 125 SSDs", // IronWolf_125_SSD_Product_Manual_100866980_C.pdf
-    "Seagate IronWolf ZA(250|500|1000|2000|4000)NM10002-.*", // tested with
-      // Seagate IronWolf ZA500NM10002-2ZG101/SU3SC013
-    "", "",
-  //"-v 1,raw48,Raw_Read_Error_Rate "
-  //"-v 9,raw24(raw8),Power_On_Hours "
-  //"-v 12,raw48,Power_Cycle_Count "
-    "-v 16,raw48,Spare_Blocks_Available "
-    "-v 17,raw48,Spare_Blocks_Remaining "
-    "-v 168,raw48,SATA_PHY_Error_Count "
-    "-v 170,raw16,Early/Later_Bad_Blck_Ct "
-    "-v 173,raw16,Max/Avg/Min_Erase_Ct "
-    "-v 174,raw48,Unexpect_Power_Loss_Ct "
-    "-v 177,raw16,Wear_Range_Delta "
-  //"-v 192,raw48,Power-Off_Retract_Count "
-  //"-v 194,tempminmax,Temperature_Celsius "
-    "-v 218,raw48,SATA_CRC_Error_Count "
-    "-v 231,raw48,SSD_Life_Left "
-    "-v 232,hex48,Read_Failure_Blk_Ct "
-    "-v 233,raw48,Flash_Writes_GiB "
-    "-v 234,raw48,NAND_Reads_Sectors "
-    "-v 235,raw48,Flash_Writes_Sectors "
-    "-v 241,raw48,Host_Writes_GiB "
-    "-v 242,raw48,Host_Reads_GiB "
-  },
   { "Seagate Nytro SATA SSD", //Written to Seagate documentation
     // tested with XA960LE10063, XA960LE10063
     "XA(240|480|960|1920|3840)[LM]E10(00|02|04|06|08|10)3",
-- 
GitLab