From ed43d05c7ce4253a5f113a10f7d4a3c4490a7477 Mon Sep 17 00:00:00 2001 From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137> Date: Mon, 23 Feb 2004 15:25:39 +0000 Subject: [PATCH] Win32 port: long long replaced by int64_t. Maxtor 4R060[LJ]0, 54610H6 added. git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/branches/unlabeled-1.58.2@1501 4ea69e1a-61f1-4043-bf83-b5c94c648137 --- sm5/knowndrives.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sm5/knowndrives.cpp b/sm5/knowndrives.cpp index 406ee9dcf..9f09d604c 100644 --- a/sm5/knowndrives.cpp +++ b/sm5/knowndrives.cpp @@ -27,7 +27,7 @@ #include "utility.h" #include "config.h" -const char *knowndrives_c_cvsid="$Id: knowndrives.cpp,v 1.58 2003/11/26 20:41:56 pjwilliams Exp $" +const char *knowndrives_c_cvsid="$Id: knowndrives.cpp,v 1.58.2.1 2004/02/23 15:25:39 chrfranke Exp $" ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID KNOWNDRIVES_H_CVSID UTILITY_H_CVSID; #define MODEL_STRING_LENGTH 40 @@ -51,7 +51,7 @@ const char *knowndrives_c_cvsid="$Id: knowndrives.cpp,v 1.58 2003/11/26 20:41:56 /* Arrays of preset vendor-specific attribute options for use in * knowndrives[]. */ -extern long long bytes; +extern int64_t bytes; // to hold onto exit code for atexit routine extern int exitstatus; @@ -280,8 +280,8 @@ const drivesettings knowndrives[] = { vendoropts_Maxtor_4D080H4, NULL, NULL }, - { // Maxtor 4R080J0 and 4R080L0 - "^Maxtor 4R080[JL]0$", + { // Maxtor 4R060L0, 4R080J0 and 4R080L0 (4R060J0 not tested) + "^Maxtor 4R0[68]0[JL]0$", ".*", NULL, vendoropts_9_minutes, @@ -294,6 +294,13 @@ const drivesettings knowndrives[] = { vendoropts_9_minutes, NULL, NULL }, + { // Maxtor 54610H6 + "^Maxtor 54610H6$", + ".*", + NULL, + vendoropts_9_minutes, + NULL, NULL + }, { // Maxtor DiamondMax VL 30 family "^Maxtor (33073U4|32049U3|31536U2|30768U1)$", ".*", -- GitLab