# HG changeset patch # User moel.mich # Date 1343080475 0 # Node ID 8e4dedc41924348029f83736558110a3e8737a1c # Parent 5077ed7ddca8e2489a3ac23e196f7e9a1ae9141c Added a RAM hardware and sensor, fixed Issue 115. diff -r 5077ed7ddca8 -r 8e4dedc41924 GUI/HardwareTypeImage.cs --- a/GUI/HardwareTypeImage.cs Sun Jul 22 18:07:11 2012 +0000 +++ b/GUI/HardwareTypeImage.cs Mon Jul 23 21:54:35 2012 +0000 @@ -56,6 +56,9 @@ case HardwareType.TBalancer: image = Utilities.EmbeddedResources.GetImage("bigng.png"); break; + case HardwareType.RAM: + image = Utilities.EmbeddedResources.GetImage("chip.png"); + break; default: image = new Bitmap(1, 1); break; diff -r 5077ed7ddca8 -r 8e4dedc41924 GUI/MainForm.Designer.cs --- a/GUI/MainForm.Designer.cs Sun Jul 22 18:07:11 2012 +0000 +++ b/GUI/MainForm.Designer.cs Mon Jul 23 21:54:35 2012 +0000 @@ -94,6 +94,7 @@ this.timer = new System.Windows.Forms.Timer(this.components); this.splitContainer = new OpenHardwareMonitor.GUI.SplitContainerAdv(); this.treeView = new Aga.Controls.Tree.TreeViewAdv(); + this.ramMenuItem = new System.Windows.Forms.MenuItem(); this.splitContainer.Panel1.SuspendLayout(); this.splitContainer.SuspendLayout(); this.SuspendLayout(); @@ -227,6 +228,7 @@ this.menuItem5.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { this.mainboardMenuItem, this.cpuMenuItem, + this.ramMenuItem, this.gpuMenuItem, this.fanControllerMenuItem, this.hddMenuItem}); @@ -244,17 +246,17 @@ // // gpuMenuItem // - this.gpuMenuItem.Index = 2; + this.gpuMenuItem.Index = 3; this.gpuMenuItem.Text = "GPU"; // // fanControllerMenuItem // - this.fanControllerMenuItem.Index = 3; + this.fanControllerMenuItem.Index = 4; this.fanControllerMenuItem.Text = "Fan Controllers"; // // hddMenuItem // - this.hddMenuItem.Index = 4; + this.hddMenuItem.Index = 5; this.hddMenuItem.Text = "Hard Disk Drives"; // // menuItem6 @@ -525,6 +527,11 @@ this.treeView.MouseMove += new System.Windows.Forms.MouseEventHandler(this.treeView_MouseMove); this.treeView.MouseUp += new System.Windows.Forms.MouseEventHandler(this.treeView_MouseUp); // + // ramMenuItem + // + this.ramMenuItem.Index = 2; + this.ramMenuItem.Text = "RAM"; + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -607,6 +614,7 @@ private System.Windows.Forms.MenuItem cpuMenuItem; private System.Windows.Forms.MenuItem gpuMenuItem; private System.Windows.Forms.MenuItem fanControllerMenuItem; + private System.Windows.Forms.MenuItem ramMenuItem; } } diff -r 5077ed7ddca8 -r 8e4dedc41924 GUI/MainForm.cs --- a/GUI/MainForm.cs Sun Jul 22 18:07:11 2012 +0000 +++ b/GUI/MainForm.cs Mon Jul 23 21:54:35 2012 +0000 @@ -54,6 +54,7 @@ private UserOption readMainboardSensors; private UserOption readCpuSensors; + private UserOption readRamSensors; private UserOption readGpuSensors; private UserOption readFanControllersSensors; private UserOption readHddSensors; @@ -226,6 +227,12 @@ computer.CPUEnabled = readCpuSensors.Value; }; + readRamSensors = new UserOption("ramMenuItem", true, + ramMenuItem, settings); + readRamSensors.Changed += delegate(object sender, EventArgs e) { + computer.RAMEnabled = readRamSensors.Value; + }; + readGpuSensors = new UserOption("gpuMenuItem", true, gpuMenuItem, settings); readGpuSensors.Changed += delegate(object sender, EventArgs e) { diff -r 5077ed7ddca8 -r 8e4dedc41924 Hardware/Computer.cs --- a/Hardware/Computer.cs Sun Jul 22 18:07:11 2012 +0000 +++ b/Hardware/Computer.cs Mon Jul 23 21:54:35 2012 +0000 @@ -22,13 +22,16 @@ private readonly List groups = new List(); private readonly ISettings settings; + private SMBIOS smbios; + private bool open; private bool mainboardEnabled; private bool cpuEnabled; + private bool ramEnabled; private bool gpuEnabled; private bool fanControllerEnabled; - private bool hddEnabled; + private bool hddEnabled; public Computer() { this.settings = new Settings(); @@ -76,15 +79,20 @@ if (open) return; + this.smbios = new SMBIOS(); + Ring0.Open(); Opcode.Open(); if (mainboardEnabled) - Add(new Mainboard.MainboardGroup(settings)); + Add(new Mainboard.MainboardGroup(smbios, settings)); if (cpuEnabled) Add(new CPU.CPUGroup(settings)); + if (ramEnabled) + Add(new RAM.RAMGroup(smbios, settings)); + if (gpuEnabled) { Add(new ATI.ATIGroup(settings)); Add(new Nvidia.NvidiaGroup(settings)); @@ -108,7 +116,7 @@ set { if (open && value != mainboardEnabled) { if (value) - Add(new Mainboard.MainboardGroup(settings)); + Add(new Mainboard.MainboardGroup(smbios, settings)); else RemoveType(); } @@ -131,6 +139,21 @@ } } + public bool RAMEnabled { + get { return ramEnabled; } + + [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)] + set { + if (open && value != ramEnabled) { + if (value) + Add(new RAM.RAMGroup(smbios, settings)); + else + RemoveType(); + } + ramEnabled = value; + } + } + public bool GPUEnabled { get { return gpuEnabled; } @@ -336,6 +359,8 @@ Opcode.Close(); Ring0.Close(); + this.smbios = null; + open = false; } diff -r 5077ed7ddca8 -r 8e4dedc41924 Hardware/IComputer.cs --- a/Hardware/IComputer.cs Sun Jul 22 18:07:11 2012 +0000 +++ b/Hardware/IComputer.cs Mon Jul 23 21:54:35 2012 +0000 @@ -16,8 +16,14 @@ IHardware[] Hardware { get; } + bool MainboardEnabled { get; } + bool CPUEnabled { get; } + bool RAMEnabled { get; } + bool GPUEnabled { get; } + bool FanControllerEnabled { get; } bool HDDEnabled { get; } + string GetReport(); event HardwareEventHandler HardwareAdded; diff -r 5077ed7ddca8 -r 8e4dedc41924 Hardware/IHardware.cs --- a/Hardware/IHardware.cs Sun Jul 22 18:07:11 2012 +0000 +++ b/Hardware/IHardware.cs Mon Jul 23 21:54:35 2012 +0000 @@ -16,11 +16,12 @@ Mainboard, SuperIO, CPU, + RAM, GpuNvidia, GpuAti, TBalancer, Heatmaster, - HDD, + HDD } public interface IHardware : IElement { diff -r 5077ed7ddca8 -r 8e4dedc41924 Hardware/Mainboard/Identification.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Hardware/Mainboard/Identification.cs Mon Jul 23 21:54:35 2012 +0000 @@ -0,0 +1,200 @@ +/* + + This Source Code Form is subject to the terms of the Mozilla Public + 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) 2012 Michael Möller + +*/ + +namespace OpenHardwareMonitor.Hardware.Mainboard { + internal class Identification { + + public static Manufacturer GetManufacturer(string name) { + switch (name) { + case "Alienware": + return Manufacturer.Alienware; + case "Apple Inc.": + return Manufacturer.Apple; + case "ASRock": + return Manufacturer.ASRock; + case "ASUSTeK Computer INC.": + case "ASUSTeK COMPUTER INC.": + return Manufacturer.ASUS; + case "Dell Inc.": + return Manufacturer.Dell; + case "DFI": + case "DFI Inc.": + return Manufacturer.DFI; + case "ECS": + return Manufacturer.ECS; + case "EPoX COMPUTER CO., LTD": + return Manufacturer.EPoX; + case "EVGA": + return Manufacturer.EVGA; + case "First International Computer, Inc.": + return Manufacturer.FIC; + case "FUJITSU": + case "FUJITSU SIEMENS": + return Manufacturer.Fujitsu; + case "Gigabyte Technology Co., Ltd.": + return Manufacturer.Gigabyte; + case "Hewlett-Packard": + return Manufacturer.HP; + case "IBM": + return Manufacturer.IBM; + case "Intel": + case "Intel Corp.": + case "Intel Corporation": + case "INTEL Corporation": + return Manufacturer.Intel; + case "Lenovo": + case "LENOVO": + return Manufacturer.Lenovo; + case "Micro-Star International": + case "MICRO-STAR INTERNATIONAL CO., LTD": + case "MICRO-STAR INTERNATIONAL CO.,LTD": + case "MSI": + return Manufacturer.MSI; + case "Shuttle": + return Manufacturer.Shuttle; + case "Supermicro": + return Manufacturer.Supermicro; + case "TOSHIBA": + return Manufacturer.Toshiba; + case "XFX": + return Manufacturer.XFX; + case "To be filled by O.E.M.": + return Manufacturer.Unknown; + default: + return Manufacturer.Unknown; + } + } + + public static Model GetModel(string name) { + switch (name) { + case "880GMH/USB3": + return Model._880GMH_USB3; + case "ASRock AOD790GX/128M": + return Model.AOD790GX_128M; + case "P55 Deluxe": + return Model.P55_Deluxe; + case "Crosshair III Formula": + return Model.Crosshair_III_Formula; + case "M2N-SLI DELUXE": + return Model.M2N_SLI_DELUXE; + case "M4A79XTD EVO": + return Model.M4A79XTD_EVO; + case "P5W DH Deluxe": + return Model.P5W_DH_Deluxe; + case "P6T": + return Model.P6T; + case "P6X58D-E": + return Model.P6X58D_E; + case "P8P67": + return Model.P8P67; + case "P8P67 EVO": + return Model.P8P67_EVO; + case "P8P67 PRO": + return Model.P8P67_PRO; + case "P8P67-M PRO": + return Model.P8P67_M_PRO; + case "P8Z77-V": + return Model.P8Z77_V; + case "P9X79": + return Model.P9X79; + case "Rampage Extreme": + return Model.Rampage_Extreme; + case "Rampage II GENE": + return Model.Rampage_II_GENE; + case "LP BI P45-T2RS Elite": + return Model.LP_BI_P45_T2RS_Elite; + case "LP DK P55-T3eH9": + return Model.LP_DK_P55_T3eH9; + case "A890GXM-A": + return Model.A890GXM_A; + case "X58 SLI Classified": + return Model.X58_SLI_Classified; + case "965P-S3": + return Model._965P_S3; + case "EP45-DS3R": + return Model.EP45_DS3R; + case "EP45-UD3R": + return Model.EP45_UD3R; + case "EX58-EXTREME": + return Model.EX58_EXTREME; + case "EX58-UD3R": + return Model.EX58_UD3R; + case "G41M-Combo": + return Model.G41M_Combo; + case "G41MT-S2": + return Model.G41MT_S2; + case "G41MT-S2P": + return Model.G41MT_S2P; + case "GA-MA770T-UD3": + return Model.GA_MA770T_UD3; + case "GA-MA770T-UD3P": + return Model.GA_MA770T_UD3P; + case "GA-MA785GM-US2H": + return Model.GA_MA785GM_US2H; + case "GA-MA785GMT-UD2H": + return Model.GA_MA785GMT_UD2H; + case "GA-MA78LM-S2H": + return Model.GA_MA78LM_S2H; + case "GA-MA790X-UD3P": + return Model.GA_MA790X_UD3P; + case "H55-USB3": + return Model.H55_USB3; + case "H55N-USB3": + return Model.H55N_USB3; + case "H61M-DS2 REV 1.2": + return Model.H61M_DS2_REV_1_2; + case "H61M-USB3-B3 REV 2.0": + return Model.H61M_USB3_B3_REV_2_0; + case "H67A-UD3H-B3": + return Model.H67A_UD3H_B3; + case "H67A-USB3-B3": + return Model.H67A_USB3_B3; + case "P35-DS3": + return Model.P35_DS3; + case "P35-DS3L": + return Model.P35_DS3L; + case "P55-UD4": + return Model.P55_UD4; + case "P55A-UD3": + return Model.P55A_UD3; + case "P55M-UD4": + return Model.P55M_UD4; + case "P67A-UD3-B3": + return Model.P67A_UD3_B3; + case "P67A-UD3R-B3": + return Model.P67A_UD3R_B3; + case "P67A-UD4-B3": + return Model.P67A_UD4_B3; + case "P8Z68-V PRO": + return Model.P8Z68_V_PRO; + case "X38-DS5": + return Model.X38_DS5; + case "X58A-UD3R": + return Model.X58A_UD3R; + case "Z68A-D3H-B3": + return Model.Z68A_D3H_B3; + case "Z68AP-D3": + return Model.Z68AP_D3; + case "Z68X-UD3H-B3": + return Model.Z68X_UD3H_B3; + case "Z68X-UD7-B3": + return Model.Z68X_UD7_B3; + case "FH67": + return Model.FH67; + case "Base Board Product Name": + case "To be filled by O.E.M.": + return Model.Unknown; + default: + return Model.Unknown; + } + } + + } +} diff -r 5077ed7ddca8 -r 8e4dedc41924 Hardware/Mainboard/Mainboard.cs --- a/Hardware/Mainboard/Mainboard.cs Sun Jul 22 18:07:11 2012 +0000 +++ b/Hardware/Mainboard/Mainboard.cs Mon Jul 23 21:54:35 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) 2009-2011 Michael Möller + Copyright (C) 2009-2012 Michael Möller */ @@ -22,19 +22,25 @@ private readonly LMSensors lmSensors; private readonly Hardware[] superIOHardware; - public Mainboard(ISettings settings) { + public Mainboard(SMBIOS smbios, ISettings settings) { this.settings = settings; - this.smbios = new SMBIOS(); - + this.smbios = smbios; + + Manufacturer manufacturer = smbios.Board == null ? Manufacturer.Unknown : + Identification.GetManufacturer(smbios.Board.ManufacturerName); + + Model model = smbios.Board == null ? Model.Unknown : + Identification.GetModel(smbios.Board.ProductName); + if (smbios.Board != null) { if (!string.IsNullOrEmpty(smbios.Board.ProductName)) { - if (smbios.Board.Manufacturer == Manufacturer.Unknown) + if (manufacturer == Manufacturer.Unknown) this.name = smbios.Board.ProductName; else - this.name = smbios.Board.Manufacturer + " " + + this.name = manufacturer + " " + smbios.Board.ProductName; } else { - this.name = smbios.Board.Manufacturer.ToString(); + this.name = manufacturer.ToString(); } } else { this.name = Manufacturer.Unknown.ToString(); @@ -55,10 +61,8 @@ superIOHardware = new Hardware[superIO.Length]; for (int i = 0; i < superIO.Length; i++) - superIOHardware[i] = new SuperIOHardware(this, superIO[i], - smbios.Board != null ? smbios.Board.Manufacturer : - Manufacturer.Unknown, smbios.Board != null ? smbios.Board.Model : - Model.Unknown, settings); + superIOHardware[i] = new SuperIOHardware(this, superIO[i], + manufacturer, model, settings); } public string Name { diff -r 5077ed7ddca8 -r 8e4dedc41924 Hardware/Mainboard/MainboardGroup.cs --- a/Hardware/Mainboard/MainboardGroup.cs Sun Jul 22 18:07:11 2012 +0000 +++ b/Hardware/Mainboard/MainboardGroup.cs Mon Jul 23 21:54:35 2012 +0000 @@ -13,9 +13,9 @@ private readonly Mainboard[] mainboards; - public MainboardGroup(ISettings settings) { + public MainboardGroup(SMBIOS smbios, ISettings settings) { mainboards = new Mainboard[1]; - mainboards[0] = new Mainboard(settings); + mainboards[0] = new Mainboard(smbios, settings); } public void Close() { diff -r 5077ed7ddca8 -r 8e4dedc41924 Hardware/Mainboard/SMBIOS.cs --- a/Hardware/Mainboard/SMBIOS.cs Sun Jul 22 18:07:11 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,533 +0,0 @@ -/* - - This Source Code Form is subject to the terms of the Mozilla Public - 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) 2009-2012 Michael Möller - -*/ - -using System; -using System.Collections.Generic; -using System.IO; -using System.Management; -using System.Text; - -namespace OpenHardwareMonitor.Hardware.Mainboard { - - internal class SMBIOS { - - private readonly byte[] raw; - private readonly Structure[] table; - - private readonly Version version; - private readonly BIOSInformation biosInformation; - private readonly SystemInformation systemInformation; - private readonly BaseBoardInformation baseBoardInformation; - - private static string ReadSysFS(string path) { - try { - if (File.Exists(path)) { - using (StreamReader reader = new StreamReader(path)) - return reader.ReadLine(); - } else { - return null; - } - } catch { - return null; - } - } - - public SMBIOS() { - int p = (int)Environment.OSVersion.Platform; - if ((p == 4) || (p == 128)) { - this.raw = null; - this.table = null; - - string boardVendor = ReadSysFS("/sys/class/dmi/id/board_vendor"); - string boardName = ReadSysFS("/sys/class/dmi/id/board_name"); - string boardVersion = ReadSysFS("/sys/class/dmi/id/board_version"); - this.baseBoardInformation = new BaseBoardInformation( - boardVendor, boardName, boardVersion, null); - - string systemVendor = ReadSysFS("/sys/class/dmi/id/sys_vendor"); - string productName = ReadSysFS("/sys/class/dmi/id/product_name"); - string productVersion = ReadSysFS("/sys/class/dmi/id/product_version"); - this.systemInformation = new SystemInformation(systemVendor, - productName, productVersion, null, null); - - string biosVendor = ReadSysFS("/sys/class/dmi/id/bios_vendor"); - string biosVersion = ReadSysFS("/sys/class/dmi/id/bios_version"); - this.biosInformation = new BIOSInformation(biosVendor, biosVersion); - - } else { - List structureList = new List(); - - raw = null; - byte majorVersion = 0; - byte minorVersion = 0; - try { - ManagementObjectCollection collection; - using (ManagementObjectSearcher searcher = - new ManagementObjectSearcher("root\\WMI", - "SELECT * FROM MSSMBios_RawSMBiosTables")) { - collection = searcher.Get(); - } - - foreach (ManagementObject mo in collection) { - raw = (byte[])mo["SMBiosData"]; - majorVersion = (byte)mo["SmbiosMajorVersion"]; - minorVersion = (byte)mo["SmbiosMinorVersion"]; - break; - } - } catch { } - - if (majorVersion > 0 || minorVersion > 0) - version = new Version(majorVersion, minorVersion); - - if (raw != null && raw.Length > 0) { - int offset = 0; - byte type = raw[offset]; - while (offset + 4 < raw.Length && type != 127) { - - type = raw[offset]; - int length = raw[offset + 1]; - ushort handle = (ushort)((raw[offset + 2] << 8) | raw[offset + 3]); - - if (offset + length > raw.Length) - break; - byte[] data = new byte[length]; - Array.Copy(raw, offset, data, 0, length); - offset += length; - - List stringsList = new List(); - if (offset < raw.Length && raw[offset] == 0) - offset++; - - while (offset < raw.Length && raw[offset] != 0) { - StringBuilder sb = new StringBuilder(); - while (offset < raw.Length && raw[offset] != 0) { - sb.Append((char)raw[offset]); offset++; - } - offset++; - stringsList.Add(sb.ToString()); - } - offset++; - switch (type) { - case 0x00: - this.biosInformation = new BIOSInformation( - type, handle, data, stringsList.ToArray()); - structureList.Add(this.biosInformation); break; - case 0x01: - this.systemInformation = new SystemInformation( - type, handle, data, stringsList.ToArray()); - structureList.Add(this.systemInformation); break; - case 0x02: this.baseBoardInformation = new BaseBoardInformation( - type, handle, data, stringsList.ToArray()); - structureList.Add(this.baseBoardInformation); break; - default: structureList.Add(new Structure( - type, handle, data, stringsList.ToArray())); break; - } - } - } - - table = structureList.ToArray(); - } - } - - public string GetReport() { - StringBuilder r = new StringBuilder(); - - if (version != null) { - r.Append("SMBIOS Version: "); r.AppendLine(version.ToString(2)); - r.AppendLine(); - } - - if (BIOS != null) { - r.Append("BIOS Vendor: "); r.AppendLine(BIOS.Vendor); - r.Append("BIOS Version: "); r.AppendLine(BIOS.Version); - r.AppendLine(); - } - - if (System != null) { - r.Append("System Manufacturer: "); - r.AppendLine(System.ManufacturerName); - r.Append("System Name: "); - r.AppendLine(System.ProductName); - r.Append("System Version: "); - r.AppendLine(System.Version); - r.AppendLine(); - } - - if (Board != null) { - r.Append("Mainboard Manufacturer: "); - r.AppendLine(Board.ManufacturerName); - r.Append("Mainboard Name: "); - r.AppendLine(Board.ProductName); - r.Append("Mainboard Version: "); - r.AppendLine(Board.Version); - r.AppendLine(); - } - - if (raw != null) { - string base64 = Convert.ToBase64String(raw); - r.AppendLine("SMBIOS Table"); - r.AppendLine(); - - for (int i = 0; i < Math.Ceiling(base64.Length / 64.0); i++) { - r.Append(" "); - for (int j = 0; j < 0x40; j++) { - int index = (i << 6) | j; - if (index < base64.Length) { - r.Append(base64[index]); - } - } - r.AppendLine(); - } - r.AppendLine(); - } - - return r.ToString(); - } - - public BIOSInformation BIOS { - get { return biosInformation; } - } - - public SystemInformation System { - get { return systemInformation; } - } - - public BaseBoardInformation Board { - get { return baseBoardInformation; } - } - - public class Structure { - private readonly byte type; - private readonly ushort handle; - - private readonly byte[] data; - private readonly string[] strings; - - protected string GetString(int offset) { - if (offset < data.Length && data[offset] > 0 && - data[offset] <= strings.Length) - return strings[data[offset] - 1]; - else - return ""; - } - - public Structure(byte type, ushort handle, byte[] data, string[] strings) - { - this.type = type; - this.handle = handle; - this.data = data; - this.strings = strings; - } - - public byte Type { get { return type; } } - - public ushort Handle { get { return handle; } } - } - - public class BIOSInformation : Structure { - - private readonly string vendor; - private readonly string version; - - public BIOSInformation(string vendor, string version) - : base (0x00, 0, null, null) - { - this.vendor = vendor; - this.version = version; - } - - public BIOSInformation(byte type, ushort handle, byte[] data, - string[] strings) - : base(type, handle, data, strings) - { - this.vendor = GetString(0x04); - this.version = GetString(0x05); - } - - public string Vendor { get { return vendor; } } - - public string Version { get { return version; } } - } - - public class SystemInformation : Structure { - - private readonly string manufacturerName; - private readonly string productName; - private readonly string version; - private readonly string serialNumber; - private readonly string family; - - public SystemInformation(string manufacturerName, string productName, - string version, string serialNumber, string family) - : base (0x01, 0, null, null) - { - this.manufacturerName = manufacturerName; - this.productName = productName; - this.version = version; - this.serialNumber = serialNumber; - this.family = family; - } - - public SystemInformation(byte type, ushort handle, byte[] data, - string[] strings) - : base(type, handle, data, strings) - { - this.manufacturerName = GetString(0x04); - this.productName = GetString(0x05); - this.version = GetString(0x06); - this.serialNumber = GetString(0x07); - this.family = GetString(0x1A); - } - - public string ManufacturerName { get { return manufacturerName; } } - - public string ProductName { get { return productName; } } - - public string Version { get { return version; } } - - public string SerialNumber { get { return serialNumber; } } - - public string Family { get { return family; } } - - } - - public class BaseBoardInformation : Structure { - - private readonly string manufacturerName; - private readonly string productName; - private readonly string version; - private readonly string serialNumber; - private readonly Manufacturer manufacturer; - private readonly Model model; - - private static Manufacturer GetManufacturer(string name) { - switch (name) { - case "Alienware": - return Manufacturer.Alienware; - case "Apple Inc.": - return Manufacturer.Apple; - case "ASRock": - return Manufacturer.ASRock; - case "ASUSTeK Computer INC.": - case "ASUSTeK COMPUTER INC.": - return Manufacturer.ASUS; - case "Dell Inc.": - return Manufacturer.Dell; - case "DFI": - case "DFI Inc.": - return Manufacturer.DFI; - case "ECS": - return Manufacturer.ECS; - case "EPoX COMPUTER CO., LTD": - return Manufacturer.EPoX; - case "EVGA": - return Manufacturer.EVGA; - case "First International Computer, Inc.": - return Manufacturer.FIC; - case "FUJITSU": - case "FUJITSU SIEMENS": - return Manufacturer.Fujitsu; - case "Gigabyte Technology Co., Ltd.": - return Manufacturer.Gigabyte; - case "Hewlett-Packard": - return Manufacturer.HP; - case "IBM": - return Manufacturer.IBM; - case "Intel": - case "Intel Corp.": - case "Intel Corporation": - case "INTEL Corporation": - return Manufacturer.Intel; - case "Lenovo": - case "LENOVO": - return Manufacturer.Lenovo; - case "Micro-Star International": - case "MICRO-STAR INTERNATIONAL CO., LTD": - case "MICRO-STAR INTERNATIONAL CO.,LTD": - case "MSI": - return Manufacturer.MSI; - case "Shuttle": - return Manufacturer.Shuttle; - case "Supermicro": - return Manufacturer.Supermicro; - case "TOSHIBA": - return Manufacturer.Toshiba; - case "XFX": - return Manufacturer.XFX; - case "To be filled by O.E.M.": - return Manufacturer.Unknown; - default: - return Manufacturer.Unknown; - } - } - - private static Model GetModel(string name) { - switch (name) { - case "880GMH/USB3": - return Model._880GMH_USB3; - case "ASRock AOD790GX/128M": - return Model.AOD790GX_128M; - case "P55 Deluxe": - return Model.P55_Deluxe; - case "Crosshair III Formula": - return Model.Crosshair_III_Formula; - case "M2N-SLI DELUXE": - return Model.M2N_SLI_DELUXE; - case "M4A79XTD EVO": - return Model.M4A79XTD_EVO; - case "P5W DH Deluxe": - return Model.P5W_DH_Deluxe; - case "P6T": - return Model.P6T; - case "P6X58D-E": - return Model.P6X58D_E; - case "P8P67": - return Model.P8P67; - case "P8P67 EVO": - return Model.P8P67_EVO; - case "P8P67 PRO": - return Model.P8P67_PRO; - case "P8P67-M PRO": - return Model.P8P67_M_PRO; - case "P8Z77-V": - return Model.P8Z77_V; - case "P9X79": - return Model.P9X79; - case "Rampage Extreme": - return Model.Rampage_Extreme; - case "Rampage II GENE": - return Model.Rampage_II_GENE; - case "LP BI P45-T2RS Elite": - return Model.LP_BI_P45_T2RS_Elite; - case "LP DK P55-T3eH9": - return Model.LP_DK_P55_T3eH9; - case "A890GXM-A": - return Model.A890GXM_A; - case "X58 SLI Classified": - return Model.X58_SLI_Classified; - case "965P-S3": - return Model._965P_S3; - case "EP45-DS3R": - return Model.EP45_DS3R; - case "EP45-UD3R": - return Model.EP45_UD3R; - case "EX58-EXTREME": - return Model.EX58_EXTREME; - case "EX58-UD3R": - return Model.EX58_UD3R; - case "G41M-Combo": - return Model.G41M_Combo; - case "G41MT-S2": - return Model.G41MT_S2; - case "G41MT-S2P": - return Model.G41MT_S2P; - case "GA-MA770T-UD3": - return Model.GA_MA770T_UD3; - case "GA-MA770T-UD3P": - return Model.GA_MA770T_UD3P; - case "GA-MA785GM-US2H": - return Model.GA_MA785GM_US2H; - case "GA-MA785GMT-UD2H": - return Model.GA_MA785GMT_UD2H; - case "GA-MA78LM-S2H": - return Model.GA_MA78LM_S2H; - case "GA-MA790X-UD3P": - return Model.GA_MA790X_UD3P; - case "H55-USB3": - return Model.H55_USB3; - case "H55N-USB3": - return Model.H55N_USB3; - case "H61M-DS2 REV 1.2": - return Model.H61M_DS2_REV_1_2; - case "H61M-USB3-B3 REV 2.0": - return Model.H61M_USB3_B3_REV_2_0; - case "H67A-UD3H-B3": - return Model.H67A_UD3H_B3; - case "H67A-USB3-B3": - return Model.H67A_USB3_B3; - case "P35-DS3": - return Model.P35_DS3; - case "P35-DS3L": - return Model.P35_DS3L; - case "P55-UD4": - return Model.P55_UD4; - case "P55A-UD3": - return Model.P55A_UD3; - case "P55M-UD4": - return Model.P55M_UD4; - case "P67A-UD3-B3": - return Model.P67A_UD3_B3; - case "P67A-UD3R-B3": - return Model.P67A_UD3R_B3; - case "P67A-UD4-B3": - return Model.P67A_UD4_B3; - case "P8Z68-V PRO": - return Model.P8Z68_V_PRO; - case "X38-DS5": - return Model.X38_DS5; - case "X58A-UD3R": - return Model.X58A_UD3R; - case "Z68A-D3H-B3": - return Model.Z68A_D3H_B3; - case "Z68AP-D3": - return Model.Z68AP_D3; - case "Z68X-UD3H-B3": - return Model.Z68X_UD3H_B3; - case "Z68X-UD7-B3": - return Model.Z68X_UD7_B3; - case "FH67": - return Model.FH67; - case "Base Board Product Name": - case "To be filled by O.E.M.": - return Model.Unknown; - default: - return Model.Unknown; - } - } - - public BaseBoardInformation(string manufacturerName, string productName, - string version, string serialNumber) - : base(0x02, 0, null, null) - { - this.manufacturerName = manufacturerName; - this.manufacturer = GetManufacturer(manufacturerName); - this.productName = productName; - this.model = GetModel(productName); - this.version = version; - this.serialNumber = serialNumber; - } - - public BaseBoardInformation(byte type, ushort handle, byte[] data, - string[] strings) - : base(type, handle, data, strings) { - - this.manufacturerName = GetString(0x04).Trim(); - this.manufacturer = GetManufacturer(this.manufacturerName); - this.productName = GetString(0x05).Trim(); - this.model = GetModel(this.productName); - this.version = GetString(0x06).Trim(); - this.serialNumber = GetString(0x07).Trim(); - } - - public string ManufacturerName { get { return manufacturerName; } } - - public string ProductName { get { return productName; } } - - public string Version { get { return version; } } - - public string SerialNumber { get { return serialNumber; } } - - public Manufacturer Manufacturer { get { return manufacturer; } } - - public Model Model { get { return model; } } - - } - } -} diff -r 5077ed7ddca8 -r 8e4dedc41924 Hardware/RAM/GenericRAM.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Hardware/RAM/GenericRAM.cs Mon Jul 23 21:54:35 2012 +0000 @@ -0,0 +1,47 @@ +/* + + This Source Code Form is subject to the terms of the Mozilla Public + 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) 2012 Michael Möller + +*/ + +using Microsoft.VisualBasic.Devices; + +namespace OpenHardwareMonitor.Hardware.RAM { + internal class GenericRAM : Hardware { + + private Sensor loadSensor; + private Sensor availableMemory; + + private ComputerInfo computerInfo; + + public GenericRAM(string name, ISettings settings) + : base(name, new Identifier("ram"), settings) + { + computerInfo = new ComputerInfo(); + loadSensor = new Sensor("Memory", 0, SensorType.Load, this, settings); + ActivateSensor(loadSensor); + + availableMemory = new Sensor("Available Memory", 0, SensorType.Data, this, settings); + ActivateSensor(availableMemory); + } + + public override HardwareType HardwareType { + get { + return HardwareType.RAM; + } + } + + public override void Update() { + loadSensor.Value = 100.0f - + (100.0f * computerInfo.AvailablePhysicalMemory) / + computerInfo.TotalPhysicalMemory; + + availableMemory.Value = (float)computerInfo.AvailablePhysicalMemory / + (1024 * 1024 * 1024); + } + } +} diff -r 5077ed7ddca8 -r 8e4dedc41924 Hardware/RAM/RAMGroup.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Hardware/RAM/RAMGroup.cs Mon Jul 23 21:54:35 2012 +0000 @@ -0,0 +1,42 @@ +/* + + This Source Code Form is subject to the terms of the Mozilla Public + 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) 2012 Michael Möller + +*/ + +namespace OpenHardwareMonitor.Hardware.RAM { + internal class RAMGroup : IGroup { + + private IHardware[] hardware; + + public RAMGroup(SMBIOS smbios, ISettings settings) { + string name; + if (smbios.MemoryDevices.Length > 0) { + name = smbios.MemoryDevices[0].ManufacturerName + " " + + smbios.MemoryDevices[0].PartNumber; + } else { + name = "Generic Memory"; + } + + hardware = new IHardware[] { new GenericRAM(name, settings) }; + } + + public string GetReport() { + return null; + } + + public IHardware[] Hardware { + get { + return hardware; + } + } + + public void Close() { + + } + } +} diff -r 5077ed7ddca8 -r 8e4dedc41924 Hardware/SMBIOS.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Hardware/SMBIOS.cs Mon Jul 23 21:54:35 2012 +0000 @@ -0,0 +1,388 @@ +/* + + This Source Code Form is subject to the terms of the Mozilla Public + 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) 2009-2012 Michael Möller + +*/ + +using System; +using System.Collections.Generic; +using System.IO; +using System.Management; +using System.Text; + +namespace OpenHardwareMonitor.Hardware { + + internal class SMBIOS { + + private readonly byte[] raw; + private readonly Structure[] table; + + private readonly Version version; + private readonly BIOSInformation biosInformation; + private readonly SystemInformation systemInformation; + private readonly BaseBoardInformation baseBoardInformation; + private readonly MemoryDevice[] memoryDevices; + + private static string ReadSysFS(string path) { + try { + if (File.Exists(path)) { + using (StreamReader reader = new StreamReader(path)) + return reader.ReadLine(); + } else { + return null; + } + } catch { + return null; + } + } + + public SMBIOS() { + int p = (int)Environment.OSVersion.Platform; + if ((p == 4) || (p == 128)) { + this.raw = null; + this.table = null; + + string boardVendor = ReadSysFS("/sys/class/dmi/id/board_vendor"); + string boardName = ReadSysFS("/sys/class/dmi/id/board_name"); + string boardVersion = ReadSysFS("/sys/class/dmi/id/board_version"); + this.baseBoardInformation = new BaseBoardInformation( + boardVendor, boardName, boardVersion, null); + + string systemVendor = ReadSysFS("/sys/class/dmi/id/sys_vendor"); + string productName = ReadSysFS("/sys/class/dmi/id/product_name"); + string productVersion = ReadSysFS("/sys/class/dmi/id/product_version"); + this.systemInformation = new SystemInformation(systemVendor, + productName, productVersion, null, null); + + string biosVendor = ReadSysFS("/sys/class/dmi/id/bios_vendor"); + string biosVersion = ReadSysFS("/sys/class/dmi/id/bios_version"); + this.biosInformation = new BIOSInformation(biosVendor, biosVersion); + + this.memoryDevices = new MemoryDevice[0]; + } else { + List structureList = new List(); + List memoryDeviceList = new List(); + + raw = null; + byte majorVersion = 0; + byte minorVersion = 0; + try { + ManagementObjectCollection collection; + using (ManagementObjectSearcher searcher = + new ManagementObjectSearcher("root\\WMI", + "SELECT * FROM MSSMBios_RawSMBiosTables")) { + collection = searcher.Get(); + } + + foreach (ManagementObject mo in collection) { + raw = (byte[])mo["SMBiosData"]; + majorVersion = (byte)mo["SmbiosMajorVersion"]; + minorVersion = (byte)mo["SmbiosMinorVersion"]; + break; + } + } catch { } + + if (majorVersion > 0 || minorVersion > 0) + version = new Version(majorVersion, minorVersion); + + if (raw != null && raw.Length > 0) { + int offset = 0; + byte type = raw[offset]; + while (offset + 4 < raw.Length && type != 127) { + + type = raw[offset]; + int length = raw[offset + 1]; + ushort handle = (ushort)((raw[offset + 2] << 8) | raw[offset + 3]); + + if (offset + length > raw.Length) + break; + byte[] data = new byte[length]; + Array.Copy(raw, offset, data, 0, length); + offset += length; + + List stringsList = new List(); + if (offset < raw.Length && raw[offset] == 0) + offset++; + + while (offset < raw.Length && raw[offset] != 0) { + StringBuilder sb = new StringBuilder(); + while (offset < raw.Length && raw[offset] != 0) { + sb.Append((char)raw[offset]); offset++; + } + offset++; + stringsList.Add(sb.ToString()); + } + offset++; + switch (type) { + case 0x00: + this.biosInformation = new BIOSInformation( + type, handle, data, stringsList.ToArray()); + structureList.Add(this.biosInformation); break; + case 0x01: + this.systemInformation = new SystemInformation( + type, handle, data, stringsList.ToArray()); + structureList.Add(this.systemInformation); break; + case 0x02: this.baseBoardInformation = new BaseBoardInformation( + type, handle, data, stringsList.ToArray()); + structureList.Add(this.baseBoardInformation); break; + case 0x11: MemoryDevice m = new MemoryDevice( + type, handle, data, stringsList.ToArray()); + memoryDeviceList.Add(m); + structureList.Add(m); break; + default: structureList.Add(new Structure( + type, handle, data, stringsList.ToArray())); break; + } + } + } + + memoryDevices = memoryDeviceList.ToArray(); + table = structureList.ToArray(); + } + } + + public string GetReport() { + StringBuilder r = new StringBuilder(); + + if (version != null) { + r.Append("SMBIOS Version: "); r.AppendLine(version.ToString(2)); + r.AppendLine(); + } + + if (BIOS != null) { + r.Append("BIOS Vendor: "); r.AppendLine(BIOS.Vendor); + r.Append("BIOS Version: "); r.AppendLine(BIOS.Version); + r.AppendLine(); + } + + if (System != null) { + r.Append("System Manufacturer: "); + r.AppendLine(System.ManufacturerName); + r.Append("System Name: "); + r.AppendLine(System.ProductName); + r.Append("System Version: "); + r.AppendLine(System.Version); + r.AppendLine(); + } + + if (Board != null) { + r.Append("Mainboard Manufacturer: "); + r.AppendLine(Board.ManufacturerName); + r.Append("Mainboard Name: "); + r.AppendLine(Board.ProductName); + r.Append("Mainboard Version: "); + r.AppendLine(Board.Version); + r.AppendLine(); + } + + for (int i = 0; i < MemoryDevices.Length; i++) { + r.Append("Memory Device [" + i + "] Manufacturer: "); + r.AppendLine(MemoryDevices[i].ManufacturerName); + r.Append("Memory Device [" + i + "] Part Number: "); + r.AppendLine(MemoryDevices[i].PartNumber); + r.AppendLine(); + } + + if (raw != null) { + string base64 = Convert.ToBase64String(raw); + r.AppendLine("SMBIOS Table"); + r.AppendLine(); + + for (int i = 0; i < Math.Ceiling(base64.Length / 64.0); i++) { + r.Append(" "); + for (int j = 0; j < 0x40; j++) { + int index = (i << 6) | j; + if (index < base64.Length) { + r.Append(base64[index]); + } + } + r.AppendLine(); + } + r.AppendLine(); + } + + return r.ToString(); + } + + public BIOSInformation BIOS { + get { return biosInformation; } + } + + public SystemInformation System { + get { return systemInformation; } + } + + public BaseBoardInformation Board { + get { return baseBoardInformation; } + } + + public MemoryDevice[] MemoryDevices { + get { return memoryDevices; } + } + + public class Structure { + private readonly byte type; + private readonly ushort handle; + + private readonly byte[] data; + private readonly string[] strings; + + protected string GetString(int offset) { + if (offset < data.Length && data[offset] > 0 && + data[offset] <= strings.Length) + return strings[data[offset] - 1]; + else + return ""; + } + + public Structure(byte type, ushort handle, byte[] data, string[] strings) + { + this.type = type; + this.handle = handle; + this.data = data; + this.strings = strings; + } + + public byte Type { get { return type; } } + + public ushort Handle { get { return handle; } } + } + + public class BIOSInformation : Structure { + + private readonly string vendor; + private readonly string version; + + public BIOSInformation(string vendor, string version) + : base (0x00, 0, null, null) + { + this.vendor = vendor; + this.version = version; + } + + public BIOSInformation(byte type, ushort handle, byte[] data, + string[] strings) + : base(type, handle, data, strings) + { + this.vendor = GetString(0x04); + this.version = GetString(0x05); + } + + public string Vendor { get { return vendor; } } + + public string Version { get { return version; } } + } + + public class SystemInformation : Structure { + + private readonly string manufacturerName; + private readonly string productName; + private readonly string version; + private readonly string serialNumber; + private readonly string family; + + public SystemInformation(string manufacturerName, string productName, + string version, string serialNumber, string family) + : base (0x01, 0, null, null) + { + this.manufacturerName = manufacturerName; + this.productName = productName; + this.version = version; + this.serialNumber = serialNumber; + this.family = family; + } + + public SystemInformation(byte type, ushort handle, byte[] data, + string[] strings) + : base(type, handle, data, strings) + { + this.manufacturerName = GetString(0x04); + this.productName = GetString(0x05); + this.version = GetString(0x06); + this.serialNumber = GetString(0x07); + this.family = GetString(0x1A); + } + + public string ManufacturerName { get { return manufacturerName; } } + + public string ProductName { get { return productName; } } + + public string Version { get { return version; } } + + public string SerialNumber { get { return serialNumber; } } + + public string Family { get { return family; } } + + } + + public class BaseBoardInformation : Structure { + + private readonly string manufacturerName; + private readonly string productName; + private readonly string version; + private readonly string serialNumber; + + public BaseBoardInformation(string manufacturerName, string productName, + string version, string serialNumber) + : base(0x02, 0, null, null) + { + this.manufacturerName = manufacturerName; + this.productName = productName; + this.version = version; + this.serialNumber = serialNumber; + } + + public BaseBoardInformation(byte type, ushort handle, byte[] data, + string[] strings) + : base(type, handle, data, strings) { + + this.manufacturerName = GetString(0x04).Trim(); + this.productName = GetString(0x05).Trim(); + this.version = GetString(0x06).Trim(); + this.serialNumber = GetString(0x07).Trim(); + } + + public string ManufacturerName { get { return manufacturerName; } } + + public string ProductName { get { return productName; } } + + public string Version { get { return version; } } + + public string SerialNumber { get { return serialNumber; } } + + } + + public class MemoryDevice : Structure { + + 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; + } + + public MemoryDevice(byte type, ushort handle, byte[] data, + string[] strings) + : base(type, handle, data, strings) { + this.manufacturerName = GetString(0x17).Trim(); + this.serialNumber = GetString(0x18).Trim(); + this.partNumber = GetString(0x1A).Trim(); + } + + public string ManufacturerName { get { return manufacturerName; } } + + public string SerialNumber { get { return serialNumber; } } + + public string PartNumber { get { return partNumber; } } + + } + } +} diff -r 5077ed7ddca8 -r 8e4dedc41924 OpenHardwareMonitorLib.csproj --- a/OpenHardwareMonitorLib.csproj Sun Jul 22 18:07:11 2012 +0000 +++ b/OpenHardwareMonitorLib.csproj Mon Jul 23 21:54:35 2012 +0000 @@ -52,6 +52,7 @@ AllRules.ruleset + @@ -91,8 +92,11 @@ + + + @@ -120,7 +124,7 @@ - + diff -r 5077ed7ddca8 -r 8e4dedc41924 Utilities/HttpServer.cs --- a/Utilities/HttpServer.cs Sun Jul 22 18:07:11 2012 +0000 +++ b/Utilities/HttpServer.cs Mon Jul 23 21:54:35 2012 +0000 @@ -315,6 +315,8 @@ return "chip.png"; case HardwareType.TBalancer: return "bigng.png"; + case HardwareType.RAM: + return "chip.png"; default: return "cpu.png"; }