From ffad784fc7b5b37b0d5625a5ebb440ea460cb0ea Mon Sep 17 00:00:00 2001
From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Mon, 10 Sep 2018 21:24:56 +0000
Subject: [PATCH] Merge r4760 r4765 r4766 into 5.41-6.6 drivedb.h branches.
git-svn-id: https://svn.code.sf.net/p/smartmontools/code/branches/RELEASE_6_0_DRIVEDB@4767 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
smartmontools/drivedb.h | 25 +++++++++++++++----------
smartmontools/drivedb.h.raw.asc | 14 +++++++-------
2 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index dafd3125d..a6abfe3da 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -6,14 +6,7 @@
* Copyright (C) 2003-11 Philip Williams, Bruce Allen
* Copyright (C) 2008-18 Christian Franke
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
/*
@@ -535,7 +528,8 @@ const drive_settings builtin_knowndrives[] = {
"KINGSTON SV310S3(7A|D7|N7A|B7A)960G|" // SSDNow V310
"PNY CS1311 (120|240|480|960)GB SSD|" // tested with PNY CS1311 120GB SSD/CS131122
"SSD Smartbuy (60|120|240)GB|" // SSD Smartbuy 240GB/SBFM91.1
- "KINGSTON SHSS3B?7A(120|240|480|960)G", // HyperX Savage
+ "KINGSTON SHSS3B?7A(120|240|480|960)G|" // HyperX Savage
+ "KINGSTON SA400S37(120|240|480|960)G", // Kingston A400 SSD/SBFKB1D1
"", "",
//"-v 1,raw48,Raw_Read_Error_Rate "
"-v 2,raw48,Not_In_Use "
@@ -3559,10 +3553,21 @@ const drive_settings builtin_knowndrives[] = {
// ST6000NM0004-1FT17Z/NN01
// ST4000NM0035-1V4107/TNC3
// ST1000NM0055-1V410C/TN02
+ // ST8000NM0055-1RM112/SN04
"ST([1234568]|10)000NM0[01][0-68][456]-.*", // *[069]4 = 4Kn
"", "",
"-v 188,raw16 -v 240,msec24hour32"
},
+ { "Seagate Enterprise Capacity 3.5 HDD", // V5.1, ms in attribute 9
+ "ST[12]000NM0008-.*", // tested with ST1000NM0008-2F2100/SN01
+ "", "",
+ "-v 9,msec24hour32 -v 188,raw16 -v 240,msec24hour32"
+ },
+ { "Seagate Exos X12 HDD", // tested with ST12000NM0007-2A1101/SN02
+ "ST12000NM00[01]7-.*", // *17 = SED
+ "", "",
+ "-v 240,msec24hour32"
+ },
// new models: ST8000VN0002, ST6000VN0021, ST4000VN000
// ST8000VN0012, ST6000VN0031, ST4000VN003
// tested with ST8000VN0002-1Z8112/ZA13YGNF
@@ -3912,7 +3917,7 @@ const drive_settings builtin_knowndrives[] = {
"", "", ""
},
{ "Western Digital VelociRaptor (AF)", // tested with WDC WD1000DHTZ-04N21V0/04.06A00
- "WDC WD(2500H|5000H|1000D)HTZ-.*",
+ "WDC WD(2500H|5000B|5000H|1000D)HTZ-.*",
"", "", ""
},
{ "Western Digital Scorpio EIDE",
diff --git a/smartmontools/drivedb.h.raw.asc b/smartmontools/drivedb.h.raw.asc
index 773112146..5e8657b9a 100644
--- a/smartmontools/drivedb.h.raw.asc
+++ b/smartmontools/drivedb.h.raw.asc
@@ -1,10 +1,10 @@
-----BEGIN PGP SIGNATURE-----
-iQEcBAABAgAGBQJbbfARAAoJEPOHY87f0iVZ7Z0IAIGVuTO1Njqf/QAcwqOM7xJD
-kremP7bjuB9baNjJhUg0AVoHPC4e0glsPuOddGbZXOFSInp37Vsu+mtiVeB+Ds2i
-LeIOqH1+/ifzyYBDySNsym1Z3ymWUbKFq9HeF4Q+9PxfJm6pdhZy7ZJLl3YHBCEy
-pJf5kW6DCbP//gUcahEg3w7t+vg4G/Ck3sVd8rD1KFNTwLOA4iwP3wcneWTERVFQ
-Ig5xqAYO6mdGBmkR7lM9rVug9rnnrtnjbnhWbBvp3l5NNdLRnMKrTTFrXFQReHZL
-8P7lgwXScWvnCnV2iQUQVHQpnM7mAMvCW5Z/pvMyxUX8YUZ9a0SrUd9qE/4eixY=
-=64Hd
+iQEcBAABAgAGBQJbluCVAAoJEPOHY87f0iVZbrIH/jEnuoJidHGpzAdBZqYqPaNR
+TTbICnIw+3V49ra4PHsqXx7/GOk/uSmz0+I1iiNnbuFNRWXSrB3BE5jlT8UeH505
+AgOrj+hK5b47lHOC2mby0TO/6V4TKUkbeeoqAEw4qb4FgTp1vEhkqE4IBEHp8IH9
+0/SBO2L8fBgW1bWIItOY5qrZRfzUwUpTn8oQgyboOagBbK0DLxBH/cuSJ6yppjps
+JuySKBbGxwoYQphx0ScWQnO4MhHUchSUg5v0LyNyo/aMVkYxwDi78a6gjWc0d9zf
+gR5wDiu9AOg6fRe3M677E6TgDRe+Oca0SUrD+LHCQ97a/xoo45UrE/y0uenbH0s=
+=Ud0k
-----END PGP SIGNATURE-----
--
GitLab