Merge r4626 r4627 into 5.40-6.6 drivedb.h branches.

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

smartmontools/drivedb.h

@@ -153,6 +153,19 @@ const drive_settings builtin_knowndrives[] = {
     "-v 254,raw48,Free_Fall_Sensor "              // HDD only
   */
   },
+  { "Swissbit C440 Industrial CompactFlash Card",
+    // spec v1.23 found at http://www.farnell.com/datasheets/1821167.pdf
+    // tested with SFCF4096H2BU4TO-I-MS-527-STD
+    "SFCF(2048|4096|8192|16GB|32GB|64GB)H[0-9]BU[24]TO-(C|I)-(MS|QT|NU)-5[0-9]7-STD",
+    "", "",
+    "-v 196,raw24/raw24,Spare_Blocks "
+    "-v 213,raw24/raw24,Spare_Blocks_Worst_Chip "
+    "-v 229,raw48,Erase_Count "
+    "-v 203,raw48,Total_ECC_Errors "
+    "-v 232,raw48,Total_Number_of_Reads "
+    "-v 214,raw48,Reserved_Attribute " // Spec says "to be determined"
+    "-v 215,raw48,Current_TRIM_Percent "
+  },
   { "Apacer SSD",
     "(2|4|8|16|32)GB SATA Flash Drive", // tested with APSDM002G15AN-CT/SFDDA01C and SFI2101D, APSDM004G13AN-AT/SFDE001A
     "SF(DDA01C|I2101D|DE001A)", "", // spec found at http://wfcache.advantech.com/www/certified-peripherals/documents/96fmcff-04g-cs-ap_Datasheet.pdf
@@ -733,8 +746,9 @@ const drive_settings builtin_knowndrives[] = {
   //"-v 194,tempminmax,Temperature_Celsius "
     "-v 241,raw48,Host_Writes"
   },
-  { "InnoDisk InnoLite SATADOM D150QV-L SSDs", // tested with InnoLite SATADOM D150QV-L/120319
-    "InnoLite SATADOM D150QV-L",
+  { "InnoDisk InnoLite SATADOM D150QV SSDs", // tested with InnoLite SATADOM D150QV-L/120319
+                                             // InnoLite SATADOM D150QV/120319
+    "InnoLite SATADOM D150QV.*",
     "", "",
   //"-v 1,raw48,Raw_Read_Error_Rate "
   //"-v 2,raw48,Throughput_Performance "
@@ -742,18 +756,18 @@ const drive_settings builtin_knowndrives[] = {
   //"-v 5,raw16(raw16),Reallocated_Sector_Ct "
   //"-v 7,raw48,Seek_Error_Rate " // from InnoDisk iSMART Linux tool, useless for SSD
   //"-v 8,raw48,Seek_Time_Performance "
-  //"-v 9,raw24(raw8),Power_On_Hours "
+  //"-v 9,raw48,Power_On_Hours "
   //"-v 10,raw48,Spin_Retry_Count "
   //"-v 12,raw48,Power_Cycle_Count "
     "-v 168,raw48,SATA_PHY_Error_Count "
-    "-v 170,raw48,Bad_Block_Count "
-    "-v 173,raw48,Erase_Count "
+    "-v 170,raw16,Bad_Block_Count_New/Tot "
+    "-v 173,raw16,Erase_Count_Max/Avg "
     "-v 175,raw48,Bad_Cluster_Table_Count "
     "-v 192,raw48,Unexpect_Power_Loss_Ct "
   //"-v 194,tempminmax,Temperature_Celsius "
   //"-v 197,raw48,Current_Pending_Sector "
     "-v 229,hex48,Flash_ID "
-    "-v 235,raw48,Later_Bad_Block "
+    "-v 235,raw16,Lat_Bad_Blk_Era/Wri/Rea "
     "-v 236,raw48,Unstable_Power_Count "
     "-v 240,raw48,Write_Head"
   },

smartmontools/drivedb.h.raw.asc

 -----BEGIN PGP SIGNATURE-----
 
-iQEcBAABAgAGBQJaCgcwAAoJEPOHY87f0iVZ8KEH/3F8Gwpn16VM2xmZTX979e7v
-m3ZLpzqn9P7nOPfFyFuDUMh+rvHRqEqltkDaiWWetyw+6OZSpCV4HrnKOa9kVn5Y
-RQnGZkoOXZ+PNIMyKAoCEmiqZdzURAqljDRQILNEzgPql6OFns5z9bz7BvGD0VAM
-UB0l7+W/VsrRN63Alk+wejsATzuafI2NYX3tJJk8MawU+/8qQ6pikQ9JMI7b17WO
-Swg0aZs+Bnt9zUOnlS2rHfwmH2ovrwjwfMDDjwo5oST3rbm/jMub1XU7uQJHh/lN
-Ll0hfFAJb6/J+jqqgRJj2KV0Ha+GiROP/ELBPT241gF7lxrx0VDDc4w95QLkpaU=
-=ff5M
+iQEcBAABAgAGBQJaIrkIAAoJEPOHY87f0iVZTUIH/RhA+vVOyGjUL9Tk1j0jU5Ta
+p7Ek6d5iUbbTEn/E/w/fX6WOMR71YaN4jHWuM9isKbcaJQzohSWOHeNBdIGvf3SI
+Be27Z4BqD665GY+77lcfRRwirBF7tiiPIOUBNc1gFTjZikWsP/o+Gbq6i599pXEi
+rsAEHlnKFO7yfQePZ+A1jteS5VCtoL0iVegNbG9na8rqrDDywjK2DWI++fRI6Pr6
+KDL1wq271680m8Uz/1XrUtDhNklCTshsZDTfPjSrvJYOKAvq9aS314g3Y+xuhGFe
+ePnjBZE28L7N2OmideDBegsfT5rzuIjhKGIiUF4ns4PqvUJ4eLb9YXp3FnIpmGg=
+=LR/H
 -----END PGP SIGNATURE-----