From a3f3febfb300b5c2b56c80497e92e8c5ccc77edd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=B6ller?= <mmoeller@openhardwaremonitor.org>
Date: Wed, 25 Jul 2012 15:33:16 +0000
Subject: [PATCH] Added a new icon for RAM hardware.

---
 GUI/HardwareTypeImage.cs   |   4 ++--
 Hardware/SMBIOS.cs         |  27 +++++++++++++++++----------
 OpenHardwareMonitor.csproj |   3 +++
 Resources/chip.png         | Bin 852 -> 806 bytes
 Resources/ram.png          | Bin 0 -> 768 bytes
 Utilities/HttpServer.cs    |   2 +-
 6 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 Resources/ram.png

diff --git a/GUI/HardwareTypeImage.cs b/GUI/HardwareTypeImage.cs
index 17587a2..057353a 100644
--- a/GUI/HardwareTypeImage.cs
+++ b/GUI/HardwareTypeImage.cs
@@ -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 @@ namespace OpenHardwareMonitor.GUI {
             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 --git a/Hardware/SMBIOS.cs b/Hardware/SMBIOS.cs
index d7c40ea..7aa73df 100644
--- a/Hardware/SMBIOS.cs
+++ b/Hardware/SMBIOS.cs
@@ -183,6 +183,10 @@ namespace OpenHardwareMonitor.Hardware {
         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 @@ namespace OpenHardwareMonitor.Hardware {
 
     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 --git a/OpenHardwareMonitor.csproj b/OpenHardwareMonitor.csproj
index 1cde12e..35d6616 100644
--- a/OpenHardwareMonitor.csproj
+++ b/OpenHardwareMonitor.csproj
@@ -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 --git a/Resources/chip.png b/Resources/chip.png
index d7181afdca61271336ae46fdc1c163271cef1336..56adf45c276f784a8cdfc96b580a5387a0a39dfc 100644
GIT binary patch
delta 737
zcmV<70v`R;2Brp(Hwpg${{a7>y{D6rKpubG2N?|=G~gMz3jhEDrb$FWR5;7Mlgmp~
zaTLeD=l8pJ?mTP;9rNwz%rL?g8LiO-TSN&-?GlPvgisr45#hE~{teNpz=$B))UF3q
zl4zR<;TA}gfuV@$G@~>3&fM3WHU&MQHhouzFQ3EV!1oLMFC98G()o3y?|tz*xU+w=
zlK?<UDdy(p8V3djxTU3IJ(bM70Kfq?D8I4t`^983DN3ahJB}l!r>FPTYPH>Bv3R+^
zzaNoE1IObn-Iiq@FBG<Kq|<4&SS;4*=j%ii)OCGpbaXV@*49?HEQ@X1mer~Q&-LN?
zE*2M`Kib&XIPvp8p-d*TIWaMz_4a@EYNlzjWm&?qEY#~hTUHIeC*U|Xd43hk%ge7;
zS67GSwQE-g4a0bO>C(m7$;nd<;c!^mwoS}T0N8PCVt7y$m3-HO=lP@tRBmmHcT}s@
zqq0&dU!R@5G7^i$RNJ<hh~RlX0KoTs5D5Zn@O>9P*AR{<*xNJl=JjioO1po(VrQoi
zOeT}?JP)Q>Ayo}fC=?<^QAkQjLI{9d3I+q@x;8y|@{CqiRwxiqQLa>=D2fa_j*Eqb
z1#WC?LLi`_tE&f!qC(T^&@`2H%bWb{=@P&MMQYgI-lk|QLJg6~JQ;?eOifKa&Sta6
zT-W1+xj{ttMZj?B-TSxv=;41;k|M;8W1~>`OwG;BFirEW5aRUSUipNQ&1O9S<7;bc
zcLoQC^81^Q_#f9li2L^*FhHpLl0R*2Qfq4~0Ng5<%V#o~%+mb)eEydNCK5dt&YeHY
z!y{Q98p?8edpqZH!yJu9Z>Lfz9v>e+`Hh{KnfWn8x~`L97(&<ejj>I!F+O~FjN|df
z$LVy6o0^&q<n#I1S5En3VZz~v1c2`D#LZkT#{gOqiH;}$^!4@0e=T79-#}jg%e)%A
T?RSsY00000NkvXXu0mjf8aQr@

delta 783
zcmV+q1MvK&2Gj<SHwkJ0Y5;1&<`N^3KpubE0SXcZ6X5F2djJ3e)Ja4^R5;7Mlh11u
zcNoT>cjh}YJF}bYlr&*oe?)^crCsP{&0%k;5J^as7~5D<BoLBAZz&|Kg&g_^^wdj3
z6+~7_APHtQK?OAk+Cp|0bh8a?X&}j}tS$}RU}l{8&iCuZLNy-jrSIwG<>B-2@bZ5E
z|JR&9pWgp^rGMYmcZqv@d#PM5!?G-;R4Um*2&b*>qi>^)O(#}YA71>hDX#81J8}<T
zaBxs5l}fT+uPd2Mrop!Dzdg_UE|Ewe9FE8X2M!$!h0Ly%l?NAwhK96au_)+mcg9#~
zWMrh;+1c6H+}tc&*Oi{<sjlmR`vQMF@G(0(b7OIFvHOiYM2dOt+}BSB2F@7qc-(Lt
zN4l=7xULH!0_iv}Ap!-S=MfJaEH5wTGnq_MEfybsR;g^QOi%yx{mGMk5z{nP&-3Xu
zTypM{L;%JZ1v~)ff;3%|t%vu=Ez9gw<MDkzPfbl7i$o%t@B0!U1c3km2qAw!L<FfL
z5FA2!FfA23^%wZ<*ZbJm*f^|IDwR+y7DEsOa9xKOV`LZxsj5nfqL88}0C6%5jW~Zv
z^YgQm&*#aqO#HdN4yNn6#W_czP>|7R6q=@^r6mScWzcmAU1zlO;+b5$egje{F!Tnj
zt*z0)LosS?ZM{oUN;W<|ezSk0qvLbm=kk+JKStOJL4wm(WkW73TqR9yl)JmTD3|}B
z_V#wvYPA{0*cY3dTiuL^IDq5HWb&8Orw7iaQpuqD{IN1Ww;%xm_cZx?`4J@&2}mg~
zSF6=8Q>oPbbUJ+&0F-~;n9Jq9%H?w3<O>Bgo4rOt5Um!=WZO+ttJQn1Y;SL)udi<=
zo6VZ(bo$4or6qa;Fg7+ub91xPcW&Q%Vj4E==m)6p{B`Te(@liKksrFcy6nlx$)(ZJ
zQ3e1#Jw0+y2aX&$ssg~NQ~j4FCMG0+mj3?kMgSNd9#;Qr0r$O+=oNC9Hxh1f*ysQN
N002ovPDHLkV1n?=bSMA-

diff --git a/Resources/ram.png b/Resources/ram.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa9330941aa6c3e49daba465129caed25adf343b
GIT binary patch
literal 768
zcmV+b1ONPqP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyl4
z4jLB^dEn;&0013nR9JLFZ*6U5Zgc<u0000(a%Ew3Wn>_CX>@2HM@dakWG-a~00074
zNkl<ZILn=qOHb256vcmc`j^%MwWhQtBrO(-Lf9BKZdF(r#8)9SCB#qQimi#C!mSHp
zkVi}i#)KFWT^J3<6&ftiXIctvDbiMg5;`vW0BPKKCzF{ub7t<jXGZL|dNlwV(3-N=
zC=n0=B`A{uC5TdJ5tLCKO$q=*6gaP6;eTT1O9(|JKU2e#Tw5vCyJcpTCq4I=8lL3t
z_66=|F7hzfhGk}zso}}`B_@m4`Lx;XpuC!3e>=zbXp~HTkN8%aLTR6LI>ou)M=ZVn
zKscTtnoM!NxrvZb;AeUl1yD$4@%zUB7`QV;S(gC_1cC$tK>%(J-A0!yaz{qS>Iw`I
z<X3V}&(2QQ!5VRT`UPEGUaV(opPPFL=E_`Ab$oO*P$!&L5Dbnt;HMRstUi}Ex7%Se
zLou7j=5n#IwnpjTfI?}Xcsz>vSaWQ)5M5vAN3nRygFH%<s%JYJfk2RniAN21U4ejs
z5;@A2{_;SHs(aw=>Y$~DSI7DJS!e>3LWv=WapJ+-g$1hTD+<Od3YHgNQ`_+SN2`eh
zleM>98+I$EXpWUnpAiw1QrK;+B+^MTnKVmF%hlhmvD;cXJU(RIC~}b5LmUtKwWHU~
zQ7lhkGu=>cOXnp@k(~zIG1y1;TLeRt!Y~XBp9_oEi57jrs=OLjp9@3~5h|_Xpon19
zxUUA>w0XM8B{pz&TqPS1{d3*s>E_1scQn~rFrE$e%j1t<^_#^t+B-vRMdG-98>GT9
yJl$coV=+8E3DV&Rm;1KJM54G0yX0ai0Qm#qc=eQ*5XOuE0000<MNUMnLSTZN144WN

literal 0
HcmV?d00001

diff --git a/Utilities/HttpServer.cs b/Utilities/HttpServer.cs
index 461abe4..394771f 100644
--- a/Utilities/HttpServer.cs
+++ b/Utilities/HttpServer.cs
@@ -316,7 +316,7 @@ namespace OpenHardwareMonitor.Utilities
                 case HardwareType.TBalancer:
                     return "bigng.png";
                 case HardwareType.RAM:
-                    return "chip.png";
+                    return "ram.png";
                 default:
                     return "cpu.png";
             }