From 920fc47626d4685c03307a5f9d0edabfbf4671e0 Mon Sep 17 00:00:00 2001
From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Tue, 10 Oct 2017 18:47:24 +0000
Subject: [PATCH] Merge r4545 r4546 r4547 into 5.40-6.6 drivedb.h branches.

git-svn-id: https://svn.code.sf.net/p/smartmontools/code/branches/RELEASE_6_0_DRIVEDB@4548 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
 smartmontools/drivedb.h         |  8 ++++++--
 smartmontools/drivedb.h.raw.asc | 14 +++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index 631c97b0f..1a690dba4 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -1307,6 +1307,7 @@ const drive_settings builtin_knowndrives[] = {
     "SAMSUNG 470 Series SSD|"  // tested with SAMSUNG 470 Series SSD 64GB/AXM09B1Q
     "Samsung SSD 750 EVO (120|250|500)GB|" // tested with Samsung SSD 750 EVO 250GB/MAT01B6Q
     "SAMSUNG SSD 830 Series|"  // tested with SAMSUNG SSD 830 Series 64GB/CXM03B1Q
+    "SAMSUNG SSD PM830 .*|" // SAMSUNG SSD PM830 2.5" 7mm 128GB/CXM03D1Q
     "MZ7PC(512|256|128|064)HA(GH|FU|DR)-000.*|" // probably PM830, tested with SAMSUNG MZ7PC128HAFU-000L1/CXM04L1Q
     "Samsung SSD 840 (PRO )?Series|" // tested with Samsung SSD 840 PRO Series 128GB/DXM04B0Q,
       // Samsung SSD 840 Series/DXT06B0Q
@@ -1521,6 +1522,7 @@ const drive_settings builtin_knowndrives[] = {
     "TS(16G|32G|64G|128G|256G|512G|1T)MTS800S?|" // MTS800, tested with TS1TMTS800/O1225H1
     "TS(16|32|64)GMSA630|" // MSA630 mSATA SSD, tested with TS32GMSA630/N0113E1
     "MKNSSDRE(1TB|2TB|512GB|500GB|256GB|250GB)|" // MKNSSDRE256GB/N1007C
+    "MKNSSDTR(240|500|250|120|480|240)GB(-LT)?|" // MKNSSDTR500GB/O1126A
     "ADATA SP550", // ADATA SP550/O0803B5a
     "", "",
   //"-v 1,raw48,Raw_Read_Error_Rate "
@@ -3301,9 +3303,11 @@ const drive_settings builtin_knowndrives[] = {
     "", "", ""
   },
   // ST5000LM000, ST4000LM024, ST3000LM024, ST2000LM015, ST1000LM048, ST500LM030
-  { "Seagate Barracuda 2.5 5400", // ST2000LM015-2E8174/SDM1
+  { "Seagate Barracuda 2.5 5400", // ST2000LM015-2E8174/SDM1, ST4000LM024-2AN17V/0001
     "ST(5000LM000|[34]000LM024|2000LM015|1000LM048|500LM030)-.*",
-    "", "", ""
+    "",
+    "",
+    "-v 183,raw48,SATA_Downshift_Count "
   },
   { "Seagate Barracuda ES.2", // fixed firmware
     "ST3(25031|50032|75033|100034)0NS",
diff --git a/smartmontools/drivedb.h.raw.asc b/smartmontools/drivedb.h.raw.asc
index 2ca0c30f2..43b052259 100644
--- a/smartmontools/drivedb.h.raw.asc
+++ b/smartmontools/drivedb.h.raw.asc
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQEcBAABAgAGBQJZ2+w1AAoJEPOHY87f0iVZSE0H/Ak2zU3igwX2U65Zdozxdyuh
-/s/PpBYnqiDKcgcvSIvhf+eYskO8JffATsmEpp9Gmp2Fr/q92sP4//b/ZG858tSy
-kTxwuBnr6aKIwplgCzSgyF5prx5f/BYzA9PSGM9Tz8XHTjrRUhk7fDSEcv9Z3TyT
-X8p89SswxbLu8oHZfC7LnX2ehfGGDw2jHw1ozo79/+c36aCQAJltre3h85hAOSul
-/W/s+3dmbvqKPjiJgmpFlbSZ4051LYRr5Wb6va10sPsazxQ3NHXYOCQF250WQS09
-ai9tM0XywREtbq9jTgig2NvT5b209opMlNt1UUBMKNBnd7eDiRQn/LlXSVz1xU0=
-=AsFp
+iQEcBAABAgAGBQJZ3RVmAAoJEPOHY87f0iVZQI0H/RURcltVv4YZEIxnifK8ERW7
+T9H0AmnpRFsPNi07lInvLbD2OLajV9zvo54bqEaoU+XuA4kqY2EduDGDd5Kg1fuJ
++lhOoCcgnsrrKG4wbig2HdIgGlp1W6mjuqgWAgC5Vk+kH61c2NnKAI9H1J1Dc+fM
+Wwj85edgQUuLkAta+P0OoC/+KrxIX0lEixATSSm9CRDgP3P3XAxelCjRVDnS+Dk4
+BQsxkWrjWeH7THcEpCsjotZN2Sv5L5+m6zF36PYJdAKeIEEPIZZJ85OAgeN+HPcC
+1kwMMc3WcgNE6iB9KCNv24WnJQSEvF1lGtehDL/XkRBHL5Rh745vgnSDRGdEYak=
+=bart
 -----END PGP SIGNATURE-----
-- 
GitLab