From 7b82bdcef3dd4034b61b7426fc531b0a10915006 Mon Sep 17 00:00:00 2001
From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Wed, 25 Oct 2017 21:15:02 +0000
Subject: [PATCH] Merge r4568 r4570 into 5.40-6.6 drivedb.h branches.
git-svn-id: https://svn.code.sf.net/p/smartmontools/code/branches/RELEASE_6_0_DRIVEDB@4571 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
smartmontools/drivedb.h | 12 ++++++++----
smartmontools/drivedb.h.raw.asc | 14 +++++++-------
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index 24bd66ec3..4618c18d8 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -391,6 +391,7 @@ const drive_settings builtin_knowndrives[] = {
"ATP Velocity MIV (60|120|240|480)GB|" // tested with ATP Velocity MIV 480GB/110719
"Corsair CSSD-F(40|60|80|115|120|160|240)GBP?2.*|" // Corsair Force, tested with
// Corsair CSSD-F40GB2/1.1, Corsair CSSD-F115GB2-A/2.1a
+ "Corsair Voyager GTX|" // Corsair Voyager GTX/S9FM02J6
"Corsair Force ((3 |LS )?SSD|GS|GT)|" // SF-2281, tested with
// Corsair Force SSD/5.05, 3 SSD/1.3.2, GT/1.3.3, GS/5.03,
// Corsair Force LS SSD/S8FM06.5, S9FM01.8, S9FM02.0
@@ -1375,7 +1376,9 @@ const drive_settings builtin_knowndrives[] = {
"SAMSUNG MZ7KM(120|240|480|960|1T9)HA(JM|HP|GR|FD|JM)-.*|" // SM863, tested with MZ7KM480HAHP-0E005/GXM1003Q
"SAMSUNG MZN(LF|TY)(128|256)H[CD]HP-.*|" // CM871/871a, tested with SAMSUNG MZNLF128HCHP-000H1/FXT21H1Q,
// SAMSUNG MZNTY256HDHP-000/MAT21K0Q
- "SAMSUNG MZ[7N]LN(128|256|512)H[CM](GR|HP|JH|JP)-.*|" // PM871/871a, tested with SAMSUNG MZ7LN128HCHP,
+ "SAMSUNG MZ[7N]LN(128|256|512|1T0)H[ACM](GR|HP|HQ|J[HPQ]|LR)-.*|" // PM871/871a/b, tested with
+ // SAMSUNG MZ7LN128HCHP-00000/EMT0100Q, SAMSUNG MZ7LN256HAHQ-000H1/MVT03H6Q,
+ // SAMSUNG MZNLN256HMHQ-000H1/MAV21H3Q
"SAMSUNG SSD PM871 .*|" // SAMSUNG SSD PM871 2.5 7mm 256GB/EMT02D0Q
// SAMSUNG MZ7LN256HMJP-00000/MAV0100Q, SAMSUNG MZ7LN512HMJP-00000/MAV0100Q
"SAMSUNG MZHPV(128|256|512)HDGL-.*", // SM951, tested with SAMSUNG MZHPV512HDGL-00000/BXW2500Q
@@ -3427,7 +3430,7 @@ const drive_settings builtin_knowndrives[] = {
// ST8000NM0045-1RL112/NN02
// ST6000NM0004-1FT17Z/NN01
// ST4000NM0035-1V4107/TNC3
- "ST([24568]|10)000NM0[01][01248][456]-.*", // *[069]4 = 4Kn
+ "ST([24568]|10)000NM0[01][0-48][456]-.*", // *[069]4 = 4Kn
"", "",
"-v 188,raw16 -v 240,msec24hour32"
},
@@ -3793,8 +3796,9 @@ const drive_settings builtin_knowndrives[] = {
"", "",
"-v 22,raw48,Helium_Level" // WD80EFZX
},
- { "Western Digital Red Pro", // tested with WDC WD2001FFSX-68JNUN0/81.00A81
- "WDC WD[234]001FFSX-.*",
+ { "Western Digital Red Pro", // tested with WDC WD2001FFSX-68JNUN0/81.00A81,
+ // WDC WD6002FFWX-68TZ4N0/83.H0A83
+ "WDC WD([2-68]00[12])FF[SW]X-.*",
"", "", ""
},
{ "Western Digital Purple", // tested with WDC WD40PURX-64GVNY0/80.00A80
diff --git a/smartmontools/drivedb.h.raw.asc b/smartmontools/drivedb.h.raw.asc
index f4cee7300..b28e75808 100644
--- a/smartmontools/drivedb.h.raw.asc
+++ b/smartmontools/drivedb.h.raw.asc
@@ -1,10 +1,10 @@
-----BEGIN PGP SIGNATURE-----
-iQEcBAABAgAGBQJZ77CZAAoJEPOHY87f0iVZ7D4H/10VmAKhxqZhBwxa42PvGdyC
-krEb5fbAa67ns9uefd7n5ukT0UZQhHN4DAG2BRu885nsjvUSh5NFSvzPIhMV2cv9
-qRiSPJ0kuHZHxDCrcmr9aAPfWUddYBe4o/O8Dv251GhDZzJdd+xjooxlPZItnt8s
-izJ/rIgKBBrLRX7UBTCx4xLfDPRLmPkppf3ChY566lwObNOkhC5avztQEFcWEWMS
-ZLf+PSczGBCS6B+BbQuop3gZZcXxtS3HBvDdEnZ7l2yuoiGQCyqiAA2zXhbkpd3j
-X3thMsszQtIqgV7upfu0ZGwK7N/g6q/VkstcEe/v5GnKiU7UnU3GIRRaTz1dsK4=
-=ddu2
+iQEcBAABAgAGBQJZ8P3nAAoJEPOHY87f0iVZyRcIALB6pnmTMSJfgSgpGxce1M5G
++OzFqx9FmKGNpUnkwBm2B3mCGSR60yIwTconZkBNUM02KeTSH4q8kGWvLIEO6I34
+nqwLy8TSLxcdV0cOQ2AHBs7maVfsMwaeZOlP4uv7acmwYRzsYa2vmEHRFJhPDdAx
++tVdUr7edzIE9SgM3uGdmnBXOgQ0WLPMegu62BhQPSCBybNXwDUlQjxsrHxBj/Nc
+bYrWVD8e4XS6FzkCsxBXbYukZAPcq2CZICKzPK/Vol/kZBdvB6mhV3HpOaOnywjw
+mvlwjmAm3dx6xuIR8hmPrkKEUPziTxK30o22szbcn9x6Y4vKXcJC9+JwI8RgnYk=
+=XM39
-----END PGP SIGNATURE-----
--
GitLab