# HG changeset patch
# User moel.mich
# Date 1343230396 0
# Node ID 3b8443edb0e6dc54ec02907f00730a17d38fd918
# Parent  2de3a3e5f0b5326513b7bd3076ad679360920296
Added a new icon for RAM hardware.

diff -r 2de3a3e5f0b5 -r 3b8443edb0e6 GUI/HardwareTypeImage.cs
--- a/GUI/HardwareTypeImage.cs	Tue Jul 24 16:45:48 2012 +0000
+++ b/GUI/HardwareTypeImage.cs	Wed Jul 25 15:33:16 2012 +0000
@@ -4,7 +4,7 @@
   License, v. 2.0. If a copy of the MPL was not distributed with this
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
-  Copyright (C) 2010 Michael Möller <mmoeller@openhardwaremonitor.org>
+  Copyright (C) 2010-2012 Michael Möller <mmoeller@openhardwaremonitor.org>
 	
 */
 
@@ -57,7 +57,7 @@
             image = Utilities.EmbeddedResources.GetImage("bigng.png");
             break;
           case HardwareType.RAM:
-            image = Utilities.EmbeddedResources.GetImage("chip.png");
+            image = Utilities.EmbeddedResources.GetImage("ram.png");
             break;
           default:
             image = new Bitmap(1, 1);
diff -r 2de3a3e5f0b5 -r 3b8443edb0e6 Hardware/SMBIOS.cs
--- a/Hardware/SMBIOS.cs	Tue Jul 24 16:45:48 2012 +0000
+++ b/Hardware/SMBIOS.cs	Wed Jul 25 15:33:16 2012 +0000
@@ -183,6 +183,10 @@
         r.AppendLine(MemoryDevices[i].ManufacturerName);
         r.Append("Memory Device [" + i + "] Part Number: ");
         r.AppendLine(MemoryDevices[i].PartNumber);
+        r.Append("Memory Device [" + i + "] Device Locator: ");
+        r.AppendLine(MemoryDevices[i].DeviceLocator);
+        r.Append("Memory Device [" + i + "] Bank Locator: ");
+        r.AppendLine(MemoryDevices[i].BankLocator);
         r.AppendLine();
       }
 
@@ -357,32 +361,35 @@
 
     public class MemoryDevice : Structure {
 
+      private readonly string deviceLocator;
+      private readonly string bankLocator;
       private readonly string manufacturerName;
       private readonly string serialNumber;
-      private readonly string partNumber;
-
-      public MemoryDevice(string manufacturerName, string serialNumber,
-        string partNumber)
-        : base(0x11, 0, null, null) {
-        this.manufacturerName = manufacturerName;
-        this.serialNumber = serialNumber;
-        this.partNumber = partNumber;
-      }
+      private readonly string partNumber;      
 
       public MemoryDevice(byte type, ushort handle, byte[] data,
         string[] strings)
-        : base(type, handle, data, strings) {
+        : base(type, handle, data, strings) 
+      {
+        this.deviceLocator = GetString(0x10).Trim();
+        this.bankLocator = GetString(0x11).Trim();
         this.manufacturerName = GetString(0x17).Trim();
         this.serialNumber = GetString(0x18).Trim();
         this.partNumber = GetString(0x1A).Trim();
       }
 
+      public string DeviceLocator { get { return deviceLocator; } }
+
+      public string BankLocator { get { return bankLocator; } }
+
       public string ManufacturerName { get { return manufacturerName; } }
 
       public string SerialNumber { get { return serialNumber; } }
 
       public string PartNumber { get { return partNumber; } }
 
+       
+
     }
   }
 }
diff -r 2de3a3e5f0b5 -r 3b8443edb0e6 OpenHardwareMonitor.csproj
--- a/OpenHardwareMonitor.csproj	Tue Jul 24 16:45:48 2012 +0000
+++ b/OpenHardwareMonitor.csproj	Wed Jul 25 15:33:16 2012 +0000
@@ -284,6 +284,9 @@
     <EmbeddedResource Include="Resources\Web\js\knockout-2.1.0.min.js" />
     <EmbeddedResource Include="Resources\Web\js\knockout.mapping-latest.min.js" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\ram.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio AllowExistingFolder="true" />
diff -r 2de3a3e5f0b5 -r 3b8443edb0e6 Resources/chip.png
Binary file Resources/chip.png has changed
diff -r 2de3a3e5f0b5 -r 3b8443edb0e6 Resources/ram.png
Binary file Resources/ram.png has changed
diff -r 2de3a3e5f0b5 -r 3b8443edb0e6 Utilities/HttpServer.cs
--- a/Utilities/HttpServer.cs	Tue Jul 24 16:45:48 2012 +0000
+++ b/Utilities/HttpServer.cs	Wed Jul 25 15:33:16 2012 +0000
@@ -316,7 +316,7 @@
                 case HardwareType.TBalancer:
                     return "bigng.png";
                 case HardwareType.RAM:
-                    return "chip.png";
+                    return "ram.png";
                 default:
                     return "cpu.png";
             }