Merge r5600 r5601 into 6.0-7.3 drivedb.h branches.

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

smartmontools/drivedb.h

@@ -68,7 +68,7 @@
 /*
 const drive_settings builtin_knowndrives[] = {
  */
-  { "VERSION: 7.0/5598 2024-03-25 17:20:08 $Id$",
+  { "VERSION: 7.0/5601 2024-03-28 17:42:51 $Id$",
     "-", "-",
     "Version information",
     ""
@@ -5903,6 +5903,13 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat,12"
   },
+  // Kingston
+  { "USB: Kingston DataTraveller; ",
+    "0x0951:0x177f",
+    "",
+    "",
+    "-d sat,12"
+  },
   // Apricorn
   { "USB: Apricorn; ",
     "0x0984:0x0(040|301|320)", // 0x0040: Apricorn SATA Wire
@@ -5917,6 +5924,13 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
+  // Asus (?)
+  { "USB: ; ",
+    "0x0b05:0x17f8", // ASUSTek T100TA
+    "", // 0x0100
+    "",
+    "-d sat"
+  },
   // Seagate
   { "USB: Seagate External Drive; Cypress",
     "0x0bc2:0x0503",
@@ -6058,6 +6072,13 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d usbcypress"
   },
+  // TerraMaster (?)
+  { "USB: ; ",
+    "0x1000:0x1352", // TerraMaster D5-300C 5-Bay Box
+    "",
+    "",
+    "-d sat"
+  },
   // iRiver
   { "USB: iRiver iHP-120/140 MP3 Player; Cypress",
     "0x1006:0x3002",
@@ -6079,9 +6100,9 @@ const drive_settings builtin_knowndrives[] = {
     "-d sat"
   },
   // Atech Flash Technology
-  { "USB: ; Atech", // Enclosure from Kingston SSDNow notebook upgrade kit
-    "0x11b0:0x6298",
-    "", // 0x0108
+  { "USB: ; Atech", // Kingston
+    "0x11b0:0x6(298|388)",
+    "", // 0x0108, 0x5408
     "",
     "-d sat"
   },
@@ -6183,8 +6204,8 @@ const drive_settings builtin_knowndrives[] = {
     "-d sat"
   },
   { "USB: ; JMicron",
-    "0x152d:0x0579", // Intenso External
-    "", // 0x0100
+    "0x152d:0x05(79|80)", // 0x0579(0x0100): Intenso External
+    "", // 0x0100, 0x0201
     "",
     "-d sat"
   },
@@ -6303,9 +6324,9 @@ const drive_settings builtin_knowndrives[] = {
     "-d sat"
   },
   { "USB: ; JMicron",
-    "0x152d:0x578e",
-    "", // 0x1402, Intenso Memory Center
-    "",
+    "0x152d:0x(578e|b567)",
+    "", // 0x578e(0x1402): Intenso Memory Center
+    "", // 0xb567: Fantec AD-U3S
     "-d sat"
   },
   { "USB: ; JMicron JMS561", // USB3->2xSATA
@@ -6321,6 +6342,13 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
+  // Pinas
+  { "USB: ; Pinas",
+    "0x1741:0x1156", // Argon EON, device #2
+    "", // 0x0100
+    "",
+    "-d sat"
+  },
   // ASMedia
   { "USB: ; ASMedia ASM236x", // USB->PCIe (NVMe)
     "0x174c:0x236[24]",
@@ -6341,6 +6369,13 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
+  // Pinas
+  { "USB: ; Pinas",
+    "0x174e:0x1155", // Argon EON, device #1
+    "", // 0x0100
+    "",
+    "-d sat"
+  },
   // LucidPort
   { "USB: ; LucidPORT USB300", // RaidSonic ICY BOX IB-110StU3-B, Sharkoon SATA QuickPort H3
     "0x1759:0x500[02]", // 0x5000: USB 2.0, 0x5002: USB 3.0
@@ -6398,7 +6433,7 @@ const drive_settings builtin_knowndrives[] = {
     "-d sat,12"
   },
   { "USB: Verbatim External Hard Drive; ", // USB 3.0
-    "0x18a5:0x040[08]", // 0=3TB, 8=1TB
+    "0x18a5:0x04(0[08]|46)", // 00=3TB, 08=1TB, 46=500MB Mobile
     "",
     "",
     "-d sat"
@@ -6424,6 +6459,13 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d usbsunplus"
   },
+  // Actions Microelectronics
+  { "USB: ; Actions AM8180", // rebranded Realtek RTL9210
+    "0x1de1:0xe101",
+    "", // 0x2001
+    "",
+    "" // smartmontools >= r5051: -d sntrealtek
+  },
   // Kanguru Solutions
   { "USB: ; ", // ICY BOX IB-256WP
     "0x1e1d:0x20a0",
@@ -6496,9 +6538,9 @@ const drive_settings builtin_knowndrives[] = {
     "-d sat"
   },
   // Transcend (?)
-  { "USB: Transcend ESD400; ",
-    "0x2174:0x2000", // TS256GESD400K
-    "", // 0x1000
+  { "USB: Transcend ESD310/400; ",
+    "0x2174:0x2[01]00", // 0x2000: TS256GESD400K. 0x2100: TS512GESD310C
+    "", // 0x1000, 0x0100
     "",
     "-d sat"
   },
@@ -6516,6 +6558,13 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
+  // KIOXIA (?)
+  { "USB: ; ", // KIOXIA EXCERIA PLUS
+    "0x30de:0x1000",
+    "",
+    "",
+    "-d sntjmicron"
+  },
   // 0x2eb9 (?): See Realtek (0x0bda) above
   // Power Quotient International
   { "USB: PQI H560; ",

smartmontools/drivedb.h.raw.asc

 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCAAdFiEE3seuR5aLfIdZR/Kp6nSrJXIQQsUFAmYBs9AACgkQ6nSrJXIQ
-QsXWBQ/7BsbaZl2FJP7/iDIB4aR/ErSy2g8cHytai8MEk26+FFwcwR5u6qMgbQos
-61sHodMMNMYKu17w1LsNDsXO/fyUsqxauXNn4xspdc1aN5ukYjzLlSWqmbWC9JwQ
-EAqOKPlPIUdxYlMsPP5OJqNfdMflrt1ilQH+swlM5ORje03QdGAtEjSLLbQ8d4q1
-0ZPTaSBDOqzDcXigpSQ6O5u6wKyK1l5jiCI4jA1F0/8CrWuGTZXIYJ5Px8ZEaBzG
-hVo2c6x6qt9hU/i8Ad7lXe5ygSUoPDbE0mF7iTmAwXUwZuc7n9f0BOv+PAwizNd0
-gSFJNu2Tx5KqeDpjW1FyOQlhF6RjI0odxmL8s3uz7J7CZitB5ZkxquX8OUAVGCPG
-V6B/OFfgPeuphbmDV4K3gH6W4K66Vc1EpZKFc22WCk8WmaWJ9Bz4OpGJPU6evZ6y
-yI82a3U+pvtN4h/336BTOnpNbbNH/KK3NEDv4C+Ysk8j5GhuSSxMioF5r2GgE3Iz
-KCjjQJMXn9hWdTL7era6kbi988kuDUjX7dYLpv/vTsHTjiFHhB86CsgEZBcBwwmK
-W9eT7EvlLc6MThYTs5w2IVmvWNf+gR05CTXaJTd/5wQLrJrfm7RO9YX0jMifwYgL
-wqA18gaEKP6p6xczT1AFF9zSfGza8CNmh+FEe0M13LRwYeaEzHU=
-=mlxB
+iQIzBAABCAAdFiEE3seuR5aLfIdZR/Kp6nSrJXIQQsUFAmYFrgwACgkQ6nSrJXIQ
+QsVX0RAAyFyVYbLeBEWgzVcJ/03fG0lHj7MFvQVe1ahUYddAz63w2YAo9kFn4Sgf
+X/+9hj1FyNfi+jEcai5mecUU937xTlaXAHblLhldL8Y/m872qzx6JsZ8iroDWjm3
+1xiYRopd1Otg6p1DLdZUH7oyvkBO1YDQnYqYNjFR9IF/TjSbvwKfwOYb3MFw1oMg
+LzX276WKHP3xXj6MZlXF+3VFFQJ3q0HYFK3CoZ+zxUUfV5dkbWkg2JD0Bc6CvdyP
+3baFRf7SgxErTP6jKCTpLDkciAhwiFeAt6AbLHjtfDhE/vaGe/3fKPv6w9TD0Yi4
+4jvOLnt4IRMNte5jhehNUlWjLhFwGqAnCwCfHiTF+wBIWQRdEocp4lubqhxH2CX6
+X7KhaisYPEnY0yqLc6paR2Y2qxDbiMskupqCWbAgARYDWX0zAEtPmn9U83BAQ8zc
+689RT3nHqjrV1B6kBYljXUwhI1qyECPM0Gc6cDTPfk5R7UGs/rTiLl3W3TDoPrSM
+LN1H9Sgvo3a1+0yg6djk3WWE6TJPKt6LNn5/uwLJNN/6UdeUGsUpiFJjblec5jiC
+2KauLTbghTxCkbD5x8b2Uqr05yAeAgbyBFkuoew2Ab+56sNfZanWo9M5QAUPc66o
+DCDTg4aBLN6dflDT1NIEjjegq9S/9P1/NEv6d+MxVCO7Wb2Ks1w=
+=qaXI
 -----END PGP SIGNATURE-----