From 2cb353d055a92908e22ea8a31aa33734c13a91ec Mon Sep 17 00:00:00 2001
From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Thu, 28 Mar 2024 16:30:34 +0000
Subject: [PATCH] drivedb.h: - USB: Kingston DataTraveller (0x0951:0x177f)
 (#1756). - USB: Asus (0x0b05:0x17f8) (#1810). - USB: TerraMaster
 (0x1000:0x1352) (#1818). - USB: Kingston (0x11b0:0x6388). - USB: JMicron
 (0x152d:0x0580) (#1766, #1788). - USB: JMicron (0x152d:0xb567) (#1797). -
 USB: Pinas (0x174e:0x1155, 0x1741:0x1156) (#1772, GH pull/253). - USB:
 Verbatim (0x18a5:0x0446) (#1812). - USB: Actions AM8180 (0x1de1:0xe101)
 (#1681). - USB: Transcend ESD310 (0x2174:0x2100) (#1767). - USB: KIOXIA
 (0x30de:0x1000).

git-svn-id: https://svn.code.sf.net/p/smartmontools/code/trunk@5600 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
 smartmontools/ChangeLog | 15 +++++++++
 smartmontools/drivedb.h | 73 ++++++++++++++++++++++++++++++++++-------
 2 files changed, 76 insertions(+), 12 deletions(-)

diff --git a/smartmontools/ChangeLog b/smartmontools/ChangeLog
index 96251f4f3..624931548 100644
--- a/smartmontools/ChangeLog
+++ b/smartmontools/ChangeLog
@@ -1,5 +1,20 @@
 $Id$
 
+2024-03-28  Christian Franke  <franke@computer.org>
+
+	drivedb.h:
+	- USB: Kingston DataTraveller (0x0951:0x177f) (#1756).
+	- USB: Asus (0x0b05:0x17f8) (#1810).
+	- USB: TerraMaster (0x1000:0x1352) (#1818).
+	- USB: Kingston (0x11b0:0x6388).
+	- USB: JMicron (0x152d:0x0580) (#1766, #1788).
+	- USB: JMicron (0x152d:0xb567) (#1797).
+	- USB: Pinas (0x174e:0x1155, 0x1741:0x1156) (#1772, GH pull/253).
+	- USB: Verbatim (0x18a5:0x0446) (#1812).
+	- USB: Actions AM8180 (0x1de1:0xe101) (#1681).
+	- USB: Transcend ESD310 (0x2174:0x2100) (#1767).
+	- USB: KIOXIA (0x30de:0x1000).
+
 2024-03-25  Christian Franke  <franke@computer.org>
 
 	drivedb.h:
diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index a4a0597f9..4494b3f82 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -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
+    "",
+    "-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; ",
-- 
GitLab