From a7f27e22ddd8d74d3a0ca68678ff1e2f00d28d2c Mon Sep 17 00:00:00 2001
From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Sun, 25 Jan 2009 18:43:01 +0000
Subject: [PATCH] Windows: Fix return value of scsi_pass_through().
git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@2715 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
sm5/CHANGELOG | 6 +++++-
sm5/os_win32.cpp | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG
index d5720aac6..a79abcc60 100644
--- a/sm5/CHANGELOG
+++ b/sm5/CHANGELOG
@@ -1,6 +1,6 @@
CHANGELOG for smartmontools
-$Id: CHANGELOG,v 1.763 2009/01/21 22:33:00 manfred99 Exp $
+$Id: CHANGELOG,v 1.764 2009/01/25 18:43:01 chrfranke Exp $
The most recent version of this file is:
http://smartmontools.cvs.sourceforge.net/smartmontools/sm5/CHANGELOG?view=markup
@@ -41,6 +41,10 @@ NOTES FOR FUTURE RELEASES: see TODO file.
<DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
+ [CF] Windows: Fix return value of scsi_pass_through(). Regression
+ was introduced during migration to new interface. SAT over USB
+ now works on XP (both '-d sat,12' and '-d sat,16').
+
[MS] knowndrives.cpp updates:
- Added Western Digital RE2-GP family
- Added Hitachi Travelstar E5K160 family
diff --git a/sm5/os_win32.cpp b/sm5/os_win32.cpp
index acaaf8ce0..2c2ed93f6 100644
--- a/sm5/os_win32.cpp
+++ b/sm5/os_win32.cpp
@@ -48,7 +48,7 @@ extern smartmonctrl * con; // con->permissive,reportataioctl
// Needed by '-V' option (CVS versioning) of smartd/smartctl
-const char *os_XXXX_c_cvsid="$Id: os_win32.cpp,v 1.69 2008/09/12 18:46:38 chrfranke Exp $"
+const char *os_XXXX_c_cvsid="$Id: os_win32.cpp,v 1.70 2009/01/25 18:43:01 chrfranke Exp $"
ATACMDS_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
@@ -3404,7 +3404,7 @@ bool win_scsi_device::scsi_pass_through(struct scsi_cmnd_io * iop)
(trunc ? " [only first 256 bytes shown]" : ""));
dStrHex(iop->dxferp, (trunc ? 256 : iop->dxfer_len) , 1);
}
- return 0;
+ return true;
}
--
GitLab