From a85b2217777e7fa3f2a0849e60f9ad0d73271c27 Mon Sep 17 00:00:00 2001
From: knan <knan@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Wed, 7 May 2003 13:52:58 +0000
Subject: [PATCH] Added an old Fujitsu to knowndrives
git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@735 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
sm5/CHANGELOG | 4 +++-
sm5/knowndrives.c | 22 ++++++++++++++--------
sm5/knowndrives.cpp | 22 ++++++++++++++--------
3 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG
index 41582607a..377356d76 100644
--- a/sm5/CHANGELOG
+++ b/sm5/CHANGELOG
@@ -1,6 +1,6 @@
CHANGELOG for smartmontools
-$Id: CHANGELOG,v 1.139 2003/05/06 22:58:01 guidog Exp $
+$Id: CHANGELOG,v 1.140 2003/05/07 13:52:58 knan Exp $
Copyright (C) 2002-3 Bruce Allen <smartmontools-support@lists.sourceforge.net>
@@ -37,6 +37,8 @@ CURRENT DEVELOPMENT VERSION (see VERSION file in this directory):
<ADDITIONS TO THE CHANGE LOG SHOULD BE ADDED HERE, PLEASE>
+ [EB] Add another Fujitsu disk to knowndrives.c
+
[GG] match for scsi/ and ide/ in case of devfs to exclude false postives
[BA] If SCSI device listed in /etc/smartd.conf fails to open or do
diff --git a/sm5/knowndrives.c b/sm5/knowndrives.c
index 84698b1a9..ddc6bce91 100644
--- a/sm5/knowndrives.c
+++ b/sm5/knowndrives.c
@@ -24,7 +24,7 @@
#include "knowndrives.h"
#include "utility.h"
-const char *knowndrives_c_cvsid="$Id: knowndrives.c,v 1.21 2003/04/22 03:13:43 ballen4705 Exp $" ATACMDS_H_CVSID ATAPRINT_H_CVSID KNOWNDRIVES_H_CVSID UTILITY_H_CVSID;
+const char *knowndrives_c_cvsid="$Id: knowndrives.c,v 1.22 2003/05/07 13:52:58 knan Exp $" ATACMDS_H_CVSID ATAPRINT_H_CVSID KNOWNDRIVES_H_CVSID UTILITY_H_CVSID;
#define MODEL_STRING_LENGTH 40
#define FIRMWARE_STRING_LENGTH 8
@@ -43,11 +43,15 @@ const char *knowndrives_c_cvsid="$Id: knowndrives.c,v 1.21 2003/04/22 03:13:43 b
/* Arrays of preset vendor-specific attribute options for use in
* knowndrives[]. */
-// This one is common to several models.
+// These two are common to several models.
const unsigned char vendoropts_9_minutes[][2] = {
PRESET_9_MINUTES,
{0,0}
};
+const unsigned char vendoropts_9_seconds[][2] = {
+ PRESET_9_SECONDS,
+ {0,0}
+};
const unsigned char vendoropts_Maxtor_4D080H4[][2] = {
PRESET_9_MINUTES,
@@ -55,11 +59,6 @@ const unsigned char vendoropts_Maxtor_4D080H4[][2] = {
{0,0}
};
-const unsigned char vendoropts_Fujitsu_MPE3204AT[][2] = {
- PRESET_9_SECONDS,
- {0,0}
-};
-
const unsigned char vendoropts_Fujitsu_MHS2020AT[][2] = {
PRESET_200_WRITEERRORCOUNT,
{0,0}
@@ -111,7 +110,14 @@ const drivesettings knowndrives[] = {
"^FUJITSU MPE3204AT$",
".*", // Tested on ED-03-04
NULL,
- vendoropts_Fujitsu_MPE3204AT,
+ vendoropts_9_seconds,
+ NULL, NULL
+ },
+ { // Fujitsu MPD3130AT
+ "^FUJITSU MPD3130AT$",
+ ".*", // Tested on DD-04-47
+ NULL,
+ vendoropts_9_seconds,
NULL, NULL
},
{ // Fujitsu MHS2020AT
diff --git a/sm5/knowndrives.cpp b/sm5/knowndrives.cpp
index 3375167e1..519ab4c1b 100644
--- a/sm5/knowndrives.cpp
+++ b/sm5/knowndrives.cpp
@@ -24,7 +24,7 @@
#include "knowndrives.h"
#include "utility.h"
-const char *knowndrives_c_cvsid="$Id: knowndrives.cpp,v 1.21 2003/04/22 03:13:43 ballen4705 Exp $" ATACMDS_H_CVSID ATAPRINT_H_CVSID KNOWNDRIVES_H_CVSID UTILITY_H_CVSID;
+const char *knowndrives_c_cvsid="$Id: knowndrives.cpp,v 1.22 2003/05/07 13:52:58 knan Exp $" ATACMDS_H_CVSID ATAPRINT_H_CVSID KNOWNDRIVES_H_CVSID UTILITY_H_CVSID;
#define MODEL_STRING_LENGTH 40
#define FIRMWARE_STRING_LENGTH 8
@@ -43,11 +43,15 @@ const char *knowndrives_c_cvsid="$Id: knowndrives.cpp,v 1.21 2003/04/22 03:13:43
/* Arrays of preset vendor-specific attribute options for use in
* knowndrives[]. */
-// This one is common to several models.
+// These two are common to several models.
const unsigned char vendoropts_9_minutes[][2] = {
PRESET_9_MINUTES,
{0,0}
};
+const unsigned char vendoropts_9_seconds[][2] = {
+ PRESET_9_SECONDS,
+ {0,0}
+};
const unsigned char vendoropts_Maxtor_4D080H4[][2] = {
PRESET_9_MINUTES,
@@ -55,11 +59,6 @@ const unsigned char vendoropts_Maxtor_4D080H4[][2] = {
{0,0}
};
-const unsigned char vendoropts_Fujitsu_MPE3204AT[][2] = {
- PRESET_9_SECONDS,
- {0,0}
-};
-
const unsigned char vendoropts_Fujitsu_MHS2020AT[][2] = {
PRESET_200_WRITEERRORCOUNT,
{0,0}
@@ -111,7 +110,14 @@ const drivesettings knowndrives[] = {
"^FUJITSU MPE3204AT$",
".*", // Tested on ED-03-04
NULL,
- vendoropts_Fujitsu_MPE3204AT,
+ vendoropts_9_seconds,
+ NULL, NULL
+ },
+ { // Fujitsu MPD3130AT
+ "^FUJITSU MPD3130AT$",
+ ".*", // Tested on DD-04-47
+ NULL,
+ vendoropts_9_seconds,
NULL, NULL
},
{ // Fujitsu MHS2020AT
--
GitLab