From b24a50b27fbf2766c1985f65427927535a87263d Mon Sep 17 00:00:00 2001
From: pjwilliams <pjwilliams@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Sat, 24 Apr 2004 16:43:49 +0000
Subject: [PATCH] Added TOSHIBA MK4018GAS and the following Maxtor drive
families to knowndrives table: DiamondMax D540X-4G, Fireball 541DX,
DiamondMax 3400 Ultra ATA, DiamondMax Plus 6800 Ultra ATA 66.
Added missing Maxtor DiamondMax 16, DiamondMax D540X-4K, and
DiamondMax Plus 45 Ulta ATA 100 drives to knowndrives table.
git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@1684 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
sm5/CHANGELOG | 9 ++++++-
sm5/knowndrives.c | 59 ++++++++++++++++++++++++++++++++++-----------
sm5/knowndrives.cpp | 59 ++++++++++++++++++++++++++++++++++-----------
3 files changed, 98 insertions(+), 29 deletions(-)
diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG
index 01264a239..cafb0886b 100644
--- a/sm5/CHANGELOG
+++ b/sm5/CHANGELOG
@@ -1,6 +1,6 @@
CHANGELOG for smartmontools
-$Id: CHANGELOG,v 1.402 2004/04/18 22:54:49 pjwilliams Exp $
+$Id: CHANGELOG,v 1.403 2004/04/24 16:43:48 pjwilliams Exp $
The most recent version of this file is:
http://cvs.sourceforge.net/viewcvs.py/smartmontools/sm5/CHANGELOG?sortby=date&view=markup
@@ -27,6 +27,13 @@ NOTES FOR FUTURE RELEASES: see TODO file.
<ADDITIONS TO THE CHANGE LOG SHOULD BE ADDED JUST BELOW HERE, PLEASE>
+ [PW] Added TOSHIBA MK4018GAS and the following Maxtor drive families
+ to knowndrives table: DiamondMax D540X-4G, Fireball 541DX,
+ DiamondMax 3400 Ultra ATA, DiamondMax Plus 6800 Ultra ATA 66.
+
+ [PW] Added missing Maxtor DiamondMax 16, DiamondMax D540X-4K, and
+ DiamondMax Plus 45 Ulta ATA 100 drives to knowndrives table.
+
[PW] Added ExcelStor J240, Hitachi Travelstar 80GN family, Fujitsu
MHTxxxxAT family, and IBM Deskstar 25GP and 22GXP families to
knowndrives table.
diff --git a/sm5/knowndrives.c b/sm5/knowndrives.c
index 3ff0148f8..f47fa03b9 100644
--- a/sm5/knowndrives.c
+++ b/sm5/knowndrives.c
@@ -26,7 +26,7 @@
#include "utility.h" // includes <regex.h>
#include "config.h"
-const char *knowndrives_c_cvsid="$Id: knowndrives.c,v 1.103 2004/04/18 22:54:50 pjwilliams Exp $"
+const char *knowndrives_c_cvsid="$Id: knowndrives.c,v 1.104 2004/04/24 16:43:49 pjwilliams Exp $"
ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID KNOWNDRIVES_H_CVSID UTILITY_H_CVSID;
#define MODEL_STRING_LENGTH 40
@@ -319,32 +319,51 @@ const drivesettings knowndrives[] = {
may_need_minus_F_enabled,
NULL, NULL, NULL
},
- { // Maxtor DiamondMax Plus D740X family
- "^MAXTOR 6L0(20[JL]1|40[JL]2|60[JL]3|80[JL]4)$",
+ { // Maxtor Fireball 541DX family
+ "^Maxtor 2B0(0[468]|1[05]|20)H1$",
+ ".*",
+ NULL,
+ vendoropts_Maxtor_4D080H4,
+ NULL, NULL
+ },
+ { // Maxtor DiamondMax 3400 Ultra ATA family
+ "^Maxtor 9(1(360|350|202)D8|1190D7|10[12]0D6|0840D5|06[48]0D4|0510D3|1(350|202)E8)|1010E6|0840E5|0640E4)$",
+ ".*",
+ NULL,
+ vendoropts_9_minutes,
+ NULL, NULL
+ },
+ { // Maxtor DiamondMax D540X-4G family
+ "^Maxtor 4G(120J6|160J[68])$",
".*",
NULL, NULL, NULL, NULL
},
- { // Maxtor 4K080H4
- "^MAXTOR 4K080H4$",
+ { // Maxtor DiamondMax D540X-4K family
+ "^MAXTOR 4K(020H1|040H2|060H3|080H4)$",
".*",
NULL, NULL, NULL, NULL
},
- { // Maxtor 4D080H4
- "^Maxtor (4D080H4|4G120J6)$",
+ { // Maxtor DiamondMax Plus D740X family
+ "^MAXTOR 6L0(20[JL]1|40[JL]2|60[JL]3|80[JL]4)$",
+ ".*",
+ NULL, NULL, NULL, NULL
+ },
+ { // Maxtor DiamondMax Plus 6800 Ultra ATA 66 family
+ "^Maxtor 9(2732U8|2390U7|2049U6|1707U5|1366U4|1024U3|0845U3|0683U2)$",
".*",
NULL,
- vendoropts_Maxtor_4D080H4,
+ vendoropts_9_minutes,
NULL, NULL
},
- { // Maxtor 4R060L0, 4R080J0 and 4R080L0 (4R060J0 not tested)
- "^Maxtor 4R0[68]0[JL]0$",
+ { // Maxtor 4D080H4
+ "^Maxtor (4D080H4|4G120J6)$",
".*",
NULL,
- vendoropts_9_minutes,
+ vendoropts_Maxtor_4D080H4,
NULL, NULL
},
- { // Maxtor 54610H6
- "^Maxtor 54610H6$",
+ { // Maxtor DiamondMax 16 family
+ "^Maxtor 4(R0[68]0[JL]|R1[26]0L|A160J)0$",
".*",
NULL,
vendoropts_9_minutes,
@@ -385,6 +404,13 @@ const drivesettings knowndrives[] = {
vendoropts_9_minutes,
NULL, NULL
},
+ { // Maxtor DiamondMax Plus 45 Ulta ATA 100 family
+ "^Maxtor 5(4610H6|4098H6|3073H4|2049H3|1536H2|1369H2|1023H2)$",
+ ".*",
+ NULL,
+ vendoropts_9_minutes,
+ NULL, NULL
+ },
{ // Maxtor DiamondMax Plus 60 family
"^Maxtor 5T0(60H6|40H4|30H3|20H2|10H1)$",
".*",
@@ -449,7 +475,7 @@ const drivesettings knowndrives[] = {
{ // IBM Deskstar 25GP and 22GXP family
"^IBM-DJNA-3(5(101|152|203|250)|7(091|135|180|220))0$",
".*",
- NULL, NULL, NULL, NULL
+ NULL, NULL, NULL, NULL
},
{ // IBM Travelstar 25GS, 18GT, and 12GN family
"^IBM-DARA-2(25|18|15|12|09|06)000$",
@@ -521,6 +547,11 @@ const drivesettings knowndrives[] = {
".*",
NULL, NULL, NULL, NULL
},
+ { // TOSHIBA MK4018GAS
+ "^TOSHIBA MK4018GAS$",
+ ".*",
+ NULL, NULL, NULL, NULL
+ },
{ // Seagate Medalist 8641 family
"^ST3(2110|3221|4312|6531|8641)A$",
".*",
diff --git a/sm5/knowndrives.cpp b/sm5/knowndrives.cpp
index 3698ab089..7fd206aed 100644
--- a/sm5/knowndrives.cpp
+++ b/sm5/knowndrives.cpp
@@ -26,7 +26,7 @@
#include "utility.h" // includes <regex.h>
#include "config.h"
-const char *knowndrives_c_cvsid="$Id: knowndrives.cpp,v 1.103 2004/04/18 22:54:50 pjwilliams Exp $"
+const char *knowndrives_c_cvsid="$Id: knowndrives.cpp,v 1.104 2004/04/24 16:43:49 pjwilliams Exp $"
ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID KNOWNDRIVES_H_CVSID UTILITY_H_CVSID;
#define MODEL_STRING_LENGTH 40
@@ -319,32 +319,51 @@ const drivesettings knowndrives[] = {
may_need_minus_F_enabled,
NULL, NULL, NULL
},
- { // Maxtor DiamondMax Plus D740X family
- "^MAXTOR 6L0(20[JL]1|40[JL]2|60[JL]3|80[JL]4)$",
+ { // Maxtor Fireball 541DX family
+ "^Maxtor 2B0(0[468]|1[05]|20)H1$",
+ ".*",
+ NULL,
+ vendoropts_Maxtor_4D080H4,
+ NULL, NULL
+ },
+ { // Maxtor DiamondMax 3400 Ultra ATA family
+ "^Maxtor 9(1(360|350|202)D8|1190D7|10[12]0D6|0840D5|06[48]0D4|0510D3|1(350|202)E8)|1010E6|0840E5|0640E4)$",
+ ".*",
+ NULL,
+ vendoropts_9_minutes,
+ NULL, NULL
+ },
+ { // Maxtor DiamondMax D540X-4G family
+ "^Maxtor 4G(120J6|160J[68])$",
".*",
NULL, NULL, NULL, NULL
},
- { // Maxtor 4K080H4
- "^MAXTOR 4K080H4$",
+ { // Maxtor DiamondMax D540X-4K family
+ "^MAXTOR 4K(020H1|040H2|060H3|080H4)$",
".*",
NULL, NULL, NULL, NULL
},
- { // Maxtor 4D080H4
- "^Maxtor (4D080H4|4G120J6)$",
+ { // Maxtor DiamondMax Plus D740X family
+ "^MAXTOR 6L0(20[JL]1|40[JL]2|60[JL]3|80[JL]4)$",
+ ".*",
+ NULL, NULL, NULL, NULL
+ },
+ { // Maxtor DiamondMax Plus 6800 Ultra ATA 66 family
+ "^Maxtor 9(2732U8|2390U7|2049U6|1707U5|1366U4|1024U3|0845U3|0683U2)$",
".*",
NULL,
- vendoropts_Maxtor_4D080H4,
+ vendoropts_9_minutes,
NULL, NULL
},
- { // Maxtor 4R060L0, 4R080J0 and 4R080L0 (4R060J0 not tested)
- "^Maxtor 4R0[68]0[JL]0$",
+ { // Maxtor 4D080H4
+ "^Maxtor (4D080H4|4G120J6)$",
".*",
NULL,
- vendoropts_9_minutes,
+ vendoropts_Maxtor_4D080H4,
NULL, NULL
},
- { // Maxtor 54610H6
- "^Maxtor 54610H6$",
+ { // Maxtor DiamondMax 16 family
+ "^Maxtor 4(R0[68]0[JL]|R1[26]0L|A160J)0$",
".*",
NULL,
vendoropts_9_minutes,
@@ -385,6 +404,13 @@ const drivesettings knowndrives[] = {
vendoropts_9_minutes,
NULL, NULL
},
+ { // Maxtor DiamondMax Plus 45 Ulta ATA 100 family
+ "^Maxtor 5(4610H6|4098H6|3073H4|2049H3|1536H2|1369H2|1023H2)$",
+ ".*",
+ NULL,
+ vendoropts_9_minutes,
+ NULL, NULL
+ },
{ // Maxtor DiamondMax Plus 60 family
"^Maxtor 5T0(60H6|40H4|30H3|20H2|10H1)$",
".*",
@@ -449,7 +475,7 @@ const drivesettings knowndrives[] = {
{ // IBM Deskstar 25GP and 22GXP family
"^IBM-DJNA-3(5(101|152|203|250)|7(091|135|180|220))0$",
".*",
- NULL, NULL, NULL, NULL
+ NULL, NULL, NULL, NULL
},
{ // IBM Travelstar 25GS, 18GT, and 12GN family
"^IBM-DARA-2(25|18|15|12|09|06)000$",
@@ -521,6 +547,11 @@ const drivesettings knowndrives[] = {
".*",
NULL, NULL, NULL, NULL
},
+ { // TOSHIBA MK4018GAS
+ "^TOSHIBA MK4018GAS$",
+ ".*",
+ NULL, NULL, NULL, NULL
+ },
{ // Seagate Medalist 8641 family
"^ST3(2110|3221|4312|6531|8641)A$",
".*",
--
GitLab