mir/openhardwaremonitor
2
0
Fork 0
mirror of https://github.com/openhardwaremonitor/openhardwaremonitor synced 2025-08-31 14:25:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added the hard drive firmware version to the report. This could be important if the SMART attribute layout changes with firmware versions on some drives.

Browse Source
This commit is contained in:
Michael Möller
2012-01-01 10:14:42 +00:00
parent de089a3d28
commit a0b8e326eb
9 changed files with 65 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Hardware/HDD/WindowsSmart.cs
View File

@@ -16,7 +16,7 @@
The Initial Developer of the Original Code is
Michael Möller <m.moeller@gmx.ch>.
Portions created by the Initial Developer are Copyright (C) 2009-2011
Portions created by the Initial Developer are Copyright (C) 2009-2012
the Initial Developer. All Rights Reserved.
Contributor(s):
@@ -327,9 +327,20 @@ namespace OpenHardwareMonitor.Hardware.HDD {
out bytesReturned, IntPtr.Zero);
return (isValid) ? result.Thresholds : new DriveThresholdValue[0];
}
}
public string ReadName(IntPtr handle, int driveNumber) {
private string GetString(byte[] bytes) {
char[] chars = new char[bytes.Length];
for (int i = 0; i < bytes.Length; i += 2) {
chars[i] = (char)bytes[i + 1];
chars[i + 1] = (char)bytes[i];
}
return new string(chars).Trim(new char[] { ' ', '\0' });
}
public bool ReadNameAndFirmwareRevision(IntPtr handle, int driveNumber,
out string name, out string firmwareRevision)
{
DriveCommandParameter parameter = new DriveCommandParameter();
DriveIdentifyResult result;
uint bytesReturned;
@@ -342,19 +353,15 @@ namespace OpenHardwareMonitor.Hardware.HDD {
out result, Marshal.SizeOf(typeof(DriveIdentifyResult)),
out bytesReturned, IntPtr.Zero);
if (!valid)
return null;
else {
byte[] bytes = result.Identify.ModelNumber;
char[] chars = new char[bytes.Length];
for (int i = 0; i < bytes.Length; i += 2) {
chars[i] = (char)bytes[i + 1];
chars[i + 1] = (char)bytes[i];
}
return new string(chars).Trim(new char[] {' ', '\0'});
if (!valid) {
name = null;
firmwareRevision = null;
return false;
}
name = GetString(result.Identify.ModelNumber);
firmwareRevision = GetString(result.Identify.FirmwareRevision);
return true;
}
public void CloseHandle(IntPtr handle) {