# HG changeset patch # User moel.mich # Date 1329165279 0 # Node ID f580591971ce2f7314e0d7e7a8b22e8b07e5b621 # Parent 10283dd68bbbda89432115621c46a7edc0ccffbe Small correction to the Sandforce SSD detection to prevent Marvell controllers (M4, C300) from getting identified as Sandforce. diff -r 10283dd68bbb -r f580591971ce Hardware/HDD/DebugSmart.cs --- a/Hardware/HDD/DebugSmart.cs Fri Jan 20 17:19:42 2012 +0000 +++ b/Hardware/HDD/DebugSmart.cs Mon Feb 13 20:34:39 2012 +0000 @@ -241,7 +241,56 @@ 130 5B0300010002 1 9 59 FC3203030100 205 0 1 000000000000 0 0 - 144 000000000000 0 34 ") + 144 000000000000 0 34 "), + + new Drive("M4-CT256M4SSD2", "0309", 16, + @"01 000000000000 100 100 50 + 05 000000000000 100 100 10 + 09 AB0100000000 100 100 1 + 0C 6E0000000000 100 100 1 + AA 000000000000 100 100 10 + AB 000000000000 100 100 1 + AC 000000000000 100 100 1 + AD 060000000000 100 100 10 + AE 000000000000 100 100 1 + B5 79003D00B700 100 100 1 + B7 000000000000 100 100 1 + B8 000000000000 100 100 50 + BB 000000000000 100 100 1 + BC 000000000000 100 100 1 + BD 5B0000000000 100 100 1 + C2 000000000000 100 100 0 + C3 000000000000 100 100 1 + C4 000000000000 100 100 1 + C5 000000000000 100 100 1 + C6 000000000000 100 100 1 + C7 000000000000 100 100 1 + CA 000000000000 100 100 1 + CE 000000000000 100 100 1 "), + + new Drive("C300-CTFDDAC256MAG", "0007", 16, + @"01 000000000000 100 100 0 + 05 000000000000 100 100 0 + 09 4C0A00000000 100 100 0 + 0C 0F0100000000 100 100 0 + AA 000000000000 100 100 0 + AB 000000000000 100 100 0 + AC 000000000000 100 100 0 + AD 1B0000000000 100 100 0 + AE 000000000000 100 100 0 + B5 D30357012B05 100 100 0 + B7 000000000000 100 100 0 + B8 000000000000 100 100 0 + BB 000000000000 100 100 0 + BC 000000000000 100 100 0 + BD C60100000000 100 100 0 + C3 000000000000 100 100 0 + C4 000000000000 100 100 0 + C5 000000000000 100 100 0 + C6 000000000000 100 100 0 + C7 000000000000 100 100 0 + CA 000000000000 100 100 0 + CE 000000000000 100 100 0") }; public IntPtr OpenDrive(int driveNumber) { diff -r 10283dd68bbb -r f580591971ce Hardware/HDD/SSDSandforce.cs --- a/Hardware/HDD/SSDSandforce.cs Fri Jan 20 17:19:42 2012 +0000 +++ b/Hardware/HDD/SSDSandforce.cs Mon Feb 13 20:34:39 2012 +0000 @@ -39,7 +39,7 @@ namespace OpenHardwareMonitor.Hardware.HDD { using System.Collections.Generic; - [NamePrefix(""), RequireSmart(0xAB)] + [NamePrefix(""), RequireSmart(0xAB), RequireSmart(0xB1)] internal class SSDSandforce : AbstractHarddrive { private static readonly IEnumerable smartAttributes = diff -r 10283dd68bbb -r f580591971ce Properties/AssemblyVersion.cs --- a/Properties/AssemblyVersion.cs Fri Jan 20 17:19:42 2012 +0000 +++ b/Properties/AssemblyVersion.cs Mon Feb 13 20:34:39 2012 +0000 @@ -16,7 +16,7 @@ The Initial Developer of the Original Code is Michael Möller . - 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): @@ -37,5 +37,5 @@ using System.Reflection; -[assembly: AssemblyVersion("0.4.0.0")] -[assembly: AssemblyInformationalVersion("0.4.0 Beta")] \ No newline at end of file +[assembly: AssemblyVersion("0.4.0.1")] +[assembly: AssemblyInformationalVersion("0.4.0.1 Alpha")] \ No newline at end of file