Small correction to the Sandforce SSD detection to prevent Marvell controllers (M4, C300) from getting identified as Sandforce.
authormoel.mich
Mon, 13 Feb 2012 20:34:39 +0000
changeset 338f580591971ce
parent 337 10283dd68bbb
child 339 07a6126a4796
Small correction to the Sandforce SSD detection to prevent Marvell controllers (M4, C300) from getting identified as Sandforce.
Hardware/HDD/DebugSmart.cs
Hardware/HDD/SSDSandforce.cs
Properties/AssemblyVersion.cs
     1.1 --- a/Hardware/HDD/DebugSmart.cs	Fri Jan 20 17:19:42 2012 +0000
     1.2 +++ b/Hardware/HDD/DebugSmart.cs	Mon Feb 13 20:34:39 2012 +0000
     1.3 @@ -241,7 +241,56 @@
     1.4            130 5B0300010002 1   9           
     1.5            59  FC3203030100 205 0           
     1.6            1   000000000000 0   0           
     1.7 -          144 000000000000 0   34 ")
     1.8 +          144 000000000000 0   34 "),
     1.9 +
    1.10 +        new Drive("M4-CT256M4SSD2", "0309", 16, 
    1.11 +          @"01 000000000000 100 100 50     
    1.12 +            05 000000000000 100 100 10     
    1.13 +            09 AB0100000000 100 100 1      
    1.14 +            0C 6E0000000000 100 100 1      
    1.15 +            AA 000000000000 100 100 10     
    1.16 +            AB 000000000000 100 100 1      
    1.17 +            AC 000000000000 100 100 1      
    1.18 +            AD 060000000000 100 100 10     
    1.19 +            AE 000000000000 100 100 1      
    1.20 +            B5 79003D00B700 100 100 1      
    1.21 +            B7 000000000000 100 100 1      
    1.22 +            B8 000000000000 100 100 50     
    1.23 +            BB 000000000000 100 100 1      
    1.24 +            BC 000000000000 100 100 1      
    1.25 +            BD 5B0000000000 100 100 1      
    1.26 +            C2 000000000000 100 100 0      
    1.27 +            C3 000000000000 100 100 1      
    1.28 +            C4 000000000000 100 100 1      
    1.29 +            C5 000000000000 100 100 1      
    1.30 +            C6 000000000000 100 100 1      
    1.31 +            C7 000000000000 100 100 1      
    1.32 +            CA 000000000000 100 100 1      
    1.33 +            CE 000000000000 100 100 1 "),
    1.34 +
    1.35 +        new Drive("C300-CTFDDAC256MAG", "0007", 16, 
    1.36 +          @"01 000000000000 100 100 0  
    1.37 +            05 000000000000 100 100 0  
    1.38 +            09 4C0A00000000 100 100 0  
    1.39 +            0C 0F0100000000 100 100 0  
    1.40 +            AA 000000000000 100 100 0  
    1.41 +            AB 000000000000 100 100 0  
    1.42 +            AC 000000000000 100 100 0  
    1.43 +            AD 1B0000000000 100 100 0  
    1.44 +            AE 000000000000 100 100 0  
    1.45 +            B5 D30357012B05 100 100 0  
    1.46 +            B7 000000000000 100 100 0  
    1.47 +            B8 000000000000 100 100 0  
    1.48 +            BB 000000000000 100 100 0  
    1.49 +            BC 000000000000 100 100 0  
    1.50 +            BD C60100000000 100 100 0  
    1.51 +            C3 000000000000 100 100 0  
    1.52 +            C4 000000000000 100 100 0  
    1.53 +            C5 000000000000 100 100 0  
    1.54 +            C6 000000000000 100 100 0  
    1.55 +            C7 000000000000 100 100 0  
    1.56 +            CA 000000000000 100 100 0  
    1.57 +            CE 000000000000 100 100 0")
    1.58        };
    1.59  
    1.60      public IntPtr OpenDrive(int driveNumber) {
     2.1 --- a/Hardware/HDD/SSDSandforce.cs	Fri Jan 20 17:19:42 2012 +0000
     2.2 +++ b/Hardware/HDD/SSDSandforce.cs	Mon Feb 13 20:34:39 2012 +0000
     2.3 @@ -39,7 +39,7 @@
     2.4  namespace OpenHardwareMonitor.Hardware.HDD {
     2.5    using System.Collections.Generic;
     2.6  
     2.7 -  [NamePrefix(""), RequireSmart(0xAB)]
     2.8 +  [NamePrefix(""), RequireSmart(0xAB), RequireSmart(0xB1)]
     2.9    internal class SSDSandforce : AbstractHarddrive {
    2.10  
    2.11      private static readonly IEnumerable<SmartAttribute> smartAttributes =
     3.1 --- a/Properties/AssemblyVersion.cs	Fri Jan 20 17:19:42 2012 +0000
     3.2 +++ b/Properties/AssemblyVersion.cs	Mon Feb 13 20:34:39 2012 +0000
     3.3 @@ -16,7 +16,7 @@
     3.4  
     3.5    The Initial Developer of the Original Code is 
     3.6    Michael Möller <m.moeller@gmx.ch>.
     3.7 -  Portions created by the Initial Developer are Copyright (C) 2009-2011
     3.8 +  Portions created by the Initial Developer are Copyright (C) 2009-2012
     3.9    the Initial Developer. All Rights Reserved.
    3.10  
    3.11    Contributor(s):
    3.12 @@ -37,5 +37,5 @@
    3.13  
    3.14  using System.Reflection;
    3.15  
    3.16 -[assembly: AssemblyVersion("0.4.0.0")]
    3.17 -[assembly: AssemblyInformationalVersion("0.4.0 Beta")]
    3.18 \ No newline at end of file
    3.19 +[assembly: AssemblyVersion("0.4.0.1")]
    3.20 +[assembly: AssemblyInformationalVersion("0.4.0.1 Alpha")]
    3.21 \ No newline at end of file