From 0606ab72b7c397fdfc70ba7820a3cacb9e98f54a Mon Sep 17 00:00:00 2001
From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Sun, 8 Feb 2015 14:39:10 +0000
Subject: [PATCH] Merge r4038 into 5.40-6.3 drivedb.h branches.

git-svn-id: https://svn.code.sf.net/p/smartmontools/code/branches/RELEASE_6_0_DRIVEDB@4039 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
 smartmontools/drivedb.h | 78 +++++++++++++++++++++++++++++++++--------
 1 file changed, 63 insertions(+), 15 deletions(-)

diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index c7c46f3b0..acaa8f805 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -3043,6 +3043,12 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
+  { "USB: Buffalo Drivestation Duo; ",
+    "0x0411:0x01ce",
+    "",
+    "",
+    "-d sat"
+  },
   { "USB: Buffalo MiniStation Stealth HD-PCTU2; ",
     "0x0411:0x01d9",
     "", // 0x0108
@@ -3076,6 +3082,12 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
+  { "USB: Toshiba Canvio Basics; ", // TOSHIBA MQ01UBD...
+    "0x0480:0x0201",
+    "",
+    "",
+    "-d sat"
+  },
   { "USB: Toshiba Canvio 500GB; SunPlus",
     "0x0480:0xa004",
     "",
@@ -3083,19 +3095,19 @@ const drive_settings builtin_knowndrives[] = {
     "-d usbsunplus"
   },
   { "USB: Toshiba Canvio Basics; ",
-    "0x0480:0xa006",
-    "", // 0x0001
+    "0x0480:0xa00[6d]",
+    "", // 0x0001, 0x0407
     "",
     "-d sat"
   },
-  { "USB: Toshiba Canvio 3.0 Portable Hard Drive; ", // 1TB
+  { "USB: Toshiba Canvio 3.0 Portable Hard Drive; ", // TOSHIBA MQ01UBD...
     "0x0480:0xa007",
     "", // 0x0001
     "",
     "-d sat"
   },
-  { "USB: Toshiba Stor.E Basics; ", // 1TB
-    "0x0480:0xa009",
+  { "USB: Toshiba Stor.E Basics; ",
+    "0x0480:0xa00[9c]",
     "",
     "",
     "-d sat"
@@ -3106,8 +3118,14 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
-  { "USB: Toshiba Canvio Desktop; ", // 2TB
-    "0x0480:0xd010",
+  { "USB: Toshiba Canvio ALU; ", // 2TB USB 3.0
+    "0x0480:0xa100",
+    "",
+    "",
+    "-d sat"
+  },
+  { "USB: Toshiba Canvio Desktop; ",
+    "0x0480:0xd0(00|10)",
     "",
     "",
     "-d sat"
@@ -3148,7 +3166,7 @@ const drive_settings builtin_knowndrives[] = {
   },
   // Samsung
   { "USB: Samsung S2 Portable; JMicron",
-    "0x04e8:0x1f0[568]",
+    "0x04e8:0x1f0[568a]", // 0x1f0a: SAMSUNG HN-M101XBB
     "",
     "",
     "-d usbjmicron"
@@ -3201,6 +3219,12 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
+  { "USB: Samsung S3 Portable; ",
+    "0x04e8:0x61c8", // ST1000LM025 HN-M101ABB
+    "", // 0x1301
+    "",
+    "-d sat"
+  },
   // Sunplus
   { "USB: ; SunPlus",
     "0x04fc:0x0c05",
@@ -3276,6 +3300,12 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d usbjmicron"
   },
+  { "USB: LaCie Rugged Triple Interface; ",
+    "0x059f:0x100c",
+    "", // 0x0001
+    "",
+    "-d sat"
+  },
   { "USB: LaCie hard disk (Neil Poulton design);",
     "0x059f:0x1018",
     "",
@@ -3818,6 +3848,12 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
+  { "USB: ; Initio", // Seagate Expansion Portable SRD00F1
+    "0x13fd:0x3910",
+    "", // 0x0100
+    "",
+    "-d sat"
+  },
   // Super Top
   { "USB: Super Top generic enclosure; Cypress",
     "0x14cd:0x6116",
@@ -3924,7 +3960,19 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
-  { "USB: ; ASMedia USB 3.0", // MEDION HDDrive-n-GO, LaCie Rikiki USB 3.0,
+  { "USB: ; ASMedia AS2105", // Icy Box IB-AC603A-U3
+    "0x174c:0x5136",
+    "", // 0x0001
+    "",
+    "-d sat"
+  },
+  { "USB: ; ASMedia", // Vantec NexStar USB 3.0 & SATA dual drive doch
+    "0x174c:0x5516",
+    "",
+    "",
+    "-d sat"
+  },
+  { "USB: ; ASMedia", // MEDION HDDrive-n-GO, LaCie Rikiki USB 3.0,
       // Silicon Power Armor A80 (ticket #237)
       // reported as unsupported: BYTECC T-200U3, Kingwin USB 3.0 docking station
     "0x174c:0x55aa",
@@ -3932,12 +3980,6 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
-  { "USB: ; ASMedia AS2105", // Icy Box IB-AC603A-U3
-    "0x174c:0x5136",
-    "", // 0x0001
-    "",
-    "-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
@@ -4010,6 +4052,12 @@ const drive_settings builtin_knowndrives[] = {
     "-d sat"
   },
   // Innostor
+  { "USB: ; Innostor IS611", // USB3->SATA+PATA
+    "0x1f75:0x0611", // SMART access via PATA does not work
+    "",
+    "",
+    "-d sat"
+  },
   { "USB: ; Innostor IS621", // USB3->SATA
     "0x1f75:0x0621", // Dynex 2.5" USB 3.0 Exclosure DX-HD302513
     "",
-- 
GitLab