From 5cd04c84861daae3d25e22a56d1fced4d0ceb19e Mon Sep 17 00:00:00 2001
From: likewise <likewise@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Fri, 13 Aug 2004 00:04:39 +0000
Subject: [PATCH] Added SMART support for Marvell's SATA controllers. See
Request ID 1008374.
git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/branches/unlabeled-1.76.2@1853 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
sm5/smartctl.cpp | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/sm5/smartctl.cpp b/sm5/smartctl.cpp
index 5135ad04a..ddc22b324 100644
--- a/sm5/smartctl.cpp
+++ b/sm5/smartctl.cpp
@@ -44,7 +44,7 @@
#include "utility.h"
extern const char *atacmds_c_cvsid, *ataprint_c_cvsid, *knowndrives_c_cvsid, *scsicmds_c_cvsid, *scsiprint_c_cvsid, *utility_c_cvsid;
-const char* smartctl_c_cvsid="$Id: smartctl.cpp,v 1.76 2003/05/01 08:51:46 dpgilbert Exp $"
+const char* smartctl_c_cvsid="$Id: smartctl.cpp,v 1.76.2.1 2004/08/13 00:04:38 likewise Exp $"
ATACMDS_H_CVSID ATAPRINT_H_CVSID EXTERN_H_CVSID KNOWNDRIVES_H_CVSID SCSICMDS_H_CVSID SCSIPRINT_H_CVSID SMARTCTL_H_CVSID UTILITY_H_CVSID;
// This is a block containing all the "control variables". We declare
@@ -701,9 +701,18 @@ int main (int argc, char **argv){
// now call appropriate ATA or SCSI routine
if (tryata)
+ {
retval = ataPrintMain(fd);
+ }
else if (tryscsi)
- retval = scsiPrintMain(device, fd);
+ {
+ con->ismvsata = 0;
+ retval = scsiPrintMain(device, fd);
+ if (con->ismvsata)
+ {
+ retval = ataPrintMain(fd);
+ }
+ }
else {
pout("Smartctl: specify if this is an ATA or SCSI device with the -d option.\n");
Usage();
--
GitLab