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 + Copyright (C) 2010-2012 Michael Möller */ @@ -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 @@ + + + diff --git a/Resources/chip.png b/Resources/chip.png index d7181af..56adf45 100644 Binary files a/Resources/chip.png and b/Resources/chip.png differ diff --git a/Resources/ram.png b/Resources/ram.png new file mode 100644 index 0000000..fa93309 Binary files /dev/null and b/Resources/ram.png differ 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"; }