Merge r4921 r4922 r4923 into 5.41-7.0 drivedb.h branches.

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

smartmontools/drivedb.h

@@ -384,7 +384,7 @@ const drive_settings builtin_knowndrives[] = {
     "-v 202,raw48,Percent_Lifetime_Remain "
     "-v 206,raw48,Write_Error_Rate "
     "-v 210,raw48,Success_RAIN_Recov_Cnt "
-    "-v 246,raw48,Total_Host_Sector_Write "
+    "-v 246,raw48,Total_LBAs_Written "
     "-v 247,raw48,Host_Program_Page_Count "
     "-v 248,raw48,FTL_Program_Page_Count"
   },
@@ -1565,8 +1565,9 @@ const drive_settings builtin_knowndrives[] = {
     "TOSHIBA THNSNC128GMLJ|" // tested with THNSNC128GMLJ/CJTA0202 (built in Toshiba Protege/Dynabook)
     "TS(8|16|32|64|128|192|256|512)GSSD25S?-(MD?|S)|" // Transcend IDE and SATA, JMF612, tested with
       // TS256GSSD25S-M/101028, TS32GSSD25-M/20101227
-    "TS(32|64|128|256)G(SSD|MSA)340", // Transcend SSD340 SATA/mSATA, JMF667/670, tested with
-      // TS256GSSD340/SVN263, TS256GSSD340/SVN423b, TS256GMSA340/SVN263
+    "TS(32|64|128|256)G(SSD|MSA)[37]40K?", // Transcend SSD340/340K/740 SATA/mSATA, JMF667/670, tested with
+      // TS256GSSD340/SVN263, TS256GSSD340/SVN423b, TS256GMSA340/SVN263,
+      // TS128GSSD340K/SVN216,TS64GSSD740/SVN167d
     "", "",
   //"-v 1,raw48,Raw_Read_Error_Rate "
   //"-v 2,raw48,Throughput_Performance "
@@ -1583,9 +1584,12 @@ const drive_settings builtin_knowndrives[] = {
     "-v 170,raw16,Bad_Block_Count "
     "-v 173,raw16,Erase_Count " // JMF661: different?
     "-v 175,raw48,Bad_Cluster_Table_Count "
+    "-v 180,raw48,Unknown_JMF_Attribute "
+    "-v 187,raw48,Unknown_JMF_Attribute "
     "-v 192,raw48,Unexpect_Power_Loss_Ct "
   //"-v 194,tempminmax,Temperature_Celsius "
   //"-v 197,raw48,Current_Pending_Sector "
+    "-v 231,raw48,Unknown_JMF_Attribute "
     "-v 233,raw48,Unknown_JMF_Attribute " // FW SVN423b
     "-v 234,raw48,Unknown_JMF_Attribute " // FW SVN423b
     "-v 240,raw48,Unknown_JMF_Attribute "
@@ -1671,8 +1675,8 @@ const drive_settings builtin_knowndrives[] = {
       // SAMSUNG MZ7GE240HMGR-00003/EXT0303Q
     "SAMSUNG MZ7LM(120|240|480|960|1T9|3T8)HC(JM|HP|GR|FD)-.*|" // PM863 Series, tested with
       // SAMSUNG MZ7LM960HCHP-0E003/GXT3003Q
-    "SAMSUNG MZ7LM(240|480|960|1T9|3T8)HM(JP|HQ|LP)-.*|" // PM863a Series, tested with
-      // SAMSUNG MZ7LM3T8HMLP-00005/GXT5104Q
+    "(SAMSUNG )?MZ7LM(240|480|960|1T9|3T8)HM(JP|HQ|LP)(-.*|0D3)|" // PM863a Series, tested with
+      // SAMSUNG MZ7LM3T8HMLP-00005/GXT5104Q, MZ7LM240HMHQ0D3/GC5B (Dell)
     "(SAMSUNG )?MZ7KM(120|240|480|960|1T9)H[AM](FD|GR|H[PQ]|J[MP])(-.*|0D3)|" // SM863(a), tested with
       // SAMSUNG MZ7KM480HAHP-0E005/GXM1003Q, SAMSUNG MZ7KM480HMHQ-00005/GXM5104Q,
       // SAMSUNG MZ7KM960HMJP-00005/GXM5304Q, MZ7KM960HMJP0D3/GD53 (Dell)
@@ -1957,8 +1961,8 @@ const drive_settings builtin_knowndrives[] = {
     "-v 232,raw48,Read_Fail_Count "
     "-v 234,raw48,Flash_Reads_LBAs "
     "-v 235,raw48,Flash_Writes_LBAs "
-    "-v 241,raw48,Host_Writes_LBAs "
-    "-v 242,raw48,Host_Reads_LBAs"
+  //"-v 241,raw48,Total_LBAs_Written "
+  //"-v 242,raw48,Total_LBAs_Read "
     //  247-248 Missing in specification from April 2015
   },
   { "Smart Storage Systems Xcel-10 SSDs",  // based on http://www.smartm.com/files/salesLiterature/storage/xcel10.pdf
@@ -3348,6 +3352,17 @@ const drive_settings builtin_knowndrives[] = {
     "TOSHIBA MG04ACA[23456]00[AE].?",
     "", "", ""
   },
+  { "Toshiba MG06ACA... Enterprise Capacity HDD", // tested with TOSHIBA MG06ACA800E/4303,
+      // TOSHIBA MG06ACA10TE/0103
+    "TOSHIBA MG06ACA([68]00|10T)[AE]Y?",
+    "", "", ""
+  },
+  { "Toshiba MG07ACA... Enterprise Capacity HDD", // tested with TOSHIBA MG07ACA14TE/0101
+    "TOSHIBA MG07ACA1[24]T[AE]Y?",
+    "", "",
+    "-v 23,raw48,Helium_Condition_Lower "
+    "-v 24,raw48,Helium_Condition_Upper"
+  },
   { "Toshiba 3.5\" DT01ABA... Desktop HDD", // tested with TOSHIBA DT01ABA300/MZ6OABB0
     "TOSHIBA DT01ABA(100|150|200|300)",
     "", "", ""
@@ -4035,8 +4050,9 @@ const drive_settings builtin_knowndrives[] = {
   { "WD Blue and Green SSDs", // tested with WDC WDS250G1B0A-00H9H0/X41000WD,
       // WDC WDS250G1B0A-00H9H0/X41100WD, WDC WDS100T1B0A-00H9H0,
       // WDC WDS120G2G0A-00JH30/UE360000, WDC WDS240G2G0A-00JH30/UF300000,
-      // WDC WDS500G2B0A-00SM50/X61130WD, WDC WDS200T2B0A-00SM50/X61130WD
-    "WDC WDS((120|240|250|480|500)G|[12]00T)(1B|2B|2G)0[AB]-.*", // *1B* = Blue, *2G* = Green, *2B* = Blue 3D NAND
+      // WDC WDS500G2B0A-00SM50/X61130WD, WDC WDS200T2B0A-00SM50/X61130WD,
+      // WDC WDS200T2B0A/X61190WD
+    "WDC WDS((120|240|250|480|500)G|[12]00T)(1B|2B|2G)0[AB](-.*)?", // *1B* = Blue, *2G* = Green, *2B* = Blue 3D NAND
     "", "",
   //"-v 5,raw48,Reallocated_Sector_Ct " // Reassigned Block Count
   //"-v 9,raw48,Power_On_Hours "
@@ -4060,8 +4076,8 @@ const drive_settings builtin_knowndrives[] = {
   //"-v 232,raw48,Available_Reserve_Space"
     "-v 233,raw48,NAND_GB_Written_TLC "
     "-v 234,raw48,NAND_GB_Written_SLC "
-    "-v 241,raw48,Total_Host_GB_Written "
-    "-v 242,raw48,Total_Host_GB_Read "
+    "-v 241,raw48,Host_Writes_GiB "
+    "-v 242,raw48,Host_Reads_GiB "
     "-v 244,raw48,Temp_Throttle_Status "
   },
   { "Western Digital Protege",
@@ -5236,7 +5252,7 @@ const drive_settings builtin_knowndrives[] = {
     "0x152d:0x0583",
     "",
     "",
-    "" // smartmontools >= r4850: -d sntjmicron#please_try
+    "" // smartmontools >= r4850: -d sntjmicron[#please_try]
   },
   { "USB: OCZ THROTTLE OCZESATATHR8G; JMicron JMF601",
     "0x152d:0x0602",
@@ -5555,6 +5571,13 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
+  // Transcend
+  { "USB: ; ",
+    "0x8564:0x7000",
+    "", // 0x8000
+    "",
+    "-d sat"
+  },
   // JMicron II
   { "USB: ; JMicron JMS566",
     "0xa152:0xb566",

smartmontools/drivedb.h.raw.asc

 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAABAgAGBQJc5Fu7AAoJEOp0qyVyEELFEuMP/jSQtEP35fux2Zwy/hhmcSjg
-nniOxLBOcroR0KMSOg68iikYQZAZ2HmZ3dsrOCXH5ezhdAq5bYIxxMV00ammV1S2
-KJu4oCTyxR7P9PyMEhXjkYsa8zXLWi1gaEvEoHD6cDYiosMd8rr5JEHjrpcakmFx
-u2bMQL8F0xFS1uWfN0gnz4GptYCKOg3RX6TjW/cqIlkYsJdsCvxdHQizPbwyRwpi
-GpJS6VENlISJztlJecv1AEtd2Xez0Jh3C3SIit9fRclI/G/lDrZUB/JgVfGMdwyK
-pEf27XJkaiyA6AK0YHaKOMIC6wvD07VGZHqnkAh8YwROTCjtligJOghx2bzH/f7Z
-iULNdbWDrhFD7pPLAy4tV5H4bxvVWTel4iLVpolThLC/VG9Zxj374G4SyaPB/aca
-txCUq1Me77vVDUnTNnxdHvMus6wEcXWl7QL8sCKtv2nCutxDC5rsVsV6zW4ekJ4u
-GPjjUGSjfh1EWsYW8bZwUw2pFHYXMWEfzvcs9PXN96yahzrvK2ZB5Z2NY7uKWSSg
-Ny+hm4ZGSCuLfZxEMVP1STVUNmTi5QVpJD052DVAiSAFElzGa/0rIseUwQykUlBp
-NVqCFFH04D07Sr15qsJnSMNBJ+INuAAfTowka58YO5R5DykJaPq0HS22m7t98RZD
-WrjgX2Do3Al3NMnDfiNl
-=5vde
+iQIcBAABAgAGBQJdCo8VAAoJEOp0qyVyEELFbMcQALS8mLdn0iN77ZGxgommx3QH
+dwOAvX57NcHi5B7zMJ8NLtn7UWU+SBLX9XF6dSrmti3VmVAVl57FN6jWk3OSBb9k
+ievN04PVF0j2b9+SzFAlYKU5LdiljdxgPIB3o44iDWSxT/W9eUnf+IyfWHkX+Pl4
+xECA+MwhoGSjstwGYJF05XDe5dfRijoBMSUtibo4oZzrXZXSjT6chR4p6jGaqB7L
+qCoczZNpkOPh1frR/O9oV16aM/0NuobwY88esmKXvw0SeZVjvGmSLBhOHjUB2oON
+nEg+Euul3pvXmF0VSzy8OPViSNbTZbQ8PTG8hJSPBhbeWLnT+2Ry0ZghYaKttGy3
+1PsapUlp0MkJdfiVnb7ftaes9Tvrpd9U6H0FOihEGpCEvSHL2T2AFn3uuoJ0G/6p
+jCIhD4kPZ+nINrx0cXIKHReVzBrpWX4OehL/rLDOYR/7TrnetIoBgUZejghuvAt1
+2taxf+yti5C9eziQSsoDMxs6fbcvP8WVNP15rGXpxpg0hE+dZamdgRHjZz7eYDCi
+c0jFx70Ebrv6ce6ksSR6FLS4we2FFjMY4aukaBXRT2ktkEuNdHr9uOmjAHrQ850f
+BizFeKKWEcF2XTV/6KYzeV05BKFo4Nnl9VDf3r+yhEu7d3yEUsMT+lg6cvMc3HMV
+m7ZBeBRbCoTtqxFvb3xl
+=zZtV
 -----END PGP SIGNATURE-----