From 54d55d9130b0d489ddbd495ec51a4fdb9c7f680e Mon Sep 17 00:00:00 2001
From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Mon, 12 Aug 2019 20:18:59 +0000
Subject: [PATCH] Merge r4944 into 5.41-7.0 drivedb.h branches.

git-svn-id: https://svn.code.sf.net/p/smartmontools/code/branches/RELEASE_6_0_DRIVEDB@4945 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
 smartmontools/drivedb.h         | 44 ++++++++++++++++++++++++++++++---
 smartmontools/drivedb.h.raw.asc | 26 +++++++++----------
 2 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index 5918d0ab6..c14b1bd21 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -1,7 +1,7 @@
 /*
  * drivedb.h - smartmontools 6.0 drive database file
  *
- * Home page of code is: http://www.smartmontools.org
+ * Home page of code is: https://www.smartmontools.org
  *
  * Copyright (C) 2003-11 Philip Williams, Bruce Allen
  * Copyright (C) 2008-19 Christian Franke
@@ -222,6 +222,24 @@ const drive_settings builtin_knowndrives[] = {
   //"-v 194,tempminmax,Temperature_Celsius "
   //"-v 241,raw48,Total_LBAs_Written "
   },
+  { "Apacer AS340 SSDs",
+    "Apacer AS340 (120|240|480|960)GB", // tested with Apacer AS340 120GB/AP612PE0
+    "", "",
+  //"-v 9,raw24(raw8),Power_On_Hours "
+  //"-v 12,raw48,Power_Cycle_Count "
+    "-v 163,raw48,Max_Erase_Count "
+    "-v 164,raw48,Average_Erase_Count "
+    "-v 166,raw48,Later_Bad_Block_Count "
+    "-v 167,raw48,SSD_Protect_Mode "
+    "-v 168,raw48,SATA_PHY_Error_Count "
+    "-v 171,raw48,Program_Fail_Count "
+    "-v 172,raw48,Erase_Fail_Count "
+    "-v 175,raw48,Bad_Cluster_Table_Count "
+    "-v 192,raw48,Unexpect_Power_Loss_Ct "
+  //"-v 194,tempminmax,Temperature_Celsius "
+    "-v 231,raw48,Lifetime_Left "
+  //"-v 241,raw48,Total_LBAs_Written "
+  },
   { "Apple MacBook Air SSD", // probably Toshiba
     "APPLE SSD TS(064|128)E", // tested with APPLE SSD TS064E/TQAABBF0
     "", "",
@@ -618,6 +636,8 @@ const drive_settings builtin_knowndrives[] = {
   { "Phison Driven SSDs", // see MKP_521_Phison_SMART_attribute.pdf
     "KINGSTON SEDC400S37(400|480|800|960|1600|1800)G|" // DC400, tested with
       // KINGSTON SEDC400S37480G/SAFM02.[GH], KINGSTON SEDC400S37960G/SAFM32.I
+    "KINGSTON SEDC500[MR](480|960|1920|3840)G|" // DC500M/R, tested with
+      // KINGSTON SEDC500M1920G/SCEKJ2.3, KINGSTON SEDC500R480G/SCEKJ2.3
     "KINGSTON SUV300S37A(120|240|480)G|" // UV300 SSD, tested with KINGSTON SUV300S37A120G/SAFM11.K
     "KINGSTON SKC310S3B?7A960G|" // SSDNow KC310, KINGSTON SKC310S37A960G/SAFM00.r
     "KINGSTON SKC400S37(128G|256G|512G|1T)|" // SSDNow KC400, KINGSTON SKC400S37128G
@@ -642,19 +662,28 @@ const drive_settings builtin_knowndrives[] = {
   //"-v 9,raw24(raw8),Power_On_Hours "
     "-v 10,raw48,Not_In_Use "
   //"-v 12,raw48,Power_Cycle_Count "
+    "-v 167,raw48,Unknown_Phison_Attr "
     "-v 168,raw48,SATA_Phy_Error_Count "
+    "-v 169,raw48,Unknown_Phison_Attr "
     "-v 170,raw24/raw24:z54z10,Bad_Blk_Ct_Erl/Lat " // Early bad block/Later bad block
+    "-v 172,raw48,Unknown_Phison_Attr "
     "-v 173,raw16(avg16),MaxAvgErase_Ct "
     "-v 175,raw48,Not_In_Use "
-    "-v 183,raw48,Unknown_Attribute "
+    "-v 181,raw48,Unknown_Phison_Attr "
+    "-v 182,raw48,Unknown_Phison_Attr "
+    "-v 183,raw48,Unknown_Phison_Attr "
   //"-v 187,raw48,Reported_Uncorrect "
     "-v 192,raw48,Unsafe_Shutdown_Count "
+    "-v 193,raw48,Power_Fail_Uncompl_Cnt "
   //"-v 194,tempminmax,Temperature_Celsius "
-    "-v 196,raw48,Not_In_Use "
+    "-v 194,raw48,Power_Fail_Health "
+  //"-v 196,raw16(raw16),Reallocated_Event_Count "
     "-v 197,raw48,Not_In_Use "
-    "-v 199,raw48,CRC_Error_Count "
+    "-v 199,raw48,SATA_CRC_Error_Count "
+    "-v 207,raw48,Thermal_Throttling_Cnt "
     "-v 218,raw48,CRC_Error_Count "
     "-v 231,raw48,SSD_Life_Left "
+    "-v 232,raw48,Read_Fail_Count "
     "-v 233,raw48,Flash_Writes_GiB "
     "-v 240,raw48,Not_In_Use "
     "-v 241,raw48,Lifetime_Writes_GiB "
@@ -4960,6 +4989,13 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d usbjmicron"
   },
+  // Fast Point Technologies (?)
+  { "USB: ; ",
+    "0x0850:0x0003",
+    "", // 0x0100
+    "",
+    "-d sat"
+  },
   // Oxford Semiconductor, Ltd
   { "USB: ; Oxford",
     "0x0928:0x0000",
diff --git a/smartmontools/drivedb.h.raw.asc b/smartmontools/drivedb.h.raw.asc
index 88b91a879..e73d6d011 100644
--- a/smartmontools/drivedb.h.raw.asc
+++ b/smartmontools/drivedb.h.raw.asc
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAABAgAGBQJdCo8WAAoJEOp0qyVyEELFhHcP/j8LyqkM8ef9ynqjVhKXooIM
-GM/4/fHpK4eHEjtg0oaFLOM3EmlEgZUulxHJLXqo+6f1jTHSuu6dCYNX+tSaja1m
-nqYOm4y/E/9CuzG7tQAghjNPJdsSgTU5Or+EfGE8mWAjvORPJBGERhcG+DAGOgqB
-ptTyml0Rj2+KCsUfFC9h9Uv4lpDASspVVetcCMM0s/UvFgyGcQ/8KCkgZZJOtW0N
-R0AIILrnCDpzta6EFWpx5KjObOibtGi9EZi/9db0rNFDY+8Yn0av9ljhionGGBZW
-4nLKm7h9q81snK16PEvk/00Jh/M3ioUnbNaE+Nhly/VyMA05dYkUQxc8FEyeMXKe
-qkMeA61KqLOfuwbUHAYuOgp5A+AxBCltT/RK1fa+mfup72/thMi/786Uy0JR+I32
-HjEJY7xKmIAD0U14VohGeyZT6dun4gA4R+cXZY7aEPA0p29TdZbU3xgN3gzdFB6X
-6pBl+9NvQUN2uTOOTX17sgReA9xLwI1+ZTaF/thi+6TEkGuEHYPwr+HEC2Q05zal
-FI9pNOBvJMQoavaOv06/iDf3g7qd/hLhs9VumpCcaHOEDOHkcHAlDrCgqIBJSKvt
-iRKl8hI6rUpgn1YK9iyTrFBWGchYV20f2OHLb6HohncA4rdBhKduuRYINsjpvb//
-504iTQzR2GeduLuXEv4l
-=JAdc
+iQIcBAABAgAGBQJdUcklAAoJEOp0qyVyEELFtH0QAKaC9PXpFAW6vPD+f45N2rfa
+oEvIhHRuCJKwZBLtHfkzF0BNcczha1vVSKT+1P35PMAIA+GH/RnJk63vCpukGMI5
+BI7P6ZQQSU57npvenai5UTlHIP8zZePOTMqnOo7pQjJwPyTa4Jh/DM9dFWJ2xybq
+qZJ5OT7lwqMGOKS2LWPhY3smwebLm0WM/0JV2f82wRZMgDqiEibeyMfUTObBOUPx
+zXsEnGRYjlgcyBdz40ysgpCFY1RU+EJU73K49cSDI8DYr0wOegFmsgXhQBZf3xuR
+gzbTxxWQJkVgHCJKu2EeMyrQZdDrCdE1bfBOw8NZVaVV+YW/rMg2I2vouHUWiqKm
+xk6JqzB7v3WupMWKFZdl9bSYRZkuZlDRcIndh51Q7RExTVch3EFusX7cFssjlGmR
+ATXaGWfEIfojkgmtAj92xnL4PmjWd9GNDv+yifQ3IwqO8OnvRNwt+NkT66/RGPF8
+OmoIQppu69RLkQ/dxzNkz6QwcE8rGwNTW3yjIAKWo1qVlPqtjX5KHeQsij+hPbBL
+3HWAxxBHSp5q1CWcM+7Q/aMA0adoQ/XVOVSpuYXt1yUmjd1yOD0YkkYEoYqb094N
+nca6gbDsTlTN6YY3uZ2BDafQRU07PkMZGG4hvQTRNzw+ofhQB3mjU3m9GI+dsatY
+CNOtQGZSZKIk0D9lMWat
+=Ruha
 -----END PGP SIGNATURE-----
-- 
GitLab