From f2dcd0359e43749b28bd6738c1d20c497ce7db66 Mon Sep 17 00:00:00 2001 From: Scalpel_cp <165da7fc5536ee16440a98f161bfa866a8b94595G55xazV5> Date: Sun, 8 Jun 2008 20:39:04 +0000 Subject: [PATCH] Removed some warnings. Added GetHashCode to MACAddress. --- .../Network/Devices/RTL8139/RTL8139.cs | 11 +++++++---- source/Cosmos/Cosmos.Hardware/Network/MACAddress.cs | 5 +++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/RTL8139.cs b/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/RTL8139.cs index ee1f3da96..ea1d36788 100644 --- a/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/RTL8139.cs +++ b/source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/RTL8139.cs @@ -18,8 +18,8 @@ namespace Cosmos.Hardware.Network.Devices.RTL8139 private PCIDevice pciCard; private Kernel.MemoryAddressSpace mem; - private Register.MainRegister reg; - private Register.CommandRegister cr; + //private Register.MainRegister reg; + //private Register.CommandRegister cr; private Register.ValueTypeRegisters valueReg; private Register.InterruptMaskRegister imr; private Register.InterruptStatusRegister isr; @@ -473,8 +473,8 @@ namespace Cosmos.Hardware.Network.Devices.RTL8139 Console.WriteLine("Rx Configuration: " + Register.ReceiveConfigurationRegister.Load(mem).ToString()); Console.WriteLine("Tx Configuration: " + Register.TransmitConfigurationRegister.Load(mem).ToString()); Console.WriteLine("Tx Status Descr.: " + Register.TransmitStatusDescriptor.Load(mem).ToString()); - Console.WriteLine("Tx Start Address: " + valueReg.TransmitStartAddress); - Console.WriteLine("Current Descrip.: " + Register.TransmitStatusDescriptor.GetCurrentTSDescriptor()); + Console.WriteLine("Tx Start Address: " + valueReg.TransmitStartAddress.ToString()); + Console.WriteLine("Current Descrip.: " + Register.TransmitStatusDescriptor.GetCurrentTSDescriptor().ToString()); } @@ -514,6 +514,9 @@ namespace Cosmos.Hardware.Network.Devices.RTL8139 UInt32 address = pciCard.BaseAddress1 + (byte)Register.MainRegister.Bit.RxEarlyCnt; var xMem = new Kernel.MemoryAddressSpace(address, 1); xMem.Write8(0, (byte)bytecount); + + //TODO: The code above (with the warning, could probably be replaced with the following line). Need to test. + //mem.Write8((byte)Register.MainRegister.Bit.RxEarlyCnt, 0); } /// diff --git a/source/Cosmos/Cosmos.Hardware/Network/MACAddress.cs b/source/Cosmos/Cosmos.Hardware/Network/MACAddress.cs index bff826938..60e7c0a86 100644 --- a/source/Cosmos/Cosmos.Hardware/Network/MACAddress.cs +++ b/source/Cosmos/Cosmos.Hardware/Network/MACAddress.cs @@ -75,6 +75,11 @@ namespace Cosmos.Hardware.Network throw new ArgumentException("obj is not a MACAddress", "obj"); } + public override int GetHashCode() + { + return (GetType().FullName + "|" + this.ToString()).GetHashCode(); + } + public override string ToString() { string address = string.Empty;