From 7e8d99183d5a1cccd1f775e563d920eb3654f31d Mon Sep 17 00:00:00 2001
From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Thu, 28 Mar 2024 17:55:50 +0000
Subject: [PATCH] Merge r5600 r5601 into 6.0-7.3 drivedb.h branches.

git-svn-id: https://svn.code.sf.net/p/smartmontools/code/branches/RELEASE_6_0_DRIVEDB@5602 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
 smartmontools/drivedb.h         | 75 +++++++++++++++++++++++++++------
 smartmontools/drivedb.h.raw.asc | 16 +++----
 2 files changed, 70 insertions(+), 21 deletions(-)

diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index b83aba12f..9c57b427f 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -68,7 +68,7 @@
 /*
 const drive_settings builtin_knowndrives[] = {
  */
-  { "VERSION: 6.0/5598 2024-03-25 17:20:08 $Id$",
+  { "VERSION: 6.0/5601 2024-03-28 17:42:51 $Id$",
     "-", "-",
     "Version information",
     ""
@@ -5901,6 +5901,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
@@ -5915,6 +5922,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",
@@ -6056,6 +6070,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",
@@ -6077,9 +6098,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"
   },
@@ -6181,8 +6202,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"
   },
@@ -6301,9 +6322,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
@@ -6319,6 +6340,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]",
@@ -6339,6 +6367,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
@@ -6396,7 +6431,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"
@@ -6422,6 +6457,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",
@@ -6494,9 +6536,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"
   },
@@ -6514,6 +6556,13 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
+  // KIOXIA (?)
+  { "USB: ; ", // KIOXIA EXCERIA PLUS
+    "0x30de:0x1000",
+    "",
+    "",
+    "" // smartmontools >= r4850: -d sntjmicron[#please_try]
+  },
   // 0x2eb9 (?): See Realtek (0x0bda) above
   // Power Quotient International
   { "USB: PQI H560; ",
diff --git a/smartmontools/drivedb.h.raw.asc b/smartmontools/drivedb.h.raw.asc
index 4f8123757..6b3537015 100644
--- a/smartmontools/drivedb.h.raw.asc
+++ b/smartmontools/drivedb.h.raw.asc
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQEzBAABCAAdFiEEBX8ZPeH5i+VyL5vy84djzt/SJVkFAmYBs8sACgkQ84djzt/S
-JVkAOQf+N4yPdh3iuAjtXrLerefk4wijAuhoOjLZwb4t8DC64/ih2qbbBF3m/ftJ
-I0iKTjBjyyZkRXb0RoYprawV3T+WrVzvIzhdaanlOkOhiuRiBMxlNvEk3SVKOL3x
-AxSUE2nM627KzffzSgf9yz61GmHSRBJGiVMFhSz0Wj7EIgVgbcqAhVggwRErNfdv
-PeNXcxsoAVB15wUgEKphkrWQoVsp/lSCV/SjOcjv+jzO1eqyc71xuvsgYzCygC8G
-+f8OTUqwP2oGvlQCdvSwkhEg4RDU9fOvH5aHXljClv91whEWC1SRTL1d8P7bB6l7
-2BECpjkX8m32WVc5siyr3NaYMBdhsQ==
-=bR/X
+iQEzBAABCAAdFiEEBX8ZPeH5i+VyL5vy84djzt/SJVkFAmYFrgcACgkQ84djzt/S
+JVmhJgf/fv579+vdFQFSkCK/ghXEka+h/YkMUdls5waJWa3Q0/aPa5iab8jQ9PyQ
+zYgcgfOJ0r7wBBjnHfEOvYRkKqjQTChv3xaFEVdzHdl3SZulnTWHEhgTgn6i8Qx6
+FC+GFrgBasx/JsAh2YFAw0jInab+Dhdm3V7pj2E0xprM1A5L2oR0e7luDs9xS0hJ
+wkiFgZYW2SURDOp6w5+SFHPmLLa5RceUU3nRg9+BLhrRZCdd5RSkdsK2B8YWy/JV
+p/7ZKhLDJKnG4+JWtiuV+uSGlYUT/FX1WP6g55xVn8h2wz299LIVm6OIviXwSM5f
+JZ9xwTVEeB+a4QdkVc0d4iGCN5kOew==
+=ch+k
 -----END PGP SIGNATURE-----
-- 
GitLab