Merge r4732 r4740 r4741 into 5.41-6.6 drivedb.h branches.

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

smartmontools/drivedb.h

@@ -527,11 +527,12 @@ const drive_settings builtin_knowndrives[] = {
     "-v 249,raw48,Spares_Remaining_Perc " //  later then 0409 FW.
   },
   { "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 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
     "KINGSTON SV310S3(7A|D7|N7A|B7A)960G|" // SSDNow V310
-    "GOODRAM|" // GOODRAM/SAFM12.2 (CX200), model name is missing in the SMART!
     "PNY CS1311 (120|240|480|960)GB SSD|" // tested with PNY CS1311 120GB SSD/CS131122
     "SSD Smartbuy (60|120|240)GB|" // SSD Smartbuy 240GB/SBFM91.1
     "KINGSTON SHSS3B?7A(120|240|480|960)G", // HyperX Savage
@@ -570,11 +571,12 @@ const drive_settings builtin_knowndrives[] = {
   },
   // this is a copy of the Phison bases record for the OEM drives with a very
   // weak information in the model. Detection is based on Firmware.
-  // Tested with FoxLine flssd240x4se (SATA SSD/SBFM10.5) and Supermicro 
-  // SSD-DM032-PHI (SATA SSD/S9FM02.1)
   { "Phison Driven OEM SSDs", // see MKP_521_Phison_SMART_attribute.pdf
-    "SATA SSD",
-    "(S9FM02\\.1|SBFM10\\.5)",
+    "GOODRAM|" // tested with GOODRAM CX200 (GOODRAM/SAFM12.2)
+    "INTENSO|" // tested with Intenso SSD SATA III Top (INTENSO/S9FM02.6, .../SAFM01.6)
+    "SATA SSD", // tested with Supermicro SSD-DM032-PHI (SATA SSD/S9FM02.1),
+      // PC Engines msata16d (SATA SSD/S9FM02.3), FoxLine flssd240x4s(SATA SSD/SBFM10.5)
+    "S9FM02\\.[136]|SAFM01\\.6|SAFM12\\.2|SBFM10\\.5|SBFM91\\.2",
     "",
   //"-v 1,raw48,Raw_Read_Error_Rate "
     "-v 2,raw48,Not_In_Use "
@@ -4215,6 +4217,12 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d usbcypress"
   },
+  { "USB: Iomega MDHD500-U; JMicron",
+    "0x059b:0x0274",
+    "", // 0x0000
+    "",
+    "-d usbjmicron,0"
+  },
   { "USB: Iomega MDHD500-U; ",
     "0x059b:0x0275",
     "", // 0x0001
@@ -4429,6 +4437,12 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
+  { "USB: Freecom; ",
+    "0x07ab:0xfc17",
+    "", // 0x0100
+    "",
+    "-d sat"
+  },
   { "USB: Freecom Quattro 3.0; ", // USB3.0+IEEE1394+eSATA->SATA
     "0x07ab:0xfc77",
     "",
@@ -4715,9 +4729,9 @@ const drive_settings builtin_knowndrives[] = {
   { "USB: ; JMicron JMS539", // USB2/3->SATA (new firmware)
     "0x152d:0x0539",
     "0x020[56]|"   //  2.05, ZTC USB 3.0 enclosure (ticket #338)
-    "0x28(03|12)", // 28.03, Mediasonic ProBox HF2-SU3S2 Rev 2 (port multiplier, ticket #504)
-    "",            // 28.12, Mediasonic ProBox H82-SU3S2 (port multiplier)
-    "-d sat"
+    "0x28(01|03|12)", // 28.01, DATOptic U3eSATA (USB3.0 bridge with port multiplier)
+    "",               // 28.03, Mediasonic ProBox HF2-SU3S2 Rev 2 (port multiplier, ticket #504)
+    "-d sat"          // 28.12, Mediasonic ProBox H82-SU3S2 (port multiplier)
   },
   { "USB: ; JMicron ", // USB->SATA->4xSATA (port multiplier)
     "0x152d:0x0551",   // JMS539? (old firmware may use 0x152d:0x0539, ticket #552)
@@ -4725,6 +4739,12 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d usbjmicron,x"
   },
+  { "USB: ; JMicron",
+    "0x152d:0x0561",
+    "", // 0x0003, ODROID CloudShell 2
+    "",
+    "-d sat"
+  },
   { "USB: ; JMicron", // USB2/3->2xSATA
     "0x152d:0x0565",
     "", // 0x9114, Akasa DuoDock X (ticket #607)
@@ -4815,6 +4835,12 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d usbjmicron,x"
   },
+  { "USB: ; JMicron JMS567", // USB3->SATA
+    "0x152d:0x2567",
+    "", // 0x0117, Chieftec CEB-7053S
+    "",
+    "-d sat"
+  },
   { "USB: ; JMicron",
     "0x152d:0x2590",
     "", // 0x0x8105 (ticket #550)
@@ -4833,6 +4859,12 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
+  { "USB: ; JMicron",
+    "0x152d:0x578e",
+    "", // 0x1402, Intenso Memory Center
+    "",
+    "-d sat"
+  },
   { "USB: ; JMicron JMS561U", // USB3->2xSATA
     "0x152d:0x8561",
     "", // 0x0107

smartmontools/drivedb.h.raw.asc

 -----BEGIN PGP SIGNATURE-----
 
-iQEcBAABAgAGBQJao9t3AAoJEPOHY87f0iVZiJEH/iUtCqgdGC6U5aKQmgwuYN2t
-GawZwLB74RoFvHPOf7oKXKjMZ3Av82Sm7roAQjgT4Tbys0MMLzzJhd3nei5teaHh
-FGo/+sO4y/4V0sPp2w8OTCHSS368PM3eUkJkJkwVdLdtPeuDfBZV1sD5Cr/6uIbH
-xpke6AyoDfN1i+IBe51vYSYlPfASlnWpfMg4K2U2WGgXb/MArLMZp6MczRaKwAWi
-zsiXcHBF3xI6Kbw7cP9JyiSu5818h7UcpXVHxVnjTFyHgzIuT+stsUtuSdBrzLRP
-Jx19x6/EnWuf4pPdfCK5gKbGB+s9crVMF3tmt3qUcWnlb9mdonaG6A3f5heBuT8=
-=IQ/k
+iQEcBAABAgAGBQJbYNXWAAoJEPOHY87f0iVZrEoH/Rcp0wmi825rot6htGt8krwu
+LPoNG5I8imVMtu8G9sB/j++7eJoT8ebJNIXUZrWvhMcwgClNn4spV/sfe/VNhkRq
+UribeG7Qqg8EyHcWnOSTA3lR358KCYi4WhgTVb3xhOk8qF+XVunh8BdK+nivFnbS
+2mFQ7pSZaT9URWiQO3JAXDWEjDboi4L4dNqpPmFmtQk6misvY/4jWkunXnSZiF3E
+UHJZaDcOdOEUMaw7pumSGZKtE0n91+N4SibzcaucMmLNTzL1alfM4c9zDCcDcvCd
+N/DFrLOEsqXdpji2FH8Xv0PvUKBkrFfg1qGQQIkkmbx7dhmsBHOZz0Er50TxuvM=
+=wMPZ
 -----END PGP SIGNATURE-----