Merge r4610 r4611 r4612 into 5.40-6.6 drivedb.h branches.

git-svn-id: https://svn.code.sf.net/p/smartmontools/code/branches/RELEASE_6_0_DRIVEDB@4613 4ea69e1a-61f1-4043-bf83-b5c94c648137

smartmontools/drivedb.h

@@ -1440,8 +1440,9 @@ const drive_settings builtin_knowndrives[] = {
     "SanDisk SDSSDHP[0-9]*G|" // Ultra Plus (88SS9175), tested with SanDisk SDSSDHP128G/X23[01]6RL
     "SanDisk (SDSSDHII|Ultra II )[0-9]*GB?|" // Ultra II (88SS9190/88SS9189), tested with
       // SanDisk SDSSDHII120G/X31200RL, SanDisk Ultra II 960GB/X41100RL
-    "SanDisk SDSSDXPS?[0-9]*G", // Extreme II/Pro (88SS9187), tested with SanDisk SDSSDXP480G/R1311,
+    "SanDisk SDSSDXPS?[0-9]*G|" // Extreme II/Pro (88SS9187), tested with SanDisk SDSSDXP480G/R1311,
       // SanDisk SDSSDXPS480G/X21200RL
+    "SSD SATAIII 16GB", // SSD SATAIII 16GB/i221100 (see #923)
     "", "",
   //"-v 5,raw16(raw16),Reallocated_Sector_Ct "
   //"-v 9,raw24(raw8),Power_On_Hours "
@@ -3795,7 +3796,8 @@ const drive_settings builtin_knowndrives[] = {
       // WDC WD10JFCX-68N6GN0/01.01A01, WDC WD40EFRX-68WT0N0/80.00A80,
       // WDC WD60EFRX-68MYMN1/82.00A82, WDC WD80EFAX-68LHPN0/83.H0A83,
       // WDC WD80EFZX-68UW8N0/83.H0A83
-    "WDC WD(7500BFC|10JFC|[1-6]0EFR|80EF[AZ])X-.*",
+      // WDC WD80EZZX-11CSGA0/83.H0A03 (My Book 0x1058:0x25ee)
+    "WDC WD(7500BFC|10JFC|[1-6]0EFR|80E[FZ][AZ])X-.*",
     "", "",
     "-v 22,raw48,Helium_Level" // WD80EFZX
   },
@@ -4608,7 +4610,8 @@ const drive_settings builtin_knowndrives[] = {
     // 0xab24: Seagate Backup Plus Slim (0x0100) (ticket #443)
     // 0xab25: Seagate Backup Plus for Mac (0x0100)
     // 0xab38: Seagate Backup Plus 8TB (0x0100) (ticket #786)
-    "0x0bc2:0xab(1e|2[01458]|38)",
+    // 0xab43: Seagate Backup Plus 4TB (0x1404)
+    "0x0bc2:0xab(1e|2[01458]|38|43)",
     "",
     "",
     "-d sat"
@@ -4735,10 +4738,10 @@ const drive_settings builtin_knowndrives[] = {
     "-d sat"
   },
   { "USB: WD My Book / Easystore; ", // 3.5"
-    "0x1058:0x(09(0[06]|10)|11(0[01245]|1[0d]|30|40)|1230|25(a3|fb))",
+    "0x1058:0x(09(0[06]|10)|11(0[01245]|1[0d]|30|40)|1230|25(a3|ee|fb))",
     "", // 0x0906=0x0012, 10=0x0106
         // 0x1100/01=0x0165, 02=0x1028, 10=0x1030, 1d=0x1020, 30=0x1012, 40=0x1003
-        // 0x1230=0x1065, 0x25a3=0x1013, 0x25fb=0x3004
+        // 0x1230=0x1065, 0x25a3=0x1013, 0x25ee=0x4004, 0x25fb=0x3004
     "",
     "-d sat"
   },

smartmontools/drivedb.h.raw.asc

 -----BEGIN PGP SIGNATURE-----
 
-iQEcBAABAgAGBQJZ/kOLAAoJEPOHY87f0iVZHrIH/00A5X7qWOO1wVJfkdYkyki2
-HDYuzg2705XGKjTORp82REBJ3+533kARyDLa5kfaiyUcG7qmfLoh2yhq2rc+k7kX
-rynYtJ022gKP4HPOjrVRgFsPYKym2g1sB0PwLGeqi6ZQTFOlCduZXzfg+y4pkew/
-BMnbpvINygLhGdQkmPpQRXpnSIDbPbernetcwJvsEbqJGYX0s8RlSeW05knsNjOP
-xULhD/q3DMt11jSt7LJZBfmDV6Nrip9KN68cpayHdtIqlHUBhr8CjR8fjWReyi/B
-gXPZ2qT0eYKVAfK6kQNfY5APCSdYOkGnpuZEZCHrysg3ReLWPIjejrqesbao450=
-=s6NW
+iQEcBAABAgAGBQJaCgcwAAoJEPOHY87f0iVZ8KEH/3F8Gwpn16VM2xmZTX979e7v
+m3ZLpzqn9P7nOPfFyFuDUMh+rvHRqEqltkDaiWWetyw+6OZSpCV4HrnKOa9kVn5Y
+RQnGZkoOXZ+PNIMyKAoCEmiqZdzURAqljDRQILNEzgPql6OFns5z9bz7BvGD0VAM
+UB0l7+W/VsrRN63Alk+wejsATzuafI2NYX3tJJk8MawU+/8qQ6pikQ9JMI7b17WO
+Swg0aZs+Bnt9zUOnlS2rHfwmH2ovrwjwfMDDjwo5oST3rbm/jMub1XU7uQJHh/lN
+Ll0hfFAJb6/J+jqqgRJj2KV0Ha+GiROP/ELBPT241gF7lxrx0VDDc4w95QLkpaU=
+=ff5M
 -----END PGP SIGNATURE-----