From 5bd108167ddad48d824cc0c858f46772492d32de Mon Sep 17 00:00:00 2001 From: Phyxion <7643972+Phyxion@users.noreply.github.com> Date: Fri, 28 Feb 2020 11:39:25 +0100 Subject: [PATCH] Restore OHM in copyright statement --- LibreHardwareMonitor/Program.cs | 7 +- .../Properties/AssemblyInfo.cs | 7 +- LibreHardwareMonitor/UI/AboutBox.Designer.cs | 7 +- LibreHardwareMonitor/UI/AboutBox.cs | 7 +- LibreHardwareMonitor/UI/Gadget.cs | 7 +- LibreHardwareMonitor/UI/GadgetWindow.cs | 7 +- LibreHardwareMonitor/UI/HardwareNode.cs | 7 +- LibreHardwareMonitor/UI/HardwareTypeImage.cs | 7 +- LibreHardwareMonitor/UI/MainForm.Designer.cs | 7 +- LibreHardwareMonitor/UI/MainForm.cs | 11 +- LibreHardwareMonitor/UI/Node.cs | 7 +- LibreHardwareMonitor/UI/NotifyIconAdv.cs | 7 +- .../UI/ParameterForm.Designer.cs | 7 +- LibreHardwareMonitor/UI/ParameterForm.cs | 7 +- LibreHardwareMonitor/UI/PlotPanel.cs | 7 +- LibreHardwareMonitor/UI/PortForm.Designer.cs | 7 +- LibreHardwareMonitor/UI/PortForm.cs | 7 +- LibreHardwareMonitor/UI/SensorGadget.cs | 7 +- LibreHardwareMonitor/UI/SensorNode.cs | 7 +- LibreHardwareMonitor/UI/SensorNotifyIcon.cs | 7 +- LibreHardwareMonitor/UI/ShowDesktop.cs | 7 +- LibreHardwareMonitor/UI/SplitContainerAdv.cs | 7 +- LibreHardwareMonitor/UI/StartupManager.cs | 7 +- LibreHardwareMonitor/UI/SystemTray.cs | 7 +- LibreHardwareMonitor/UI/TreeModel.cs | 7 +- LibreHardwareMonitor/UI/TypeNode.cs | 7 +- LibreHardwareMonitor/UI/UnitManager.cs | 7 +- LibreHardwareMonitor/UI/UpdateVisitor.cs | 7 +- LibreHardwareMonitor/UI/UserOption.cs | 7 +- LibreHardwareMonitor/UI/UserRadioGroup.cs | 7 +- .../Utilities/EmbeddedResources.cs | 7 +- LibreHardwareMonitor/Utilities/HttpServer.cs | 7 +- LibreHardwareMonitor/Utilities/IconFactory.cs | 7 +- LibreHardwareMonitor/Utilities/Logger.cs | 7 +- .../Utilities/PersistentSettings.cs | 7 +- LibreHardwareMonitor/WMI/Hardware.cs | 7 +- LibreHardwareMonitor/WMI/IWmiObject.cs | 7 +- LibreHardwareMonitor/WMI/Sensor.cs | 7 +- LibreHardwareMonitor/WMI/WmiProvider.cs | 7 +- LibreHardwareMonitorLib/Hardware/Computer.cs | 7 +- LibreHardwareMonitorLib/Hardware/Control.cs | 7 +- .../AquaComputer/AquaComputerGroup.cs | 6 +- .../Controller/AquaComputer/AquastreamXT.cs | 6 +- .../Hardware/Controller/AquaComputer/MPS.cs | 6 +- .../Controller/Heatmaster/Heatmaster.cs | 7 +- .../Controller/Heatmaster/HeatmasterGroup.cs | 7 +- .../Controller/TBalancer/TBalancer.cs | 7 +- .../Controller/TBalancer/TBalancerGroup.cs | 7 +- .../Hardware/Cpu/Amd0FCpu.cs | 7 +- .../Hardware/Cpu/Amd10Cpu.cs | 7 +- .../Hardware/Cpu/Amd17Cpu.cs | 12 +-- .../Hardware/Cpu/AmdCpu.cs | 7 +- .../Hardware/Cpu/CpuGroup.cs | 7 +- LibreHardwareMonitorLib/Hardware/Cpu/CpuId.cs | 7 +- .../Hardware/Cpu/CpuLoad.cs | 7 +- .../Hardware/Cpu/GenericCpu.cs | 7 +- .../Hardware/Cpu/IntelCpu.cs | 7 +- .../Hardware/FirmwareTable.cs | 7 +- .../Hardware/Gpu/AmdGpu.cs | 7 +- .../Hardware/Gpu/AmdGpuGroup.cs | 7 +- .../Hardware/Gpu/NvidiaGpu.cs | 7 +- .../Hardware/Gpu/NvidiaGroup.cs | 7 +- LibreHardwareMonitorLib/Hardware/Hardware.cs | 7 +- LibreHardwareMonitorLib/Hardware/IComputer.cs | 7 +- LibreHardwareMonitorLib/Hardware/IControl.cs | 7 +- LibreHardwareMonitorLib/Hardware/IElement.cs | 7 +- LibreHardwareMonitorLib/Hardware/IGroup.cs | 7 +- LibreHardwareMonitorLib/Hardware/IHardware.cs | 7 +- .../Hardware/IParameter.cs | 7 +- LibreHardwareMonitorLib/Hardware/ISensor.cs | 7 +- LibreHardwareMonitorLib/Hardware/ISettings.cs | 7 +- LibreHardwareMonitorLib/Hardware/IVisitor.cs | 7 +- .../Hardware/Identifier.cs | 7 +- .../Hardware/KernelDriver.cs | 7 +- .../Hardware/Memory/GenericMemory.cs | 7 +- .../Hardware/Memory/MemoryGroup.cs | 7 +- .../Hardware/Motherboard/Identification.cs | 7 +- .../Hardware/Motherboard/Lpc/Chip.cs | 16 +-- .../Hardware/Motherboard/Lpc/F718XX.cs | 57 ++++++++-- .../Hardware/Motherboard/Lpc/ISuperIO.cs | 7 +- .../Hardware/Motherboard/Lpc/IT87XX.cs | 73 +++++-------- .../Hardware/Motherboard/Lpc/LMSensors.cs | 7 +- .../Hardware/Motherboard/Lpc/LPcPort.cs | 15 ++- .../Hardware/Motherboard/Lpc/LpcIO.cs | 43 +++++--- .../Hardware/Motherboard/Lpc/Nct677X.cs | 47 ++++---- .../Hardware/Motherboard/Lpc/W836XX.cs | 7 +- .../Hardware/Motherboard/Manufacturer.cs | 7 +- .../Hardware/Motherboard/Model.cs | 7 +- .../Hardware/Motherboard/Motherboard.cs | 7 +- .../Hardware/Motherboard/MotherboardGroup.cs | 7 +- .../Hardware/Motherboard/SuperIOHardware.cs | 101 +++++++++--------- .../Hardware/Network/Network.cs | 6 +- .../Hardware/Network/NetworkGroup.cs | 6 +- LibreHardwareMonitorLib/Hardware/OpCode.cs | 7 +- LibreHardwareMonitorLib/Hardware/Parameter.cs | 7 +- .../Hardware/ParameterDescription.cs | 7 +- LibreHardwareMonitorLib/Hardware/Ring0.cs | 7 +- LibreHardwareMonitorLib/Hardware/SMBios.cs | 7 +- LibreHardwareMonitorLib/Hardware/Sensor.cs | 7 +- .../Hardware/SensorVisitor.cs | 7 +- .../Hardware/Storage/ATAStorage.cs | 7 +- .../Hardware/Storage/AbstractStorage.cs | 6 +- .../Hardware/Storage/DebugSmart.cs | 7 +- .../Hardware/Storage/GenericHardDisk.cs | 7 +- .../Hardware/Storage/INVMeDrive.cs | 6 +- .../Hardware/Storage/ISmart.cs | 7 +- .../Hardware/Storage/NVMeGeneric.cs | 6 +- .../Hardware/Storage/NVMeHealthInfo.cs | 6 +- .../Hardware/Storage/NVMeInfo.cs | 6 +- .../Hardware/Storage/NVMeIntel.cs | 6 +- .../Hardware/Storage/NVMeIntelRst.cs | 6 +- .../Hardware/Storage/NVMeSamsung.cs | 6 +- .../Hardware/Storage/NVMeSmart.cs | 6 +- .../Hardware/Storage/NVMeWindows.cs | 6 +- .../Hardware/Storage/NamePrefixAttribute.cs | 7 +- .../Hardware/Storage/RequireSmartAttribute.cs | 7 +- .../Hardware/Storage/SmartAttribute.cs | 7 +- .../Hardware/Storage/SmartNames.cs | 7 +- .../Hardware/Storage/SsdIndilinx.cs | 7 +- .../Hardware/Storage/SsdIntel.cs | 7 +- .../Hardware/Storage/SsdMicron.cs | 7 +- .../Hardware/Storage/SsdPlextor.cs | 7 +- .../Hardware/Storage/SsdSamsung.cs | 7 +- .../Hardware/Storage/SsdSandforce.cs | 7 +- .../Hardware/Storage/StorageGeneric.cs | 7 +- .../Hardware/Storage/StorageGroup.cs | 7 +- .../Hardware/Storage/StorageInfo.cs | 7 +- .../Hardware/Storage/WindowsSmart.cs | 7 +- .../Hardware/Storage/WindowsStorage.cs | 6 +- .../Hardware/ThreadAffinity.cs | 7 +- LibreHardwareMonitorLib/Interop/AdvApi32.cs | 6 +- LibreHardwareMonitorLib/Interop/AtiAdlxx.cs | 6 +- LibreHardwareMonitorLib/Interop/Ftd2xx.cs | 6 +- LibreHardwareMonitorLib/Interop/Kernel32.cs | 6 +- LibreHardwareMonitorLib/Interop/LibC.cs | 6 +- LibreHardwareMonitorLib/Interop/NtDll.cs | 6 +- LibreHardwareMonitorLib/Interop/NvApi.cs | 6 +- LibreHardwareMonitorLib/Interop/NvidiaML.cs | 6 +- LibreHardwareMonitorLib/Interop/Ring0.cs | 6 +- .../Properties/AssemblyLibInfo.cs | 7 +- .../Properties/AssemblyVersion.cs | 7 +- .../Software/OperatingSystem.cs | 7 +- 142 files changed, 717 insertions(+), 564 deletions(-) diff --git a/LibreHardwareMonitor/Program.cs b/LibreHardwareMonitor/Program.cs index db6cac8..25ce6f2 100644 --- a/LibreHardwareMonitor/Program.cs +++ b/LibreHardwareMonitor/Program.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.IO; diff --git a/LibreHardwareMonitor/Properties/AssemblyInfo.cs b/LibreHardwareMonitor/Properties/AssemblyInfo.cs index 2df975d..4195231 100644 --- a/LibreHardwareMonitor/Properties/AssemblyInfo.cs +++ b/LibreHardwareMonitor/Properties/AssemblyInfo.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Reflection; using System.Runtime.InteropServices; diff --git a/LibreHardwareMonitor/UI/AboutBox.Designer.cs b/LibreHardwareMonitor/UI/AboutBox.Designer.cs index d501fba..1e4e17c 100644 --- a/LibreHardwareMonitor/UI/AboutBox.Designer.cs +++ b/LibreHardwareMonitor/UI/AboutBox.Designer.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. namespace LibreHardwareMonitor.UI { diff --git a/LibreHardwareMonitor/UI/AboutBox.cs b/LibreHardwareMonitor/UI/AboutBox.cs index a486b0c..d664227 100644 --- a/LibreHardwareMonitor/UI/AboutBox.cs +++ b/LibreHardwareMonitor/UI/AboutBox.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Diagnostics; using System.Drawing; diff --git a/LibreHardwareMonitor/UI/Gadget.cs b/LibreHardwareMonitor/UI/Gadget.cs index b978bca..d711822 100644 --- a/LibreHardwareMonitor/UI/Gadget.cs +++ b/LibreHardwareMonitor/UI/Gadget.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Drawing; diff --git a/LibreHardwareMonitor/UI/GadgetWindow.cs b/LibreHardwareMonitor/UI/GadgetWindow.cs index 1b049cc..f67990a 100644 --- a/LibreHardwareMonitor/UI/GadgetWindow.cs +++ b/LibreHardwareMonitor/UI/GadgetWindow.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Drawing; diff --git a/LibreHardwareMonitor/UI/HardwareNode.cs b/LibreHardwareMonitor/UI/HardwareNode.cs index 2812739..41374b5 100644 --- a/LibreHardwareMonitor/UI/HardwareNode.cs +++ b/LibreHardwareMonitor/UI/HardwareNode.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitor/UI/HardwareTypeImage.cs b/LibreHardwareMonitor/UI/HardwareTypeImage.cs index 8a433b2..4019fc9 100644 --- a/LibreHardwareMonitor/UI/HardwareTypeImage.cs +++ b/LibreHardwareMonitor/UI/HardwareTypeImage.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Drawing; using System.Collections.Generic; diff --git a/LibreHardwareMonitor/UI/MainForm.Designer.cs b/LibreHardwareMonitor/UI/MainForm.Designer.cs index c634c55..431e91e 100644 --- a/LibreHardwareMonitor/UI/MainForm.Designer.cs +++ b/LibreHardwareMonitor/UI/MainForm.Designer.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. namespace LibreHardwareMonitor.UI { diff --git a/LibreHardwareMonitor/UI/MainForm.cs b/LibreHardwareMonitor/UI/MainForm.cs index 9a2d935..c80fbe8 100644 --- a/LibreHardwareMonitor/UI/MainForm.cs +++ b/LibreHardwareMonitor/UI/MainForm.cs @@ -1,11 +1,11 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; -using System.Collections.ObjectModel; using System.ComponentModel; using System.Drawing; using System.IO; @@ -67,8 +67,7 @@ namespace LibreHardwareMonitor.UI // check if the LibreHardwareMonitorLib assembly has the correct version if (Assembly.GetAssembly(typeof(Computer)).GetName().Version != Assembly.GetExecutingAssembly().GetName().Version) { - MessageBox.Show("The version of the file LibreHardwareMonitorLib.dll is incompatible.", - "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("The version of the file LibreHardwareMonitorLib.dll is incompatible.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); Environment.Exit(0); } diff --git a/LibreHardwareMonitor/UI/Node.cs b/LibreHardwareMonitor/UI/Node.cs index 64bebc4..df30b02 100644 --- a/LibreHardwareMonitor/UI/Node.cs +++ b/LibreHardwareMonitor/UI/Node.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.ObjectModel; diff --git a/LibreHardwareMonitor/UI/NotifyIconAdv.cs b/LibreHardwareMonitor/UI/NotifyIconAdv.cs index 67d00e8..1164dc7 100644 --- a/LibreHardwareMonitor/UI/NotifyIconAdv.cs +++ b/LibreHardwareMonitor/UI/NotifyIconAdv.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.ComponentModel; diff --git a/LibreHardwareMonitor/UI/ParameterForm.Designer.cs b/LibreHardwareMonitor/UI/ParameterForm.Designer.cs index 33cc566..ae6ee44 100644 --- a/LibreHardwareMonitor/UI/ParameterForm.Designer.cs +++ b/LibreHardwareMonitor/UI/ParameterForm.Designer.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. namespace LibreHardwareMonitor.UI { diff --git a/LibreHardwareMonitor/UI/ParameterForm.cs b/LibreHardwareMonitor/UI/ParameterForm.cs index 4bfa3bf..0a7c79b 100644 --- a/LibreHardwareMonitor/UI/ParameterForm.cs +++ b/LibreHardwareMonitor/UI/ParameterForm.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitor/UI/PlotPanel.cs b/LibreHardwareMonitor/UI/PlotPanel.cs index 5c1c6e0..a26c94f 100644 --- a/LibreHardwareMonitor/UI/PlotPanel.cs +++ b/LibreHardwareMonitor/UI/PlotPanel.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitor/UI/PortForm.Designer.cs b/LibreHardwareMonitor/UI/PortForm.Designer.cs index 3f5f517..d326dd8 100644 --- a/LibreHardwareMonitor/UI/PortForm.Designer.cs +++ b/LibreHardwareMonitor/UI/PortForm.Designer.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. namespace LibreHardwareMonitor.UI { diff --git a/LibreHardwareMonitor/UI/PortForm.cs b/LibreHardwareMonitor/UI/PortForm.cs index d82ff58..dd569e5 100644 --- a/LibreHardwareMonitor/UI/PortForm.cs +++ b/LibreHardwareMonitor/UI/PortForm.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Windows.Forms; diff --git a/LibreHardwareMonitor/UI/SensorGadget.cs b/LibreHardwareMonitor/UI/SensorGadget.cs index 710d7df..0e25882 100644 --- a/LibreHardwareMonitor/UI/SensorGadget.cs +++ b/LibreHardwareMonitor/UI/SensorGadget.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitor/UI/SensorNode.cs b/LibreHardwareMonitor/UI/SensorNode.cs index 8533b1e..0c0f6c5 100644 --- a/LibreHardwareMonitor/UI/SensorNode.cs +++ b/LibreHardwareMonitor/UI/SensorNode.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Drawing; diff --git a/LibreHardwareMonitor/UI/SensorNotifyIcon.cs b/LibreHardwareMonitor/UI/SensorNotifyIcon.cs index 943d402..c226ba9 100644 --- a/LibreHardwareMonitor/UI/SensorNotifyIcon.cs +++ b/LibreHardwareMonitor/UI/SensorNotifyIcon.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Drawing; diff --git a/LibreHardwareMonitor/UI/ShowDesktop.cs b/LibreHardwareMonitor/UI/ShowDesktop.cs index a52705d..8ee34c0 100644 --- a/LibreHardwareMonitor/UI/ShowDesktop.cs +++ b/LibreHardwareMonitor/UI/ShowDesktop.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Runtime.InteropServices; diff --git a/LibreHardwareMonitor/UI/SplitContainerAdv.cs b/LibreHardwareMonitor/UI/SplitContainerAdv.cs index 415f4a4..d6c592d 100644 --- a/LibreHardwareMonitor/UI/SplitContainerAdv.cs +++ b/LibreHardwareMonitor/UI/SplitContainerAdv.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Drawing; diff --git a/LibreHardwareMonitor/UI/StartupManager.cs b/LibreHardwareMonitor/UI/StartupManager.cs index 41332c6..f59f8ef 100644 --- a/LibreHardwareMonitor/UI/StartupManager.cs +++ b/LibreHardwareMonitor/UI/StartupManager.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.IO; diff --git a/LibreHardwareMonitor/UI/SystemTray.cs b/LibreHardwareMonitor/UI/SystemTray.cs index 0466fbf..57e0700 100644 --- a/LibreHardwareMonitor/UI/SystemTray.cs +++ b/LibreHardwareMonitor/UI/SystemTray.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitor/UI/TreeModel.cs b/LibreHardwareMonitor/UI/TreeModel.cs index ead3b8f..9a7b6f4 100644 --- a/LibreHardwareMonitor/UI/TreeModel.cs +++ b/LibreHardwareMonitor/UI/TreeModel.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections; diff --git a/LibreHardwareMonitor/UI/TypeNode.cs b/LibreHardwareMonitor/UI/TypeNode.cs index c99651f..6a06768 100644 --- a/LibreHardwareMonitor/UI/TypeNode.cs +++ b/LibreHardwareMonitor/UI/TypeNode.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using LibreHardwareMonitor.Hardware; diff --git a/LibreHardwareMonitor/UI/UnitManager.cs b/LibreHardwareMonitor/UI/UnitManager.cs index 22c3358..9e1ade9 100644 --- a/LibreHardwareMonitor/UI/UnitManager.cs +++ b/LibreHardwareMonitor/UI/UnitManager.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using LibreHardwareMonitor.Utilities; diff --git a/LibreHardwareMonitor/UI/UpdateVisitor.cs b/LibreHardwareMonitor/UI/UpdateVisitor.cs index ef1ce8e..c11459f 100644 --- a/LibreHardwareMonitor/UI/UpdateVisitor.cs +++ b/LibreHardwareMonitor/UI/UpdateVisitor.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using LibreHardwareMonitor.Hardware; diff --git a/LibreHardwareMonitor/UI/UserOption.cs b/LibreHardwareMonitor/UI/UserOption.cs index e34ac7f..529ce34 100644 --- a/LibreHardwareMonitor/UI/UserOption.cs +++ b/LibreHardwareMonitor/UI/UserOption.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Windows.Forms; diff --git a/LibreHardwareMonitor/UI/UserRadioGroup.cs b/LibreHardwareMonitor/UI/UserRadioGroup.cs index 651e4aa..399ab07 100644 --- a/LibreHardwareMonitor/UI/UserRadioGroup.cs +++ b/LibreHardwareMonitor/UI/UserRadioGroup.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Windows.Forms; diff --git a/LibreHardwareMonitor/Utilities/EmbeddedResources.cs b/LibreHardwareMonitor/Utilities/EmbeddedResources.cs index 49f2d0c..ca36d59 100644 --- a/LibreHardwareMonitor/Utilities/EmbeddedResources.cs +++ b/LibreHardwareMonitor/Utilities/EmbeddedResources.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Drawing; using System.IO; diff --git a/LibreHardwareMonitor/Utilities/HttpServer.cs b/LibreHardwareMonitor/Utilities/HttpServer.cs index 3b0858d..21d5ccb 100644 --- a/LibreHardwareMonitor/Utilities/HttpServer.cs +++ b/LibreHardwareMonitor/Utilities/HttpServer.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Drawing; diff --git a/LibreHardwareMonitor/Utilities/IconFactory.cs b/LibreHardwareMonitor/Utilities/IconFactory.cs index 9b85afe..cad6aaf 100644 --- a/LibreHardwareMonitor/Utilities/IconFactory.cs +++ b/LibreHardwareMonitor/Utilities/IconFactory.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Drawing; diff --git a/LibreHardwareMonitor/Utilities/Logger.cs b/LibreHardwareMonitor/Utilities/Logger.cs index adc6cd6..bb67914 100644 --- a/LibreHardwareMonitor/Utilities/Logger.cs +++ b/LibreHardwareMonitor/Utilities/Logger.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitor/Utilities/PersistentSettings.cs b/LibreHardwareMonitor/Utilities/PersistentSettings.cs index ca66b47..16737aa 100644 --- a/LibreHardwareMonitor/Utilities/PersistentSettings.cs +++ b/LibreHardwareMonitor/Utilities/PersistentSettings.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Collections.Generic; using System.Drawing; diff --git a/LibreHardwareMonitor/WMI/Hardware.cs b/LibreHardwareMonitor/WMI/Hardware.cs index 77f4d44..678aef9 100644 --- a/LibreHardwareMonitor/WMI/Hardware.cs +++ b/LibreHardwareMonitor/WMI/Hardware.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Management.Instrumentation; using LibreHardwareMonitor.Hardware; diff --git a/LibreHardwareMonitor/WMI/IWmiObject.cs b/LibreHardwareMonitor/WMI/IWmiObject.cs index 6f63390..bebc028 100644 --- a/LibreHardwareMonitor/WMI/IWmiObject.cs +++ b/LibreHardwareMonitor/WMI/IWmiObject.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. namespace LibreHardwareMonitor.Wmi { diff --git a/LibreHardwareMonitor/WMI/Sensor.cs b/LibreHardwareMonitor/WMI/Sensor.cs index b49f625..1b9520f 100644 --- a/LibreHardwareMonitor/WMI/Sensor.cs +++ b/LibreHardwareMonitor/WMI/Sensor.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Management.Instrumentation; using LibreHardwareMonitor.Hardware; diff --git a/LibreHardwareMonitor/WMI/WmiProvider.cs b/LibreHardwareMonitor/WMI/WmiProvider.cs index 9f48e3b..ab2f3d4 100644 --- a/LibreHardwareMonitor/WMI/WmiProvider.cs +++ b/LibreHardwareMonitor/WMI/WmiProvider.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/Computer.cs b/LibreHardwareMonitorLib/Hardware/Computer.cs index a1c8334..b60eaa5 100644 --- a/LibreHardwareMonitorLib/Hardware/Computer.cs +++ b/LibreHardwareMonitorLib/Hardware/Computer.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/Control.cs b/LibreHardwareMonitorLib/Hardware/Control.cs index 05faf0b..efd9be7 100644 --- a/LibreHardwareMonitorLib/Hardware/Control.cs +++ b/LibreHardwareMonitorLib/Hardware/Control.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Globalization; diff --git a/LibreHardwareMonitorLib/Hardware/Controller/AquaComputer/AquaComputerGroup.cs b/LibreHardwareMonitorLib/Hardware/Controller/AquaComputer/AquaComputerGroup.cs index 705e54b..13b190d 100644 --- a/LibreHardwareMonitorLib/Hardware/Controller/AquaComputer/AquaComputerGroup.cs +++ b/LibreHardwareMonitorLib/Hardware/Controller/AquaComputer/AquaComputerGroup.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. using System.Collections.Generic; using System.Text; diff --git a/LibreHardwareMonitorLib/Hardware/Controller/AquaComputer/AquastreamXT.cs b/LibreHardwareMonitorLib/Hardware/Controller/AquaComputer/AquastreamXT.cs index 402fc33..c250794 100644 --- a/LibreHardwareMonitorLib/Hardware/Controller/AquaComputer/AquastreamXT.cs +++ b/LibreHardwareMonitorLib/Hardware/Controller/AquaComputer/AquastreamXT.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. using System; using System.Diagnostics.CodeAnalysis; diff --git a/LibreHardwareMonitorLib/Hardware/Controller/AquaComputer/MPS.cs b/LibreHardwareMonitorLib/Hardware/Controller/AquaComputer/MPS.cs index 954c580..dfc0e59 100644 --- a/LibreHardwareMonitorLib/Hardware/Controller/AquaComputer/MPS.cs +++ b/LibreHardwareMonitorLib/Hardware/Controller/AquaComputer/MPS.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. using System; using HidLibrary; diff --git a/LibreHardwareMonitorLib/Hardware/Controller/Heatmaster/Heatmaster.cs b/LibreHardwareMonitorLib/Hardware/Controller/Heatmaster/Heatmaster.cs index eafbfbd..15727b5 100644 --- a/LibreHardwareMonitorLib/Hardware/Controller/Heatmaster/Heatmaster.cs +++ b/LibreHardwareMonitorLib/Hardware/Controller/Heatmaster/Heatmaster.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Globalization; diff --git a/LibreHardwareMonitorLib/Hardware/Controller/Heatmaster/HeatmasterGroup.cs b/LibreHardwareMonitorLib/Hardware/Controller/Heatmaster/HeatmasterGroup.cs index 6c5689b..267ea4b 100644 --- a/LibreHardwareMonitorLib/Hardware/Controller/Heatmaster/HeatmasterGroup.cs +++ b/LibreHardwareMonitorLib/Hardware/Controller/Heatmaster/HeatmasterGroup.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/Controller/TBalancer/TBalancer.cs b/LibreHardwareMonitorLib/Hardware/Controller/TBalancer/TBalancer.cs index 62ef521..aff562d 100644 --- a/LibreHardwareMonitorLib/Hardware/Controller/TBalancer/TBalancer.cs +++ b/LibreHardwareMonitorLib/Hardware/Controller/TBalancer/TBalancer.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Collections.Generic; using System.Globalization; diff --git a/LibreHardwareMonitorLib/Hardware/Controller/TBalancer/TBalancerGroup.cs b/LibreHardwareMonitorLib/Hardware/Controller/TBalancer/TBalancerGroup.cs index de7a590..3f50e41 100644 --- a/LibreHardwareMonitorLib/Hardware/Controller/TBalancer/TBalancerGroup.cs +++ b/LibreHardwareMonitorLib/Hardware/Controller/TBalancer/TBalancerGroup.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/Cpu/Amd0FCpu.cs b/LibreHardwareMonitorLib/Hardware/Cpu/Amd0FCpu.cs index b671479..b5a50a2 100644 --- a/LibreHardwareMonitorLib/Hardware/Cpu/Amd0FCpu.cs +++ b/LibreHardwareMonitorLib/Hardware/Cpu/Amd0FCpu.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Globalization; using System.Text; diff --git a/LibreHardwareMonitorLib/Hardware/Cpu/Amd10Cpu.cs b/LibreHardwareMonitorLib/Hardware/Cpu/Amd10Cpu.cs index 2207c97..62fe6e7 100644 --- a/LibreHardwareMonitorLib/Hardware/Cpu/Amd10Cpu.cs +++ b/LibreHardwareMonitorLib/Hardware/Cpu/Amd10Cpu.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/Cpu/Amd17Cpu.cs b/LibreHardwareMonitorLib/Hardware/Cpu/Amd17Cpu.cs index 0f4bb5e..eae4dfc 100644 --- a/LibreHardwareMonitorLib/Hardware/Cpu/Amd17Cpu.cs +++ b/LibreHardwareMonitorLib/Hardware/Cpu/Amd17Cpu.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; @@ -274,7 +274,7 @@ namespace LibreHardwareMonitor.Hardware.CPU if (_ccdTemperatures[i] == null) { - _hw.ActivateSensor(_ccdTemperatures[i] = new Sensor($"Core CCD{i + 1} (Tdie)", + _hw.ActivateSensor(_ccdTemperatures[i] = new Sensor($"CCD{i + 1} (Tdie)", _hw._sensorTemperatures++, SensorType.Temperature, _hw, @@ -291,7 +291,7 @@ namespace LibreHardwareMonitor.Hardware.CPU if (_ccdsMaxTemperature == null) { - _hw.ActivateSensor(_ccdsMaxTemperature = new Sensor("Core CCDs Max (Tdie)", + _hw.ActivateSensor(_ccdsMaxTemperature = new Sensor("CCDs Max (Tdie)", _hw._sensorTemperatures++, SensorType.Temperature, _hw, @@ -300,7 +300,7 @@ namespace LibreHardwareMonitor.Hardware.CPU if (_ccdsAverageTemperature == null) { - _hw.ActivateSensor(_ccdsAverageTemperature = new Sensor("Core CCDs Average (Tdie)", + _hw.ActivateSensor(_ccdsAverageTemperature = new Sensor("CCDs Average (Tdie)", _hw._sensorTemperatures++, SensorType.Temperature, _hw, diff --git a/LibreHardwareMonitorLib/Hardware/Cpu/AmdCpu.cs b/LibreHardwareMonitorLib/Hardware/Cpu/AmdCpu.cs index d663ae9..c64ec65 100644 --- a/LibreHardwareMonitorLib/Hardware/Cpu/AmdCpu.cs +++ b/LibreHardwareMonitorLib/Hardware/Cpu/AmdCpu.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. namespace LibreHardwareMonitor.Hardware.CPU { diff --git a/LibreHardwareMonitorLib/Hardware/Cpu/CpuGroup.cs b/LibreHardwareMonitorLib/Hardware/Cpu/CpuGroup.cs index 4480fe7..e050613 100644 --- a/LibreHardwareMonitorLib/Hardware/Cpu/CpuGroup.cs +++ b/LibreHardwareMonitorLib/Hardware/Cpu/CpuGroup.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/Cpu/CpuId.cs b/LibreHardwareMonitorLib/Hardware/Cpu/CpuId.cs index 939c877..e3c6038 100644 --- a/LibreHardwareMonitorLib/Hardware/Cpu/CpuId.cs +++ b/LibreHardwareMonitorLib/Hardware/Cpu/CpuId.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Text; diff --git a/LibreHardwareMonitorLib/Hardware/Cpu/CpuLoad.cs b/LibreHardwareMonitorLib/Hardware/Cpu/CpuLoad.cs index 941568d..51aef00 100644 --- a/LibreHardwareMonitorLib/Hardware/Cpu/CpuLoad.cs +++ b/LibreHardwareMonitorLib/Hardware/Cpu/CpuLoad.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Runtime.InteropServices; diff --git a/LibreHardwareMonitorLib/Hardware/Cpu/GenericCpu.cs b/LibreHardwareMonitorLib/Hardware/Cpu/GenericCpu.cs index bbf4618..6a6ed6f 100644 --- a/LibreHardwareMonitorLib/Hardware/Cpu/GenericCpu.cs +++ b/LibreHardwareMonitorLib/Hardware/Cpu/GenericCpu.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Diagnostics; diff --git a/LibreHardwareMonitorLib/Hardware/Cpu/IntelCpu.cs b/LibreHardwareMonitorLib/Hardware/Cpu/IntelCpu.cs index 3848de0..cd25da3 100644 --- a/LibreHardwareMonitorLib/Hardware/Cpu/IntelCpu.cs +++ b/LibreHardwareMonitorLib/Hardware/Cpu/IntelCpu.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Diagnostics.CodeAnalysis; diff --git a/LibreHardwareMonitorLib/Hardware/FirmwareTable.cs b/LibreHardwareMonitorLib/Hardware/FirmwareTable.cs index 565d7fb..1ebd1be 100644 --- a/LibreHardwareMonitorLib/Hardware/FirmwareTable.cs +++ b/LibreHardwareMonitorLib/Hardware/FirmwareTable.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Runtime.InteropServices; diff --git a/LibreHardwareMonitorLib/Hardware/Gpu/AmdGpu.cs b/LibreHardwareMonitorLib/Hardware/Gpu/AmdGpu.cs index 710d88a..84044bd 100644 --- a/LibreHardwareMonitorLib/Hardware/Gpu/AmdGpu.cs +++ b/LibreHardwareMonitorLib/Hardware/Gpu/AmdGpu.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Globalization; diff --git a/LibreHardwareMonitorLib/Hardware/Gpu/AmdGpuGroup.cs b/LibreHardwareMonitorLib/Hardware/Gpu/AmdGpuGroup.cs index 423f848..5f22e34 100644 --- a/LibreHardwareMonitorLib/Hardware/Gpu/AmdGpuGroup.cs +++ b/LibreHardwareMonitorLib/Hardware/Gpu/AmdGpuGroup.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/Gpu/NvidiaGpu.cs b/LibreHardwareMonitorLib/Hardware/Gpu/NvidiaGpu.cs index fd7e7b2..9a95cd7 100644 --- a/LibreHardwareMonitorLib/Hardware/Gpu/NvidiaGpu.cs +++ b/LibreHardwareMonitorLib/Hardware/Gpu/NvidiaGpu.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Globalization; diff --git a/LibreHardwareMonitorLib/Hardware/Gpu/NvidiaGroup.cs b/LibreHardwareMonitorLib/Hardware/Gpu/NvidiaGroup.cs index 27aadfe..00282fb 100644 --- a/LibreHardwareMonitorLib/Hardware/Gpu/NvidiaGroup.cs +++ b/LibreHardwareMonitorLib/Hardware/Gpu/NvidiaGroup.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Collections.Generic; using System.Globalization; diff --git a/LibreHardwareMonitorLib/Hardware/Hardware.cs b/LibreHardwareMonitorLib/Hardware/Hardware.cs index 2f11396..f04364d 100644 --- a/LibreHardwareMonitorLib/Hardware/Hardware.cs +++ b/LibreHardwareMonitorLib/Hardware/Hardware.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/IComputer.cs b/LibreHardwareMonitorLib/Hardware/IComputer.cs index f987d34..7d82e68 100644 --- a/LibreHardwareMonitorLib/Hardware/IComputer.cs +++ b/LibreHardwareMonitorLib/Hardware/IComputer.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. namespace LibreHardwareMonitor.Hardware { diff --git a/LibreHardwareMonitorLib/Hardware/IControl.cs b/LibreHardwareMonitorLib/Hardware/IControl.cs index a8e7096..23cf096 100644 --- a/LibreHardwareMonitorLib/Hardware/IControl.cs +++ b/LibreHardwareMonitorLib/Hardware/IControl.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. namespace LibreHardwareMonitor.Hardware { diff --git a/LibreHardwareMonitorLib/Hardware/IElement.cs b/LibreHardwareMonitorLib/Hardware/IElement.cs index 3e0c477..552be59 100644 --- a/LibreHardwareMonitorLib/Hardware/IElement.cs +++ b/LibreHardwareMonitorLib/Hardware/IElement.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. namespace LibreHardwareMonitor.Hardware { diff --git a/LibreHardwareMonitorLib/Hardware/IGroup.cs b/LibreHardwareMonitorLib/Hardware/IGroup.cs index 89fef67..2b917a8 100644 --- a/LibreHardwareMonitorLib/Hardware/IGroup.cs +++ b/LibreHardwareMonitorLib/Hardware/IGroup.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/IHardware.cs b/LibreHardwareMonitorLib/Hardware/IHardware.cs index 50ebf8c..3db6800 100644 --- a/LibreHardwareMonitorLib/Hardware/IHardware.cs +++ b/LibreHardwareMonitorLib/Hardware/IHardware.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. namespace LibreHardwareMonitor.Hardware { diff --git a/LibreHardwareMonitorLib/Hardware/IParameter.cs b/LibreHardwareMonitorLib/Hardware/IParameter.cs index ab3d0ce..d5e301c 100644 --- a/LibreHardwareMonitorLib/Hardware/IParameter.cs +++ b/LibreHardwareMonitorLib/Hardware/IParameter.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. namespace LibreHardwareMonitor.Hardware { diff --git a/LibreHardwareMonitorLib/Hardware/ISensor.cs b/LibreHardwareMonitorLib/Hardware/ISensor.cs index e2e048e..c45dd31 100644 --- a/LibreHardwareMonitorLib/Hardware/ISensor.cs +++ b/LibreHardwareMonitorLib/Hardware/ISensor.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/ISettings.cs b/LibreHardwareMonitorLib/Hardware/ISettings.cs index 3c18d8c..846beea 100644 --- a/LibreHardwareMonitorLib/Hardware/ISettings.cs +++ b/LibreHardwareMonitorLib/Hardware/ISettings.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. namespace LibreHardwareMonitor.Hardware { diff --git a/LibreHardwareMonitorLib/Hardware/IVisitor.cs b/LibreHardwareMonitorLib/Hardware/IVisitor.cs index 97e1051..1cc6d7a 100644 --- a/LibreHardwareMonitorLib/Hardware/IVisitor.cs +++ b/LibreHardwareMonitorLib/Hardware/IVisitor.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. namespace LibreHardwareMonitor.Hardware { diff --git a/LibreHardwareMonitorLib/Hardware/Identifier.cs b/LibreHardwareMonitorLib/Hardware/Identifier.cs index a86f1eb..2f5663a 100644 --- a/LibreHardwareMonitorLib/Hardware/Identifier.cs +++ b/LibreHardwareMonitorLib/Hardware/Identifier.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/KernelDriver.cs b/LibreHardwareMonitorLib/Hardware/KernelDriver.cs index d77732d..42e19ce 100644 --- a/LibreHardwareMonitorLib/Hardware/KernelDriver.cs +++ b/LibreHardwareMonitorLib/Hardware/KernelDriver.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.IO; diff --git a/LibreHardwareMonitorLib/Hardware/Memory/GenericMemory.cs b/LibreHardwareMonitorLib/Hardware/Memory/GenericMemory.cs index c6f3c09..42063ec 100644 --- a/LibreHardwareMonitorLib/Hardware/Memory/GenericMemory.cs +++ b/LibreHardwareMonitorLib/Hardware/Memory/GenericMemory.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Runtime.InteropServices; using LibreHardwareMonitor.Interop; diff --git a/LibreHardwareMonitorLib/Hardware/Memory/MemoryGroup.cs b/LibreHardwareMonitorLib/Hardware/Memory/MemoryGroup.cs index 8c99242..d34af23 100644 --- a/LibreHardwareMonitorLib/Hardware/Memory/MemoryGroup.cs +++ b/LibreHardwareMonitorLib/Hardware/Memory/MemoryGroup.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs index 048a78d..be3bfd9 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/Chip.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/Chip.cs index e0e3f45..1f09a90 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/Chip.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/Chip.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Diagnostics.CodeAnalysis; @@ -14,6 +15,8 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc ATK0110 = 0x0110, + F71808E = 0x0901, + F71811 = 0x1007, F71858 = 0x0507, F71862 = 0x0601, F71869 = 0x0814, @@ -23,7 +26,6 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc F71889AD = 0x1005, F71889ED = 0x0909, F71889F = 0x0723, - F71808E = 0x0901, IT8620E = 0x8620, IT8628E = 0x8628, @@ -43,9 +45,9 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc IT8772E = 0x8772, IT879XE = 0x8733, + NCT610XD = 0xC452, NCT6771F = 0xB470, NCT6776F = 0xC330, - NCT610XD = 0xC452, NCT6779D = 0xC560, NCT6791D = 0xC803, NCT6792D = 0xC911, @@ -79,7 +81,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc case Chip.F71862: return "Fintek F71862"; case Chip.F71869: return "Fintek F71869"; case Chip.F71878AD: return "Fintek F71878AD"; - case Chip.F71869A: return "Fintek F71869A"; + case Chip.F71869A: return "Fintek F71869A/F71811"; case Chip.F71882: return "Fintek F71882"; case Chip.F71889AD: return "Fintek F71889AD"; case Chip.F71889ED: return "Fintek F71889ED"; @@ -127,8 +129,6 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc case Chip.W83667HGB: return "Winbond W83667HG-B"; case Chip.W83687THF: return "Winbond W83687THF"; - case Chip.Unknown: return "Unkown"; - break; default: return "Unknown"; } } diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/F718XX.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/F718XX.cs index c9a2f52..be260e8 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/F718XX.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/F718XX.cs @@ -1,8 +1,10 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. +using System; using System.Globalization; using System.Text; @@ -13,6 +15,8 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc internal class F718XX : ISuperIO { private readonly ushort _address; + private readonly byte[] _initialFanPwmControl = new byte[4]; + private readonly bool[] _restoreDefaultFanPwmControlRequired = new bool[4]; public F718XX(Chip chip, ushort address) { @@ -45,8 +49,26 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc public void SetControl(int index, byte? value) { - if (index < Controls.Length) - WriteByte(FAN_PWM_REG[index], value ?? 128); + if (index < 0 || index >= Controls.Length) + throw new ArgumentOutOfRangeException(nameof(index)); + + + if (!Ring0.WaitIsaBusMutex(10)) + return; + + + if (value.HasValue) + { + SaveDefaultFanPwmControl(index); + + WriteByte(FAN_PWM_REG[index], value.Value); + } + else + { + RestoreDefaultFanPwmControl(index); + } + + Ring0.ReleaseIsaBusMutex(); } public string GetReport() @@ -174,12 +196,30 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc for (int i = 0; i < Controls.Length; i++) { - Controls[i] = 100 * ReadByte((byte)(PWM_VALUES_OFFSET + i)) / 256.0f; + Controls[i] = ReadByte((byte)(PWM_VALUES_OFFSET + i)) * 100.0f / 0xFF; } Ring0.ReleaseIsaBusMutex(); } + private void SaveDefaultFanPwmControl(int index) + { + if (!_restoreDefaultFanPwmControlRequired[index]) + { + _initialFanPwmControl[index] = ReadByte(FAN_PWM_REG[index]); + _restoreDefaultFanPwmControlRequired[index] = true; + } + } + + private void RestoreDefaultFanPwmControl(int index) + { + if (_restoreDefaultFanPwmControlRequired[index]) + { + WriteByte(FAN_PWM_REG[index], _initialFanPwmControl[index]); + _restoreDefaultFanPwmControlRequired[index] = false; + } + } + private byte ReadByte(byte register) { Ring0.WriteIoPort((ushort)(_address + ADDRESS_REGISTER_OFFSET), register); @@ -193,6 +233,8 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc } // ReSharper disable InconsistentNaming +#pragma warning disable IDE1006 // Naming Styles + private const byte ADDRESS_REGISTER_OFFSET = 0x05; private const byte DATA_REGISTER_OFFSET = 0x06; private const byte PWM_VALUES_OFFSET = 0x2D; @@ -201,8 +243,9 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc private const byte VOLTAGE_BASE_REG = 0x20; private readonly byte[] FAN_PWM_REG = { 0xA3, 0xB3, 0xC3, 0xD3 }; - private readonly byte[] FAN_TACHOMETER_REG = { 0xA0, 0xB0, 0xC0, 0xD0 }; + // ReSharper restore InconsistentNaming +#pragma warning restore IDE1006 // Naming Styles } } diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/ISuperIO.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/ISuperIO.cs index 4744d5d..1c04208 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/ISuperIO.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/ISuperIO.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc { diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/IT87XX.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/IT87XX.cs index b3b6784..0a2f59d 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/IT87XX.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/IT87XX.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Globalization; @@ -17,29 +18,26 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc private readonly ushort _addressReg; private readonly ushort _dataReg; private readonly bool[] _fansDisabled = new bool[0]; - private readonly ushort _gpioAddress; private readonly int _gpioCount; private readonly bool _has16BitFanCounter; private readonly bool _hasNewerAutoPwm; - private readonly byte[] _initialFanPwmControl = new byte[3]; private readonly byte[] _initialFanPwmControlMode = new byte[3]; - private readonly bool[] _restoreDefaultFanPwmControlRequired = new bool[3]; private readonly byte _version; - private readonly float _voltageGain; public IT87XX(Chip chip, ushort address, ushort gpioAddress, byte version) { _address = address; - Chip = chip; _version = version; _addressReg = (ushort)(address + ADDRESS_REGISTER_OFFSET); _dataReg = (ushort)(address + DATA_REGISTER_OFFSET); _gpioAddress = gpioAddress; + Chip = chip; + // Check vendor id byte vendorId = ReadByte(VENDOR_ID_REGISTER, out bool valid); if (!valid || vendorId != ITE_VENDOR_ID) @@ -47,26 +45,16 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc // Bit 0x10 of the configuration register should always be 1 - byte config = ReadByte(CONFIGURATION_REGISTER, out valid); - if ((config & 0x10) == 0 && chip != Chip.IT8665E) - return; - - if (!valid) + byte configuration = ReadByte(CONFIGURATION_REGISTER, out valid); + if (!valid || ((configuration & 0x10) == 0 && chip != Chip.IT8665E)) return; switch (chip) { // IT8686E has more sensors - case Chip.IT8686E: - { - Voltages = new float?[10]; - Temperatures = new float?[5]; - Fans = new float?[5]; - Controls = new float?[3]; - break; - } case Chip.IT8665E: + case Chip.IT8686E: { Voltages = new float?[10]; Temperatures = new float?[6]; @@ -74,19 +62,19 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc Controls = new float?[3]; break; } - case Chip.IT8655E: - { - Voltages = new float?[6]; - Temperatures = new float?[6]; - Fans = new float?[3]; - Controls = new float?[3]; - break; - } case Chip.IT8688E: { Voltages = new float?[11]; Temperatures = new float?[6]; - Fans = new float?[5]; + Fans = new float?[6]; + Controls = new float?[3]; + break; + } + case Chip.IT8655E: + { + Voltages = new float?[9]; + Temperatures = new float?[6]; + Fans = new float?[3]; Controls = new float?[3]; break; } @@ -133,7 +121,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc { _voltageGain = 0.012f; break; - } + } case Chip.IT8655E: case Chip.IT8665E: case Chip.IT879XE: @@ -148,16 +136,8 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc } } - // older IT8705F and IT8721F revisions do not have 16-bit fan counters - if ((chip == Chip.IT8705F && version < 3) || - (chip == Chip.IT8712F && version < 8)) - { - _has16BitFanCounter = false; - } - else - { - _has16BitFanCounter = true; - } + // Older IT8705F and IT8721F revisions do not have 16-bit fan counters. + _has16BitFanCounter = (chip != Chip.IT8705F || version >= 3) && (chip != Chip.IT8712F || version >= 8); if (chip == Chip.IT8620E || chip == Chip.IT879XE) { @@ -180,9 +160,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc } if (Fans.Length >= 6) - { _fansDisabled[5] = (modes & (1 << 2)) == 0; - } } // Set the number of GPIO sets @@ -317,8 +295,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc { r.Append(" "); byte value = ReadByte((byte)((i << 4) | j), out bool valid); - r.Append( - valid ? value.ToString("X2", CultureInfo.InvariantCulture) : "??"); + r.Append(valid ? value.ToString("X2", CultureInfo.InvariantCulture) : "??"); } r.AppendLine(); @@ -527,6 +504,8 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc } // ReSharper disable InconsistentNaming +#pragma warning disable IDE1006 // Naming Styles + private const byte ADDRESS_REGISTER_OFFSET = 0x05; private const byte CONFIGURATION_REGISTER = 0x00; @@ -535,6 +514,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc private const byte FAN_TACHOMETER_DIVISOR_REGISTER = 0x0B; private const byte ITE_VENDOR_ID = 0x90; + private const byte TEMPERATURE_BASE_REG = 0x29; private const byte VENDOR_ID_REGISTER = 0x58; private const byte VOLTAGE_BASE_REG = 0x20; @@ -542,8 +522,9 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc private readonly byte[] FAN_PWM_CTRL_REG = { 0x15, 0x16, 0x17 }; private readonly byte[] FAN_PWM_DUTY_REG = { 0x63, 0x6b, 0x73 }; private readonly byte[] FAN_TACHOMETER_EXT_REG = { 0x18, 0x19, 0x1a, 0x81, 0x83, 0x4c }; - private readonly byte[] FAN_TACHOMETER_REG = { 0x0d, 0x0e, 0x0f, 0x80, 0x82, 0x4c }; + +#pragma warning restore IDE1006 // Naming Styles // ReSharper restore InconsistentNaming } } diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LMSensors.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LMSensors.cs index eb378e4..9985f50 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LMSensors.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LMSensors.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Collections.Generic; using System.Globalization; diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LPcPort.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LPcPort.cs index d1990ba..cb3c26a 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LPcPort.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LPcPort.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc { @@ -31,13 +32,12 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc public ushort ReadWord(byte register) { - return (ushort)((ReadByte(register) << 8) | - ReadByte((byte)(register + 1))); + return (ushort)((ReadByte(register) << 8) | ReadByte((byte)(register + 1))); } public void Select(byte logicalDeviceNumber) { - Ring0.WriteIoPort(RegisterPort, DEVCIE_SELECT_REGISTER); + Ring0.WriteIoPort(RegisterPort, DEVICE_SELECT_REGISTER); Ring0.WriteIoPort(ValuePort, logicalDeviceNumber); } @@ -93,8 +93,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc // ReSharper disable InconsistentNaming private const byte CONFIGURATION_CONTROL_REGISTER = 0x02; - private const byte DEVCIE_SELECT_REGISTER = 0x07; - + private const byte DEVICE_SELECT_REGISTER = 0x07; private const byte NUVOTON_HARDWARE_MONITOR_IO_SPACE_LOCK = 0x28; // ReSharper restore InconsistentNaming } diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LpcIO.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LpcIO.cs index dbd63e6..4e05b2b 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LpcIO.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LpcIO.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; @@ -30,10 +31,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc Ring0.ReleaseIsaBusMutex(); } - public ISuperIO[] SuperIO - { - get { return _superIOs.ToArray(); } - } + public ISuperIO[] SuperIO => _superIOs.ToArray(); private void ReportUnknownChip(LpcPort port, string type, int chip) { @@ -110,6 +108,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc byte id = port.ReadByte(CHIP_ID_REGISTER); byte revision = port.ReadByte(CHIP_REVISION_REGISTER); Chip chip = Chip.Unknown; + switch (id) { case 0x05: @@ -224,6 +223,12 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc logicalDeviceNumber = FINTEK_HARDWARE_MONITOR_LDN; break; } + case 0x18: + { + chip = Chip.F71811; + logicalDeviceNumber = FINTEK_HARDWARE_MONITOR_LDN; + break; + } } break; @@ -512,8 +517,16 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc ushort vendorId = port.ReadWord(FINTEK_VENDOR_ID_REGISTER); - // disable the hardware monitor i/o space lock on NCT679*D chips - if (address == verify && (chip == Chip.NCT6791D || chip == Chip.NCT6796D || chip == Chip.NCT6796DR || chip == Chip.NCT6793D || chip == Chip.NCT6795D || chip == Chip.NCT6798D || chip == Chip.NCT6797D)) + // disable the hardware monitor i/o space lock on NCT679XD chips + if (address == verify && (chip == Chip.NCT6791D || + chip == Chip.NCT6792D || + chip == Chip.NCT6792DA || + chip == Chip.NCT6793D || + chip == Chip.NCT6795D || + chip == Chip.NCT6796D || + chip == Chip.NCT6796DR || + chip == Chip.NCT6798D || + chip == Chip.NCT6797D)) { port.NuvotonDisableIOSpaceLock(); } @@ -528,6 +541,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc _report.AppendLine(revision.ToString("X", CultureInfo.InvariantCulture)); _report.AppendLine("Error: Address verification failed"); _report.AppendLine(); + return false; } @@ -544,6 +558,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc _report.Append("Error: Invalid address 0x"); _report.AppendLine(address.ToString("X", CultureInfo.InvariantCulture)); _report.AppendLine(); + return false; } @@ -598,6 +613,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc _report.Append("Error: Invalid vendor ID 0x"); _report.AppendLine(vendorId.ToString("X", CultureInfo.InvariantCulture)); _report.AppendLine(); + return false; } @@ -699,6 +715,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc ushort gpioAddress; ushort gpioVerify; + if (chip == Chip.IT8705F) { port.Select(IT8705_GPIO_LDN); @@ -723,18 +740,18 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc _report.Append("Error: Invalid address 0x"); _report.AppendLine(address.ToString("X", CultureInfo.InvariantCulture)); _report.AppendLine(); + return false; } - if (gpioAddress != gpioVerify || - gpioAddress < 0x100 || - (gpioAddress & 0xF007) != 0) + if (gpioAddress != gpioVerify || gpioAddress < 0x100 || (gpioAddress & 0xF007) != 0) { _report.Append("Chip ID: 0x"); _report.AppendLine(chip.ToString("X")); _report.Append("Error: Invalid GPIO address 0x"); _report.AppendLine(gpioAddress.ToString("X", CultureInfo.InvariantCulture)); _report.AppendLine(); + return false; } @@ -758,8 +775,8 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc private const byte WINBOND_NUVOTON_HARDWARE_MONITOR_LDN = 0x0B; private const ushort FINTEK_VENDOR_ID = 0x1934; - private const byte FINTEK_VENDOR_ID_REGISTER = 0x23; + private const byte FINTEK_VENDOR_ID_REGISTER = 0x23; private const byte IT87_CHIP_VERSION_REGISTER = 0x22; private readonly ushort[] REGISTER_PORTS = { 0x2E, 0x4E }; diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/Nct677X.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/Nct677X.cs index 5de65cc..1e162a9 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/Nct677X.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/Nct677X.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Diagnostics.CodeAnalysis; @@ -20,7 +21,6 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc private readonly LpcPort _lpcPort; private readonly int _minFanRpm; private readonly ushort _port; - private readonly bool[] _restoreDefaultFanControlRequired = new bool[7]; private readonly byte _revision; private readonly int[] _temperatureHalfBit; @@ -50,25 +50,18 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc _vBatMonitorControlRegister = 0x0318; } - else if (chip == Chip.NCT6797D || chip == Chip.NCT6798D) - { - VENDOR_ID_HIGH_REGISTER = 0x804F; - VENDOR_ID_LOW_REGISTER = 0x004F; - - FAN_PWM_OUT_REG = new ushort[] { 0x001, 0x003, 0x011, 0x013, 0x015, 0xa09, 0xb09 }; - FAN_PWM_COMMAND_REG = new ushort[] { 0x109, 0x209, 0x309, 0x809, 0x909, 0xa09, 0xb09 }; - FAN_CONTROL_MODE_REG = new ushort[] { 0x102, 0x202, 0x302, 0x802, 0x902, 0xA02, 0xB02 }; - - _vBatMonitorControlRegister = 0x005D; - } else { VENDOR_ID_HIGH_REGISTER = 0x804F; VENDOR_ID_LOW_REGISTER = 0x004F; - FAN_PWM_OUT_REG = new ushort[] { 0x001, 0x003, 0x011, 0x013, 0x015, 0x017 }; - FAN_PWM_COMMAND_REG = new ushort[] { 0x109, 0x209, 0x309, 0x809, 0x909, 0xA09 }; - FAN_CONTROL_MODE_REG = new ushort[] { 0x102, 0x202, 0x302, 0x802, 0x902, 0xA02 }; + if (chip == Chip.NCT6797D || chip == Chip.NCT6798D) + FAN_PWM_OUT_REG = new ushort[] { 0x001, 0x003, 0x011, 0x013, 0x015, 0xA09, 0xB09 }; + else + FAN_PWM_OUT_REG = new ushort[] { 0x001, 0x003, 0x011, 0x013, 0x015, 0x017, 0x029 }; + + FAN_PWM_COMMAND_REG = new ushort[] { 0x109, 0x209, 0x309, 0x809, 0x909, 0xA09, 0xB09 }; + FAN_CONTROL_MODE_REG = new ushort[] { 0x102, 0x202, 0x302, 0x802, 0x902, 0xA02, 0xB02 }; _vBatMonitorControlRegister = 0x005D; } @@ -158,7 +151,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc _fanRpmRegister = new ushort[] { 0x4c0, 0x4c2, 0x4c4, 0x4c6, 0x4c8, 0x4ca, 0x4ce }; - // min value RPM value with 13-bit fan counter + // min RPM value with 13-bit fan counter _minFanRpm = (int)(1.35e6 / 0x1FFF); Voltages = new float?[15]; @@ -191,7 +184,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc _fanRpmRegister = new ushort[3]; for (int i = 0; i < _fanRpmRegister.Length; i++) _fanRpmRegister[i] = (ushort)(0x030 + (i << 1)); - + // min value RPM value with 13-bit fan counter _minFanRpm = (int)(1.35e6 / 0x1FFF); @@ -327,7 +320,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc for (int i = 0; i < Fans.Length; i++) { - byte high = ReadByte((ushort)(_fanRpmRegister[i])); + byte high = ReadByte(_fanRpmRegister[i]); byte low = ReadByte((ushort)(_fanRpmRegister[i] + 1)); int value = (high << 8) | low; Fans[i] = value > _minFanRpm ? value : 0; @@ -536,8 +529,18 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc private void DisableIOSpaceLock() { - if (Chip != Chip.NCT6791D && Chip != Chip.NCT6796D && Chip != Chip.NCT6792DA && Chip != Chip.NCT6796DR && Chip != Chip.NCT6793D && Chip != Chip.NCT6795D && Chip != Chip.NCT6798D && Chip != Chip.NCT6797D) + if (Chip != Chip.NCT6791D && + Chip != Chip.NCT6792D && + Chip != Chip.NCT6792DA && + Chip != Chip.NCT6793D && + Chip != Chip.NCT6795D && + Chip != Chip.NCT6796D && + Chip != Chip.NCT6796DR && + Chip != Chip.NCT6797D && + Chip != Chip.NCT6798D) + { return; + } // the lock is disabled already if the vendor ID can be read diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/W836XX.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/W836XX.cs index b801983..aa49b27 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/W836XX.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/W836XX.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Globalization; diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Manufacturer.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Manufacturer.cs index a3ce4b8..a1cb6d4 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Manufacturer.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Manufacturer.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Diagnostics.CodeAnalysis; diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs index acbbbf5..57e41df 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. // ReSharper disable InconsistentNaming diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Motherboard.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Motherboard.cs index f2c948b..b74d838 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Motherboard.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Motherboard.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/MotherboardGroup.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/MotherboardGroup.cs index 286cc41..e6d0a0b 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/MotherboardGroup.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/MotherboardGroup.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs index cdc2458..a636806 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; @@ -215,6 +216,9 @@ namespace LibreHardwareMonitor.Hardware.Motherboard switch (superIO.Chip) { + case Chip.IT8655E: + case Chip.IT8665E: + case Chip.IT8686E: case Chip.IT8688E: case Chip.IT8705F: case Chip.IT8712F: @@ -222,9 +226,6 @@ namespace LibreHardwareMonitor.Hardware.Motherboard case Chip.IT8718F: case Chip.IT8720F: case Chip.IT8726F: - case Chip.IT8665E: - case Chip.IT8655E: - case Chip.IT8686E: case Chip.IT879XE: { GetIteConfigurationsA(superIO, manufacturer, model, v, t, f, c, ref readFan, ref postUpdate, ref mutex); @@ -256,6 +257,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard break; } + case Chip.F71808E: case Chip.F71862: case Chip.F71869: case Chip.F71869A: @@ -263,7 +265,6 @@ namespace LibreHardwareMonitor.Hardware.Motherboard case Chip.F71889AD: case Chip.F71889ED: case Chip.F71889F: - case Chip.F71808E: { GetFintekConfiguration(superIO, manufacturer, model, v, t, f, c); @@ -293,7 +294,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Voltage #3", 2, true)); v.Add(new Voltage("AVCC", 3, 34, 51)); v.Add(new Voltage("Voltage #5", 4, true)); - v.Add(new Voltage("5VSB", 5, 34, 51)); + v.Add(new Voltage("+5VSB", 5, 34, 51)); v.Add(new Voltage("VBat", 6)); t.Add(new Temperature("CPU", 0)); t.Add(new Temperature("Auxiliary", 1)); @@ -316,16 +317,16 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("Voltage #0", 1, true)); v.Add(new Voltage("AVCC", 2, 34, 34)); - v.Add(new Voltage("3VCC", 3, 34, 34)); + v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("Voltage #1", 4, true)); v.Add(new Voltage("Voltage #2", 5, true)); v.Add(new Voltage("Reserved", 6, true)); v.Add(new Voltage("3VSB", 7, 34, 34)); v.Add(new Voltage("VBat", 8, 34, 34)); v.Add(new Voltage("Voltage #10", 9, true)); - t.Add(new Temperature("SYS", 1)); + t.Add(new Temperature("System", 1)); t.Add(new Temperature("CPU Core", 2)); - t.Add(new Temperature("AUX", 3)); + t.Add(new Temperature("Auxiliary", 3)); for (int i = 0; i < superIO.Fans.Length; i++) f.Add(new Fan("Fan #" + (i + 1), i)); @@ -338,6 +339,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard case Chip.NCT6779D: case Chip.NCT6791D: case Chip.NCT6792D: + case Chip.NCT6792DA: case Chip.NCT6793D: case Chip.NCT6795D: case Chip.NCT6796D: @@ -1135,6 +1137,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard }; int fanIndex = 0; + postUpdate = () => { // get GPIO 80-87 @@ -1164,7 +1167,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("DIMM", 1)); v.Add(new Voltage("NB Voltage", 2)); - v.Add(new Voltage("Analog +3.3V", 3, 10, 10)); + v.Add(new Voltage("AVCC", 3, 10, 10)); // v.Add(new Voltage("DIMM", 6, true)); v.Add(new Voltage("3VSB", 7, 10, 10)); v.Add(new Voltage("VBat", 8, 10, 10)); @@ -1182,7 +1185,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Voltage #1", 0, true)); v.Add(new Voltage("Voltage #2", 1, true)); v.Add(new Voltage("Voltage #3", 2, true)); - v.Add(new Voltage("Analog +3.3V", 3, 10, 10, 0, true)); + v.Add(new Voltage("AVCC", 3, 10, 10, 0, true)); v.Add(new Voltage("Voltage #5", 4, true)); v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("Voltage #7", 6, true)); @@ -1521,7 +1524,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard { v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("+12V", 1, 11, 1)); - v.Add(new Voltage("Analog +3.3V", 2, 34, 34)); + v.Add(new Voltage("AVCC", 2, 34, 34)); v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("+5V", 4, 12, 3)); v.Add(new Voltage("3VSB", 7, 34, 34)); @@ -1543,7 +1546,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard { v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("+12V", 1, 11, 1)); - v.Add(new Voltage("Analog +3.3V", 2, 34, 34)); + v.Add(new Voltage("AVCC", 2, 34, 34)); v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("+5V", 4, 12, 3)); v.Add(new Voltage("Voltage #6", 5, true)); @@ -1564,7 +1567,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard { v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("+12V", 1, 11, 1)); - v.Add(new Voltage("Analog +3.3V", 2, 34, 34)); + v.Add(new Voltage("AVCC", 2, 34, 34)); v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("+5V", 4, 12, 3)); v.Add(new Voltage("3VSB", 7, 34, 34)); @@ -1585,7 +1588,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard { v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("+12V", 1, 11, 1)); - v.Add(new Voltage("Analog +3.3V", 2, 34, 34)); + v.Add(new Voltage("AVCC", 2, 34, 34)); v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("+5V", 4, 12, 3)); v.Add(new Voltage("3VSB", 7, 34, 34)); @@ -1606,7 +1609,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("Voltage #2", 1, true)); v.Add(new Voltage("AVCC", 2, 34, 34)); - v.Add(new Voltage("3VCC", 3, 34, 34)); + v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("Voltage #5", 4, true)); v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("Voltage #7", 6, true)); @@ -1635,9 +1638,9 @@ namespace LibreHardwareMonitor.Hardware.Motherboard { case Model.B85M_DGS: { - v.Add(new Voltage("CPU VCCIN", 0, 1, 1)); + v.Add(new Voltage("Vcore", 0, 1, 1)); v.Add(new Voltage("+12V", 1, 56, 10)); - v.Add(new Voltage("Analog +3.3V", 2, 34, 34)); + v.Add(new Voltage("AVCC", 2, 34, 34)); v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("VIN1", 4, true)); v.Add(new Voltage("+5V", 5, 12, 3)); @@ -1661,7 +1664,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Vcore", 0, 0, 1)); v.Add(new Voltage("+12V", 1, 56, 10)); v.Add(new Voltage("AVCC", 2, 10, 10)); - v.Add(new Voltage("3VCC", 3, 10, 10)); + v.Add(new Voltage("+3.3V", 3, 10, 10)); //v.Add(new Voltage("#Unused #4", 4, 0, 1, 0, true)); v.Add(new Voltage("+5V", 5, 20, 10)); //v.Add(new Voltage("#Unused #6", 6, 0, 1, 0, true)); @@ -1669,7 +1672,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("VBat", 8, 10, 10)); t.Add(new Temperature("CPU Core", 0)); t.Add(new Temperature("CPU", 1)); - t.Add(new Temperature("AUX", 2)); + t.Add(new Temperature("Auxiliary", 2)); t.Add(new Temperature("Motherboard", 3)); for (int i = 0; i < superIO.Fans.Length; i++) @@ -1685,7 +1688,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("Voltage #2", 1, true)); v.Add(new Voltage("AVCC", 2, 34, 34)); - v.Add(new Voltage("3VCC", 3, 34, 34)); + v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("Voltage #5", 4, true)); v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("Voltage #7", 6, true)); @@ -1713,7 +1716,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("Voltage #2", 1, true)); v.Add(new Voltage("AVCC", 2, 34, 34)); - v.Add(new Voltage("3VCC", 3, 34, 34)); + v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("Voltage #5", 4, true)); v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("Voltage #7", 6, true)); @@ -1748,7 +1751,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Vcore", 0, 10, 10)); v.Add(new Voltage("Chipset 1.05V", 1, 0, 1)); v.Add(new Voltage("AVCC", 2, 10, 10)); - v.Add(new Voltage("3VCC", 3, 10, 10)); + v.Add(new Voltage("+3.3V", 3, 10, 10)); v.Add(new Voltage("+12V", 4, 56, 10)); v.Add(new Voltage("VcoreRef", 5, 0, 1)); v.Add(new Voltage("DIMM", 6, 0, 1)); @@ -1766,7 +1769,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard t.Add(new Temperature("Motherboard", 2)); //t.Add(new Temperature("#Unused #3", 3)); //t.Add(new Temperature("#Unused #4", 4)); - t.Add(new Temperature("AUX", 5)); + t.Add(new Temperature("Auxiliary", 5)); for (int i = 0; i < superIO.Fans.Length; i++) f.Add(new Fan("Fan #" + (i + 1), i)); @@ -1790,7 +1793,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Vcore", 0, 10, 10)); //v.Add(new Voltage("#Unused", 1, 0, 1, 0, true)); v.Add(new Voltage("AVCC", 2, 10, 10)); - v.Add(new Voltage("3VCC", 3, 10, 10)); + v.Add(new Voltage("+3.3V", 3, 10, 10)); v.Add(new Voltage("+12V", 4, 28, 5)); v.Add(new Voltage("Vcore Refin", 5, 0, 1)); //v.Add(new Voltage("#Unused #6", 6, 0, 1, 0, true)); @@ -1805,7 +1808,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard t.Add(new Temperature("CPU Core", 0)); t.Add(new Temperature("CPU", 1)); t.Add(new Temperature("Motherboard", 2)); - t.Add(new Temperature("AUX", 3)); + t.Add(new Temperature("Auxiliary", 3)); t.Add(new Temperature("VRM", 4)); t.Add(new Temperature("AUXTIN2", 5)); //t.Add(new Temperature("Temperature #6", 6)); @@ -1824,7 +1827,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Vcore", 0, 10, 10)); v.Add(new Voltage("Chipset 1.05V", 1, 0, 1)); v.Add(new Voltage("AVCC", 2, 10, 10)); - v.Add(new Voltage("3VCC", 3, 10, 10)); + v.Add(new Voltage("+3.3V", 3, 10, 10)); v.Add(new Voltage("+12V", 4, 56, 10)); v.Add(new Voltage("VDDCR_SOC", 5, 0, 1)); v.Add(new Voltage("DIMM", 6, 0, 1)); @@ -1838,10 +1841,10 @@ namespace LibreHardwareMonitor.Hardware.Motherboard //v.Add(new Voltage("unused", 14, 34, 34, 0, true)); t.Add(new Temperature("CPU Core", 0)); t.Add(new Temperature("Motherboard", 1)); - t.Add(new Temperature("AUX", 2)); + t.Add(new Temperature("Auxiliary", 2)); t.Add(new Temperature("Chipset", 3)); t.Add(new Temperature("Core VRM", 4)); - t.Add(new Temperature("Core SOC", 5)); + t.Add(new Temperature("Core SoC", 5)); for (int i = 0; i < superIO.Fans.Length; i++) f.Add(new Fan("Fan #" + (i + 1), i)); @@ -1856,7 +1859,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Vcore", 0, 10, 10)); v.Add(new Voltage("Voltage #2", 1, true)); v.Add(new Voltage("AVCC", 2, 34, 34)); - v.Add(new Voltage("3VCC", 3, 34, 34)); + v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("Voltage #5", 4, true)); v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("Voltage #7", 6, true)); @@ -1897,7 +1900,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("Voltage #2", 1, true)); v.Add(new Voltage("AVCC", 2, 34, 34)); - v.Add(new Voltage("3VCC", 3, 34, 34)); + v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("Voltage #5", 4, true)); v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("Voltage #7", 6, true)); @@ -1928,7 +1931,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Vcore", 0, 2, 2)); v.Add(new Voltage("+5V", 1, 4, 1)); v.Add(new Voltage("AVSB", 2, 34, 34)); - v.Add(new Voltage("3VCC", 3, 34, 34)); + v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("+12V", 4, 11, 1)); v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("CPU GFX", 6, 2, 2)); @@ -1965,7 +1968,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Vcore", 0, 2, 2)); v.Add(new Voltage("+5V", 1, 4, 1)); v.Add(new Voltage("AVSB", 2, 34, 34)); - v.Add(new Voltage("3VCC", 3, 34, 34)); + v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("+12V", 4, 11, 1)); v.Add(new Voltage("Voltage #6", 5, 0, 1, 0, true)); v.Add(new Voltage("CPU GFX", 6, 2, 2)); @@ -1998,7 +2001,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("Voltage #2", 1, true)); v.Add(new Voltage("AVCC", 2, 34, 34)); - v.Add(new Voltage("3VCC", 3, 34, 34)); + v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("Voltage #5", 4, true)); v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("Voltage #7", 6, true)); @@ -2039,7 +2042,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("+5V", 1, 4, 1)); v.Add(new Voltage("AVCC", 2, 34, 34)); - v.Add(new Voltage("3VCC", 3, 34, 34)); + v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("+12V", 4, 11, 1)); //v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("CPU I/O", 6)); @@ -2068,7 +2071,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("+5V", 1, 4, 1)); v.Add(new Voltage("AVCC", 2, 34, 34)); - v.Add(new Voltage("3VCC", 3, 34, 34)); + v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("+12V", 4, 11, 1)); //v.Add(new Voltage("Voltage #6", 5, false)); //v.Add(new Voltage("CPU I/O", 6)); @@ -2104,7 +2107,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("+5V", 1, 4, 1)); v.Add(new Voltage("AVCC", 2, 34, 34)); - v.Add(new Voltage("3VCC", 3, 34, 34)); + v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("+12V", 4, 11, 1)); v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("CPU I/O", 6)); @@ -2138,7 +2141,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("Voltage #2", 1, true)); v.Add(new Voltage("AVCC", 2, 34, 34)); - v.Add(new Voltage("3VCC", 3, 34, 34)); + v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("Voltage #5", 4, true)); v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("Voltage #7", 6, true)); @@ -2175,7 +2178,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("Voltage #2", 1, true)); v.Add(new Voltage("AVCC", 2, 34, 34)); - v.Add(new Voltage("3VCC", 3, 34, 34)); + v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("Voltage #5", 4, true)); v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("Voltage #7", 6, true)); @@ -2217,7 +2220,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard case Model.AOD790GX_128M: // W83627EHF { v.Add(new Voltage("Vcore", 0)); - v.Add(new Voltage("Analog +3.3V", 2, 34, 34)); + v.Add(new Voltage("AVCC", 2, 34, 34)); v.Add(new Voltage("+3.3V", 4, 10, 10)); v.Add(new Voltage("+5V", 5, 20, 10)); v.Add(new Voltage("+12V", 6, 28, 5)); @@ -2235,7 +2238,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("Voltage #2", 1, true)); v.Add(new Voltage("AVCC", 2, 34, 34)); - v.Add(new Voltage("3VCC", 3, 34, 34)); + v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("Voltage #5", 4, true)); v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("Voltage #7", 6, true)); @@ -2262,7 +2265,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("Voltage #2", 1, true)); v.Add(new Voltage("AVCC", 2, 34, 34)); - v.Add(new Voltage("3VCC", 3, 34, 34)); + v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("Voltage #5", 4, true)); v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("Voltage #7", 6, true)); @@ -2312,7 +2315,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("Voltage #2", 1, true)); v.Add(new Voltage("AVCC", 2, 34, 34)); - v.Add(new Voltage("3VCC", 3, 34, 34)); + v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("Voltage #5", 4, true)); v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("Voltage #7", 6, true)); @@ -2343,7 +2346,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard { v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("+12V", 1, 11.5f, 1.91f)); - v.Add(new Voltage("Analog +3.3V", 2, 34, 34)); + v.Add(new Voltage("AVCC", 2, 34, 34)); v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("+5V", 4, 15, 7.5f)); v.Add(new Voltage("3VSB", 7, 34, 34)); @@ -2362,7 +2365,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard { v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("+12V", 1, 12, 2)); - v.Add(new Voltage("Analog +3.3V", 2, 34, 34)); + v.Add(new Voltage("AVCC", 2, 34, 34)); v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("+5V", 4, 15, 7.5f)); v.Add(new Voltage("3VSB", 7, 34, 34)); @@ -2382,7 +2385,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("Voltage #2", 1, true)); v.Add(new Voltage("AVCC", 2, 34, 34)); - v.Add(new Voltage("3VCC", 3, 34, 34)); + v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("Voltage #5", 4, true)); v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("Voltage #7", 6, true)); @@ -2408,7 +2411,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("Voltage #2", 1, true)); v.Add(new Voltage("AVCC", 2, 34, 34)); - v.Add(new Voltage("3VCC", 3, 34, 34)); + v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("Voltage #5", 4, true)); v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("Voltage #7", 6, true)); diff --git a/LibreHardwareMonitorLib/Hardware/Network/Network.cs b/LibreHardwareMonitorLib/Hardware/Network/Network.cs index b5df621..63de642 100644 --- a/LibreHardwareMonitorLib/Hardware/Network/Network.cs +++ b/LibreHardwareMonitorLib/Hardware/Network/Network.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. using System; using System.Diagnostics; diff --git a/LibreHardwareMonitorLib/Hardware/Network/NetworkGroup.cs b/LibreHardwareMonitorLib/Hardware/Network/NetworkGroup.cs index 4b012c6..75457dc 100644 --- a/LibreHardwareMonitorLib/Hardware/Network/NetworkGroup.cs +++ b/LibreHardwareMonitorLib/Hardware/Network/NetworkGroup.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. using System.Collections.Generic; using System.Linq; diff --git a/LibreHardwareMonitorLib/Hardware/OpCode.cs b/LibreHardwareMonitorLib/Hardware/OpCode.cs index 55073d1..4c3ab46 100644 --- a/LibreHardwareMonitorLib/Hardware/OpCode.cs +++ b/LibreHardwareMonitorLib/Hardware/OpCode.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Reflection; diff --git a/LibreHardwareMonitorLib/Hardware/Parameter.cs b/LibreHardwareMonitorLib/Hardware/Parameter.cs index d58e0a6..3388332 100644 --- a/LibreHardwareMonitorLib/Hardware/Parameter.cs +++ b/LibreHardwareMonitorLib/Hardware/Parameter.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Globalization; diff --git a/LibreHardwareMonitorLib/Hardware/ParameterDescription.cs b/LibreHardwareMonitorLib/Hardware/ParameterDescription.cs index 4ba0696..7dbbdef 100644 --- a/LibreHardwareMonitorLib/Hardware/ParameterDescription.cs +++ b/LibreHardwareMonitorLib/Hardware/ParameterDescription.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. namespace LibreHardwareMonitor.Hardware { diff --git a/LibreHardwareMonitorLib/Hardware/Ring0.cs b/LibreHardwareMonitorLib/Hardware/Ring0.cs index 11c0d97..04f4bab 100644 --- a/LibreHardwareMonitorLib/Hardware/Ring0.cs +++ b/LibreHardwareMonitorLib/Hardware/Ring0.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.IO; diff --git a/LibreHardwareMonitorLib/Hardware/SMBios.cs b/LibreHardwareMonitorLib/Hardware/SMBios.cs index b6d92c1..fe169d9 100644 --- a/LibreHardwareMonitorLib/Hardware/SMBios.cs +++ b/LibreHardwareMonitorLib/Hardware/SMBios.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/Sensor.cs b/LibreHardwareMonitorLib/Hardware/Sensor.cs index 86ec6e2..e3f8a66 100644 --- a/LibreHardwareMonitorLib/Hardware/Sensor.cs +++ b/LibreHardwareMonitorLib/Hardware/Sensor.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/SensorVisitor.cs b/LibreHardwareMonitorLib/Hardware/SensorVisitor.cs index b113e23..6d3ac7c 100644 --- a/LibreHardwareMonitorLib/Hardware/SensorVisitor.cs +++ b/LibreHardwareMonitorLib/Hardware/SensorVisitor.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/ATAStorage.cs b/LibreHardwareMonitorLib/Hardware/Storage/ATAStorage.cs index 86e7705..bf785de 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/ATAStorage.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/ATAStorage.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/AbstractStorage.cs b/LibreHardwareMonitorLib/Hardware/Storage/AbstractStorage.cs index a123350..28d4d40 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/AbstractStorage.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/AbstractStorage.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/DebugSmart.cs b/LibreHardwareMonitorLib/Hardware/Storage/DebugSmart.cs index a5f9503..defa547 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/DebugSmart.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/DebugSmart.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/GenericHardDisk.cs b/LibreHardwareMonitorLib/Hardware/Storage/GenericHardDisk.cs index 446818b..456b69f 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/GenericHardDisk.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/GenericHardDisk.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/INVMeDrive.cs b/LibreHardwareMonitorLib/Hardware/Storage/INVMeDrive.cs index f3c79e1..b6d9b7d 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/INVMeDrive.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/INVMeDrive.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. using System.Runtime.InteropServices; using LibreHardwareMonitor.Interop; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/ISmart.cs b/LibreHardwareMonitorLib/Hardware/Storage/ISmart.cs index f568af9..8263c03 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/ISmart.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/ISmart.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using LibreHardwareMonitor.Interop; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/NVMeGeneric.cs b/LibreHardwareMonitorLib/Hardware/Storage/NVMeGeneric.cs index 2d7a581..b6556d2 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/NVMeGeneric.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/NVMeGeneric.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. using System.Collections.Generic; using System.Text; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/NVMeHealthInfo.cs b/LibreHardwareMonitorLib/Hardware/Storage/NVMeHealthInfo.cs index 33b116b..8b033e5 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/NVMeHealthInfo.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/NVMeHealthInfo.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. using LibreHardwareMonitor.Interop; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/NVMeInfo.cs b/LibreHardwareMonitorLib/Hardware/Storage/NVMeInfo.cs index 1639b18..ddcf95e 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/NVMeInfo.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/NVMeInfo.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. namespace LibreHardwareMonitor.Hardware.Storage { diff --git a/LibreHardwareMonitorLib/Hardware/Storage/NVMeIntel.cs b/LibreHardwareMonitorLib/Hardware/Storage/NVMeIntel.cs index 9da862d..8fbd776 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/NVMeIntel.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/NVMeIntel.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. using System; using System.Runtime.InteropServices; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/NVMeIntelRst.cs b/LibreHardwareMonitorLib/Hardware/Storage/NVMeIntelRst.cs index 6c57a03..3faaf10 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/NVMeIntelRst.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/NVMeIntelRst.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. using System; using System.Runtime.InteropServices; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/NVMeSamsung.cs b/LibreHardwareMonitorLib/Hardware/Storage/NVMeSamsung.cs index 0f30fdc..73f98c4 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/NVMeSamsung.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/NVMeSamsung.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. using System; using System.Runtime.InteropServices; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/NVMeSmart.cs b/LibreHardwareMonitorLib/Hardware/Storage/NVMeSmart.cs index 97fc2d0..e4cf24e 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/NVMeSmart.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/NVMeSmart.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. using System; using System.Runtime.InteropServices; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/NVMeWindows.cs b/LibreHardwareMonitorLib/Hardware/Storage/NVMeWindows.cs index 1b8ff62..775ea27 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/NVMeWindows.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/NVMeWindows.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. using System; using System.Runtime.InteropServices; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/NamePrefixAttribute.cs b/LibreHardwareMonitorLib/Hardware/Storage/NamePrefixAttribute.cs index 4d7d678..f07f927 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/NamePrefixAttribute.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/NamePrefixAttribute.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/RequireSmartAttribute.cs b/LibreHardwareMonitorLib/Hardware/Storage/RequireSmartAttribute.cs index dc07b96..d821a29 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/RequireSmartAttribute.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/RequireSmartAttribute.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/SmartAttribute.cs b/LibreHardwareMonitorLib/Hardware/Storage/SmartAttribute.cs index 1d2abc7..c403a04 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/SmartAttribute.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/SmartAttribute.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Collections.Generic; using LibreHardwareMonitor.Interop; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/SmartNames.cs b/LibreHardwareMonitorLib/Hardware/Storage/SmartNames.cs index 3030113..09ee32b 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/SmartNames.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/SmartNames.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. namespace LibreHardwareMonitor.Hardware.Storage { diff --git a/LibreHardwareMonitorLib/Hardware/Storage/SsdIndilinx.cs b/LibreHardwareMonitorLib/Hardware/Storage/SsdIndilinx.cs index 06e3c2e..934b8bc 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/SsdIndilinx.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/SsdIndilinx.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/SsdIntel.cs b/LibreHardwareMonitorLib/Hardware/Storage/SsdIntel.cs index 4da6103..36d5917 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/SsdIntel.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/SsdIntel.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/SsdMicron.cs b/LibreHardwareMonitorLib/Hardware/Storage/SsdMicron.cs index 84a1e30..5b226b6 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/SsdMicron.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/SsdMicron.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Collections.Generic; using LibreHardwareMonitor.Interop; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/SsdPlextor.cs b/LibreHardwareMonitorLib/Hardware/Storage/SsdPlextor.cs index a67ea70..eb02f50 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/SsdPlextor.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/SsdPlextor.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/SsdSamsung.cs b/LibreHardwareMonitorLib/Hardware/Storage/SsdSamsung.cs index 7e16d0f..c67e617 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/SsdSamsung.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/SsdSamsung.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/SsdSandforce.cs b/LibreHardwareMonitorLib/Hardware/Storage/SsdSandforce.cs index 78f0a62..be54754 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/SsdSandforce.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/SsdSandforce.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Collections.Generic; using LibreHardwareMonitor.Interop; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/StorageGeneric.cs b/LibreHardwareMonitorLib/Hardware/Storage/StorageGeneric.cs index e25c701..634ef92 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/StorageGeneric.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/StorageGeneric.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Text; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/StorageGroup.cs b/LibreHardwareMonitorLib/Hardware/Storage/StorageGroup.cs index 809c9a4..614cf85 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/StorageGroup.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/StorageGroup.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/StorageInfo.cs b/LibreHardwareMonitorLib/Hardware/Storage/StorageInfo.cs index 16fa856..912a6f4 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/StorageInfo.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/StorageInfo.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using LibreHardwareMonitor.Interop; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/WindowsSmart.cs b/LibreHardwareMonitorLib/Hardware/Storage/WindowsSmart.cs index f85db81..9a0f339 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/WindowsSmart.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/WindowsSmart.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/Storage/WindowsStorage.cs b/LibreHardwareMonitorLib/Hardware/Storage/WindowsStorage.cs index 76e1eb4..bc0b4e4 100644 --- a/LibreHardwareMonitorLib/Hardware/Storage/WindowsStorage.cs +++ b/LibreHardwareMonitorLib/Hardware/Storage/WindowsStorage.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. using System; using System.Collections.Generic; diff --git a/LibreHardwareMonitorLib/Hardware/ThreadAffinity.cs b/LibreHardwareMonitorLib/Hardware/ThreadAffinity.cs index 709bac7..1476de9 100644 --- a/LibreHardwareMonitorLib/Hardware/ThreadAffinity.cs +++ b/LibreHardwareMonitorLib/Hardware/ThreadAffinity.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System; using System.Runtime.InteropServices; diff --git a/LibreHardwareMonitorLib/Interop/AdvApi32.cs b/LibreHardwareMonitorLib/Interop/AdvApi32.cs index ffbab65..7810ddf 100644 --- a/LibreHardwareMonitorLib/Interop/AdvApi32.cs +++ b/LibreHardwareMonitorLib/Interop/AdvApi32.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. using System; using System.Runtime.InteropServices; diff --git a/LibreHardwareMonitorLib/Interop/AtiAdlxx.cs b/LibreHardwareMonitorLib/Interop/AtiAdlxx.cs index 200f01f..bd95475 100644 --- a/LibreHardwareMonitorLib/Interop/AtiAdlxx.cs +++ b/LibreHardwareMonitorLib/Interop/AtiAdlxx.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. using System; using System.Runtime.InteropServices; diff --git a/LibreHardwareMonitorLib/Interop/Ftd2xx.cs b/LibreHardwareMonitorLib/Interop/Ftd2xx.cs index dc1a1c6..5c07aca 100644 --- a/LibreHardwareMonitorLib/Interop/Ftd2xx.cs +++ b/LibreHardwareMonitorLib/Interop/Ftd2xx.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. using System; using System.Runtime.InteropServices; diff --git a/LibreHardwareMonitorLib/Interop/Kernel32.cs b/LibreHardwareMonitorLib/Interop/Kernel32.cs index 6c451b4..cdc139e 100644 --- a/LibreHardwareMonitorLib/Interop/Kernel32.cs +++ b/LibreHardwareMonitorLib/Interop/Kernel32.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. using System; using System.IO; diff --git a/LibreHardwareMonitorLib/Interop/LibC.cs b/LibreHardwareMonitorLib/Interop/LibC.cs index 131643a..e8a7acc 100644 --- a/LibreHardwareMonitorLib/Interop/LibC.cs +++ b/LibreHardwareMonitorLib/Interop/LibC.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. using System; using System.Runtime.InteropServices; diff --git a/LibreHardwareMonitorLib/Interop/NtDll.cs b/LibreHardwareMonitorLib/Interop/NtDll.cs index ce58ca3..969296e 100644 --- a/LibreHardwareMonitorLib/Interop/NtDll.cs +++ b/LibreHardwareMonitorLib/Interop/NtDll.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. using System; using System.Runtime.InteropServices; diff --git a/LibreHardwareMonitorLib/Interop/NvApi.cs b/LibreHardwareMonitorLib/Interop/NvApi.cs index c7a2768..8c53cf4 100644 --- a/LibreHardwareMonitorLib/Interop/NvApi.cs +++ b/LibreHardwareMonitorLib/Interop/NvApi.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. using System; using System.Runtime.InteropServices; diff --git a/LibreHardwareMonitorLib/Interop/NvidiaML.cs b/LibreHardwareMonitorLib/Interop/NvidiaML.cs index d87c627..8be44f6 100644 --- a/LibreHardwareMonitorLib/Interop/NvidiaML.cs +++ b/LibreHardwareMonitorLib/Interop/NvidiaML.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. using System; using System.IO; diff --git a/LibreHardwareMonitorLib/Interop/Ring0.cs b/LibreHardwareMonitorLib/Interop/Ring0.cs index c34ea42..e4d69e1 100644 --- a/LibreHardwareMonitorLib/Interop/Ring0.cs +++ b/LibreHardwareMonitorLib/Interop/Ring0.cs @@ -1,7 +1,7 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// All Rights Reserved. // ReSharper disable InconsistentNaming // ReSharper disable IdentifierTypo diff --git a/LibreHardwareMonitorLib/Properties/AssemblyLibInfo.cs b/LibreHardwareMonitorLib/Properties/AssemblyLibInfo.cs index ac38690..8a2571e 100644 --- a/LibreHardwareMonitorLib/Properties/AssemblyLibInfo.cs +++ b/LibreHardwareMonitorLib/Properties/AssemblyLibInfo.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System.Reflection; using System.Runtime.InteropServices; diff --git a/LibreHardwareMonitorLib/Properties/AssemblyVersion.cs b/LibreHardwareMonitorLib/Properties/AssemblyVersion.cs index f45d2ac..450769e 100644 --- a/LibreHardwareMonitorLib/Properties/AssemblyVersion.cs +++ b/LibreHardwareMonitorLib/Properties/AssemblyVersion.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors.. +// Partial Copyright (C) Michael Möller and Contributors.. +// All Rights Reserved.. using System.Reflection; diff --git a/LibreHardwareMonitorLib/Software/OperatingSystem.cs b/LibreHardwareMonitorLib/Software/OperatingSystem.cs index e32f640..c9e881e 100644 --- a/LibreHardwareMonitorLib/Software/OperatingSystem.cs +++ b/LibreHardwareMonitorLib/Software/OperatingSystem.cs @@ -1,7 +1,8 @@ -// Mozilla Public License 2.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) LibreHardwareMonitor and Contributors -// All Rights Reserved +// Copyright (C) LibreHardwareMonitor and Contributors. +// Partial Copyright (C) Michael Möller and Contributors. +// All Rights Reserved. using System;