From f4fb7d5ab4a104259138e6aeda1782fc4085c896 Mon Sep 17 00:00:00 2001
From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Sun, 29 Mar 2020 17:36:41 +0000
Subject: [PATCH] Merge r5043 into 5.41-7.0 drivedb.h branches.
git-svn-id: https://svn.code.sf.net/p/smartmontools/code/branches/RELEASE_6_0_DRIVEDB@5044 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
smartmontools/drivedb.h | 54 +++++++++++++++++++++------------
smartmontools/drivedb.h.raw.asc | 14 ++++-----
2 files changed, 41 insertions(+), 27 deletions(-)
diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index a005025a1..fd6cabb63 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -3394,10 +3394,11 @@ const drive_settings builtin_knowndrives[] = {
"", "",
"-v 22,raw48,Helium_Level"
},
- { "WDC HGST Ultrastar He10", // WD white label, tested with
- // WDC WD80EMAZ-00WJTA0/83.H0A83, WDC WD80EZAZ-11TDBA0/83.H0A83,
- // WDC WD100EMAZ-00WJTA0/83.H0A83, WDC WD100EZAZ-11TDBA0/83.H0A83
- "WDC WD(80|100)E[MZ]AZ-.*",
+ { "Western Digital Ultrastar He10/12", // WD white label, tested with
+ // WDC WD80EMAZ-00WJTA0/83.H0A83 (Easystore 0x1058:0x25fb),
+ // WDC WD80EZAZ-11TDBA0/83.H0A83, WDC WD100EMAZ-00WJTA0/83.H0A83,
+ // WDC WD100EZAZ-11TDBA0/83.H0A83, WDC WD120EMAZ-11BLFA0/81.00A81
+ "WDC WD(80|100|120)E[MZ]AZ-.*",
"", "",
"-v 22,raw48,Helium_Level"
},
@@ -3406,6 +3407,11 @@ const drive_settings builtin_knowndrives[] = {
"", "",
"-v 22,raw48,Helium_Level"
},
+ { "Western Digital Ultrastar DC HC530", // tested with WDC WUH721414ALE6L4/LDGNW07G
+ "WDC ?WUH721414ALE6L4",
+ "", "",
+ "-v 22,raw48,Helium_Level"
+ },
{ "HGST MegaScale 4000", // tested with HGST HMS5C4040ALE640/MPAOA580
"HGST HMS5C4040[AB]LE64[01]", // B = DC 4000.B
"", "", ""
@@ -4452,8 +4458,8 @@ const drive_settings builtin_knowndrives[] = {
{ "Western Digital Green", // tested with
// WDC WD10EZRX-00A8LB0/01.01A01, WDC WD20EZRX-00DC0B0/80.00A80,
// WDC WD30EZRX-00MMMB0/80.00A80, WDC WD40EZRX-00SPEB0/80.00A80,
- // WDC WD60EZRX-00MVLB1/80.00A80
- "WDC WD(7500AA|(10|15|20)EA|(10|20|25|30|40|50|60)EZ)RX-.*",
+ // WDC WD60EZRX-00MVLB1/80.00A80, WDC WD5000AZRX-00A8LB0/01.01A01
+ "WDC WD(5000AZ|7500AA|(10|15|20)EA|(10|20|25|30|40|50|60)EZ)RX-.*",
"", "", ""
},
{ "Western Digital Caviar Black", // tested with WDC WD7501AAES/06.01D06
@@ -4545,10 +4551,11 @@ const drive_settings builtin_knowndrives[] = {
// WDC WD40EFRX-68WT0N0/80.00A80, WDC WD60EFRX-68MYMN1/82.00A82,
// WDC WD80EFAX-68LHPN0/83.H0A83, WDC WD80EFZX-68UW8N0/83.H0A83,
// WDC WD80EZZX-11CSGA0/83.H0A03 (My Book 0x1058:0x25ee),
- // WDC WD60EFAX-68SHWN0/82.00A82, WDC WD100EFAX-68LHPN0/83.H0A83
- "WDC WD(7500BFC|10JFC|[1-6]0EFR|[68]0E[FZ][AZ]|100EFA)X-.*",
+ // WDC WD60EFAX-68SHWN0/82.00A82, WDC WD100EFAX-68LHPN0/83.H0A83,
+ // WDC WD120EMFZ-11A6JA0/81.00A81 (Easystore 0x1058:0x25fb)
+ "WDC WD(7500BFCX|10JFCX|[1-6]0EFRX|[68]0E[FZ][AZ]X|100EFAX|120EMFZ)-.*",
"", "",
- "-v 22,raw48,Helium_Level" // WD80EFZX, WD100EFAX
+ "-v 22,raw48,Helium_Level" // WD80EFZX, WD100EFAX, WD120EMFZ
},
{ "Western Digital Red Pro", // tested with WDC WD2001FFSX-68JNUN0/81.00A81,
// WDC WD6002FFWX-68TZ4N0/83.H0A83, WDC WD101KFBX-68R56N0/83.H0A03
@@ -4556,23 +4563,28 @@ const drive_settings builtin_knowndrives[] = {
"", "",
"-v 22,raw48,Helium_Level" // WD101KFBX
},
- { "Western Digital Purple", // tested with WDC WD40PURX-64GVNY0/80.00A80
- "WDC WD[123456]0PURX-.*",
+ { "Western Digital Purple", // tested with WDC WD40PURX-64GVNY0/80.00A80,
+ // WDC WD40PURZ-85TTDY0/80.00A80
+ // WDC WD80PUZX-64NEAY0/80.H0A80
+ "WDC WD[1234568]0PU[RZ][XZ]-.*",
"", "", ""
},
{ "Western Digital Gold", // tested with WDC WD1005FBYZ-01YCBB2/RR07,
// WDC WD2005FBYZ-01YCBB2/RR07, WDC WD4002FYYZ-01B7CB0/01.01M02,
- // WDC WD4003FRYZ-01F0DB0/01.01H01, WDC WD8003FRYZ-01JPDB1/01.01H02,
- // WDC WD8004FRYZ-01VAEB0/01.01H01, WDC WD121KRYZ-01W0RB0/01.01H01
- "WDC WD([12]005FB|4002FY|4003FR|6002FR|800[234]FR|1[02]1KR)YZ-.*",
+ // WDC WD4003FRYZ-01F0DB0/01.01H01, WDC WD6003FRYZ-01F0DB0/01.01H01,
+ // WDC WD8003FRYZ-01JPDB1/01.01H02, WDC WD8004FRYZ-01VAEB0/01.01H01,
+ // WDC WD121KRYZ-01W0RB0/01.01H01,
+ "WDC WD([12]005FB|4002FY|4003FR|600[23]FR|800[234]FR|1[02]1KR)YZ-.*",
"", "",
"-v 22,raw48,Helium_Level" // WD121KRYZ
},
- { "Western Digital Blue", // tested with WDC WD5000LPVX-08V0TT2/03.01A03,
- // WDC WD20NPVZ-00WFZT0/01.01A01
- // WDC WD10SPZX-22Z10T0/01.01A01
- "WDC WD(20SPZX|20NPVZ|15NPVZ|10[SJ]PZX|7500BPVX|5000[BL]PVX|5000LPCX|3200LPCX)-.*",
- "", "", ""
+ { "Western Digital Blue Mobile", // tested with WDC WD5000LPVX-08V0TT2/03.01A03,
+ // WDC WD10JPVX-75JC3T0/0301A03, WDC WD10JPVX-22JC3T0/01.01A01,
+ // WDC WD10SPZX-22Z10T0/01.01A01, WDC WD10SPZX-21Z10T0/02.01A02,
+ // WDC WD20NPVZ-00WFZT0/01.01A01, WDC WD20SPZX-22CRAT0/01.01A01,
+ // WDC WD20SPZX-22UA7T0/01.01A01
+ "WDC WD(3200LPCX|5000[BL]P[CV]X|7500BPVX|10[JS]P[VZ]X|15NPVZ|20NPVZ|20SPZX)-.*",
+ "", "", ""
},
{ "Western Digital Green Mobile", // tested with WDC WD20NPVX-00EA4T0/01.01A01
"WDC WD(15|20)NPV[TX]-.*",
@@ -4595,6 +4607,7 @@ const drive_settings builtin_knowndrives[] = {
// WDC WD10JMVW-11AJGS2/01.01A01 (0x1058:0x10b8),
// WDC WD10JMVW-11AJGS4/01.01A01 (0x1058:0x25a0/25a2),
// WDC WD10JMVW-11S5XS1/01.01A01,
+ // WDC WD10SMZW-11Y0TS0/01.01A01,
// WDC WD10TMVW-11ZSMS5/01.01A01,
// WDC WD20NMVW-11AV3S2/01.01A01 (0x1058:0x0822),
// WDC WD20NMVW-11AV3S3/01.01A01 (0x1058:0x0837),
@@ -4604,7 +4617,8 @@ const drive_settings builtin_knowndrives[] = {
// WDC WD20NMVW-59AV3S3/01.01A01 (0x1058:0x107d),
// WDC WD30NMVW-11C3NS4/01.01A01,
// WDC WD40NMZW-11GX6S1/01.01A01 (0x1058:0x2599/25e2/25fa)
- "WDC WD(5000[LK]|7500[BK]|10[JT]|[234]0N)M[VZ][VW]-.*", // *W-* = USB 3.0
+ // WDC WD50NDZW-11MR8S1/02.01A02
+ "WDC WD((5000[LK]|7500[BK]|10[JST]|[234]0N)M|50ND)[VZ][VW]-.*", // *W-* = USB 3.0
"", "", ""
},
{ "Quantum Bigfoot", // tested with TS10.0A/A21.0G00, TS12.7A/A21.0F00
diff --git a/smartmontools/drivedb.h.raw.asc b/smartmontools/drivedb.h.raw.asc
index 8f928f7e6..b10f34298 100644
--- a/smartmontools/drivedb.h.raw.asc
+++ b/smartmontools/drivedb.h.raw.asc
@@ -1,10 +1,10 @@
-----BEGIN PGP SIGNATURE-----
-iQEcBAABAgAGBQJef4GRAAoJEPOHY87f0iVZ7gsH/30CYZ27LqoWYRnMUhyz9jR3
-5JYMBf0IU5vGBRnRmrY8i5br5aiF4LnkyzfxzbNPAvIX4J0Z+Yc37ohHB4HtM/6n
-2gzthvW3ECH7pcH9qKB5s60Doi0YP1+pcJYUKfjyCBK8JtcsmrTx9PLqN8ci+qZh
-DjlLr1BB6sA9bHhYSqXmEJ4zS0uZrpde7d3a/PWt8pNOpSiCcjLaUD0rG1aeLEmS
-6t618fuh9HwmHm7JoGo/oJsZBvrAARESFcguAAW0Pm4U38v3j9I9E9HG9dWuidoi
-ymCTkUHtkUBGz85Fm620x2n8L4k90UuL2nmgEQmNBRWi8OkhZZ/7sBJakU6ENMQ=
-=DRvj
+iQEcBAABAgAGBQJegNpwAAoJEPOHY87f0iVZAlAH/1Pn+AFXuQTVJHgABrUF7ZIk
+iYI/N0vatzgWe/D6hsiYivU4N7VeyeISU9AIcoS6IImIL2ZXQcC2KnJdLG1oP276
+XMndmmOAidwit1NOiQFnV1Q4w+a35VrkTuOHkfHBUqQgypJ/QECkDbuhdmmMtPfX
+XheiqJ2QAzRDWkJ7QJ/neV+LMkqhQthnO1Qf5NXMlPlIVu5E04QgYffjfW//J2xf
+LTmCTR7kzGzU++z1aWtuFeW6MTLbs9RnmRGUKgbWb7I2KkWQDhAKpnul2+riWs5k
+PVydHZS5oEqG11C+hl0+iTeAk1KtPRsDOFHtuqEs5UNz9UIiqI2gq616W9uhFjs=
+=oqlJ
-----END PGP SIGNATURE-----
--
GitLab