From 8ac95a13f1f2b3ab5032c44a2e38667ec05cf8f3 Mon Sep 17 00:00:00 2001 From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137> Date: Mon, 14 Dec 2015 21:04:09 +0000 Subject: [PATCH] Merge r4185 r4186 into 5.40-6.4 drivedb.h branches. git-svn-id: https://svn.code.sf.net/p/smartmontools/code/branches/RELEASE_6_0_DRIVEDB@4187 4ea69e1a-61f1-4043-bf83-b5c94c648137 --- smartmontools/drivedb.h | 43 +++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h index 1d1f81b5d..2150a3fe1 100644 --- a/smartmontools/drivedb.h +++ b/smartmontools/drivedb.h @@ -755,9 +755,10 @@ const drive_settings builtin_knowndrives[] = { "-v 242,raw48,Host_Reads_32MiB" }, { "Intel 320 Series SSDs", // tested with INTEL SSDSA2CT040G3/4PC10362, - // INTEL SSDSA2CW160G3/4PC10362, INTEL SSDSA2BT040G3/4PC10362, INTEL SSDSA2BW120G3A/4PC10362, - // INTEL SSDSA2BW300G3D/4PC10362, INTEL SSDSA2BW160G3L/4PC1LE04 - "INTEL SSDSA[12][BC][WT](040|080|120|160|300|600)G3[ADL]?", + // INTEL SSDSA2CW160G3/4PC10362, SSDSA2BT040G3/4PC10362, SSDSA2BW120G3A/4PC10362, + // INTEL SSDSA2BW300G3D/4PC10362, SSDSA2BW160G3L/4PC1LE04, SSDSA1NW160G3/4PC10362 + "INTEL SSDSA[12][BCN][WT](040|080|120|160|300|600)G3[ADL]?", + // 2B = 2.5" 7mm, 2C = 2.5" 9.5mm, 1N = 1.8" microSATA "", "", "-F nologdir " //"-v 3,raw16(avg16),Spin_Up_Time " @@ -871,9 +872,11 @@ const drive_settings builtin_knowndrives[] = { "-v 242,raw48,Host_Reads_32MiB " "-v 249,raw48,NAND_Writes_1GiB" }, - { "Intel 530 Series SSDs", // tested with INTEL SSDSC2BW180A4/DC12, SSDSC2BW240A4/DC12, - // INTEL SSDMCEAW120A4/DC33, INTEL SSDMCEAW240A4/DC33 - "INTEL SSD(MCEA|SC2B)W(080|120|180|240|360|480)A4", // MCEA = mSATA + { "Intel 53x and Pro 2500 Series SSDs", // SandForce SF-2281, tested with + // INTEL SSDSC2BW180A4/DC12, SSDSC2BW240A4/DC12, SSDMCEAW120A4/DC33 + // INTEL SSDMCEAW240A4/DC33, SSDSC2BF480A5/TG26, SSDSC2BW240H6/RG21 + "INTEL SSD(MCEA|SC2B|SCKJ)[WF](056|080|120|180|240|360|480)(A4|A5|H6)", + // SC2B = 2.5", MCEA = mSATA, SCKJ = M.2; A4 = 530, A5 = Pro 2500, H6 = 535 "", "", //"-v 5,raw16(raw16),Reallocated_Sector_Ct " "-v 9,msec24hour32,Power_On_Hours_and_Msec " @@ -915,9 +918,11 @@ const drive_settings builtin_knowndrives[] = { "-v 242,raw48,Host_Reads_32MiB " "-v 249,raw48,NAND_Writes_1GiB" }, - { "Intel 730 and DC S3500/S3700 Series SSDs", // tested with INTEL SSDSC2BP480G4, SSDSC2BB120G4/D2010355, - // INTEL SSDSC2BB800G4T, SSDSC2BA200G3/5DV10250 - "INTEL SSDSC(1N|2B)[ABP](080|100|120|160|200|240|300|400|480|600|800)G[34]T?", // A=S3700, B=S3500, P=730 + { "Intel 730 and DC S35x0/3610/3700 Series SSDs", // tested with INTEL SSDSC2BP480G4, SSDSC2BB120G4/D2010355, + // INTEL SSDSC2BB800G4T, SSDSC2BA200G3/5DV10250, SSDSC2BB080G6/G2010130, SSDSC2BX200G4/G2010110, + // INTEL SSDSC2BB016T6/G2010140, SSDSC2BX016T4/G2010140 + "INTEL SSDSC(1N|2B)[ABPX]((080|100|120|160|200|240|300|400|480|600|800)G[346]T?|(012|016)T[46])", + // A = S3700, B*4 = S3500, B*6 = S3510, P = 730, X = S3610 "", "", //"-v 3,raw16(avg16),Spin_Up_Time " //"-v 4,raw48,Start_Stop_Count " @@ -946,6 +951,7 @@ const drive_settings builtin_knowndrives[] = { "-v 234,raw24/raw32:04321,Thermal_Throttle " "-v 241,raw48,Host_Writes_32MiB " "-v 242,raw48,Host_Reads_32MiB " + "-v 243,raw48,NAND_Writes_32MiB " // S3510/3610 "-F xerrorlba" // tested with SSDSC2BB600G4/D2010355 }, { "Kingston branded X25-V SSDs", // fixed firmware @@ -3597,6 +3603,12 @@ const drive_settings builtin_knowndrives[] = { "", "-d sat" }, + { "USB: LaCie; ", + "0x059f:0x106f", + "", // 0x0001 + "", + "-d sat" + }, // In-System Design { "USB: ; In-System/Cypress ISD-300A1", "0x05ab:0x0060", @@ -3977,7 +3989,7 @@ const drive_settings builtin_knowndrives[] = { "-d usbcypress" }, { "USB: WD My Passport; ", - "0x1058:0x0(70[245a]|730|74[0128a]|7a8|8[123]0)", + "0x1058:0x0(70[245a]|71a|730|74[0128a]|7a8|8(10|16|20|30))", "", "", "-d sat" @@ -4064,8 +4076,8 @@ const drive_settings builtin_knowndrives[] = { "-d sat" }, { "USB: ; Initio", - "0x13fd:0x1640", - "", // 0x0864 + "0x13fd:0x16[45]0", + "", // 0x1640: 0x0864, 0x1650: 0x0436 "", "-d sat,12" // some SMART commands fail, see ticket #295 }, @@ -4411,6 +4423,13 @@ const drive_settings builtin_knowndrives[] = { "", "-d sat" }, + // 0xabcd (?) + { "USB: ; ", + "0xabcd:0x6103", // LogiLink AU0028A V1.0 USB 3.0 to IDE & SATA Adapter + "", + "", + "-d sat" + }, /* }; // builtin_knowndrives[] */ -- GitLab