Move PCICMD read into PCICMDIOGuard.

Author: Blacktempel

RAMSPDToolkit/I2CSMBus/Interop/Shared/PCICMDIOGuard.cs

@@ -21,13 +21,13 @@ internal class PCICMDIOGuard : IDisposable
     {
         #region Constructor
 
-        public PCICMDIOGuard(uint pciAddress, ushort pciCMDOriginal)
+        public PCICMDIOGuard(uint pciAddress)
         {
             _PCIAddress = pciAddress;
-            _PCICMDOriginal = pciCMDOriginal;
+            _PCICMDOriginal = DriverAccess.ReadPciConfigWord(_PCIAddress, SharedConstants.PCICMD);
 
             //I/O is not enabled
-            if (!BitHandler.IsBitSet(pciCMDOriginal, SharedConstants.PCI_CMD_IO_BIT))
+            if (!BitHandler.IsBitSet(_PCICMDOriginal, SharedConstants.PCI_CMD_IO_BIT))
             {
                 //Enable I/O
                 _PCICMDModified = (ushort)(_PCICMDOriginal | SharedConstants.PCI_CMD_IO_BIT);

RAMSPDToolkit/I2CSMBus/SMBusI801.cs

@@ -37,10 +37,6 @@ public sealed class SMBusI801 : SMBusInterface
             }
 
             _PCIAddress = pciAddress;
-
-            _PCICMDOriginal = DriverAccess.ReadPciConfigWord(_PCIAddress, SharedConstants.PCICMD);
-
-            LogSimple.LogTrace($"{nameof(SMBusI801)}: PCICMD is 0x{_PCICMDOriginal:X4} ({_PCICMDOriginal}).");
         }
 
         #endregion
@@ -52,11 +48,6 @@ public sealed class SMBusI801 : SMBusInterface
         /// </summary>
         readonly uint _PCIAddress = PCIConstants.PCI_DEVICE_INVALID;
 
-        /// <summary>
-        /// Initial value of the PCI Command Register (PCICMD) for this SMBus controller.
-        /// </summary>
-        readonly ushort _PCICMDOriginal;
-
         #endregion
 
         #region Properties
@@ -98,7 +89,7 @@ protected override int I2CSMBusXfer(byte addr, byte read_write, byte command, in
                 using (var pci = new WorldMutexGuard(WorldMutexManager.WorldPCIMutex))
                 {
                     //Modify (if necessary) and restore PCICMD
-                    using (var io = new PCICMDIOGuard(_PCIAddress, _PCICMDOriginal))
+                    using (var io = new PCICMDIOGuard(_PCIAddress))
                     {
                         var result = i801Access(addr, read_write, command, size, data);
 

RAMSPDToolkit/I2CSMBus/SMBusPiix4.cs

@@ -12,7 +12,6 @@
 using RAMSPDToolkit.I2CSMBus.Interop;
 using RAMSPDToolkit.I2CSMBus.Interop.Piix4;
 using RAMSPDToolkit.I2CSMBus.Interop.Shared;
-using RAMSPDToolkit.Logging;
 using RAMSPDToolkit.Mutexes;
 using RAMSPDToolkit.PCI;
 using RAMSPDToolkit.Windows.Driver;
@@ -35,10 +34,6 @@ public sealed class SMBusPiix4 : SMBusInterface
             }
 
             _PCIAddress = pciAddress;
-
-            _PCICMDOriginal = DriverAccess.ReadPciConfigWord(_PCIAddress, SharedConstants.PCICMD);
-
-            LogSimple.LogTrace($"{nameof(SMBusPiix4)}: PCICMD is 0x{_PCICMDOriginal:X4} ({_PCICMDOriginal}).");
         }
 
         #endregion
@@ -50,11 +45,6 @@ public sealed class SMBusPiix4 : SMBusInterface
         /// </summary>
         readonly uint _PCIAddress = PCIConstants.PCI_DEVICE_INVALID;
 
-        /// <summary>
-        /// Initial value of the PCI Command Register (PCICMD) for this SMBus controller.
-        /// </summary>
-        readonly ushort _PCICMDOriginal;
-
         #endregion
 
         #region Properties
@@ -91,7 +81,7 @@ protected override int I2CSMBusXfer(byte addr, byte read_write, byte command, in
                 using (var pci = new WorldMutexGuard(WorldMutexManager.WorldPCIMutex))
                 {
                     //Modify (if necessary) and restore PCICMD
-                    using (var io = new PCICMDIOGuard(_PCIAddress, _PCICMDOriginal))
+                    using (var io = new PCICMDIOGuard(_PCIAddress))
                     {
                         var result = Piix4Access(addr, read_write, command, size, data);