dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-06-05 07:42:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed some warnings. Added GetHashCode to MACAddress.

Browse source
This commit is contained in:
Scalpel_cp 2008-06-08 20:39:04 +00:00
parent 06e7a2b9be
commit f2dcd0359e
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/Cosmos/Cosmos.Hardware/Network/Devices/RTL8139/RTL8139.cs
View file

@ -18,8 +18,8 @@ namespace Cosmos.Hardware.Network.Devices.RTL8139
private PCIDevice pciCard; private PCIDevice pciCard;
private Kernel.MemoryAddressSpace mem; private Kernel.MemoryAddressSpace mem;
private Register.MainRegister reg; //private Register.MainRegister reg;
private Register.CommandRegister cr; //private Register.CommandRegister cr;
private Register.ValueTypeRegisters valueReg; private Register.ValueTypeRegisters valueReg;
private Register.InterruptMaskRegister imr; private Register.InterruptMaskRegister imr;
private Register.InterruptStatusRegister isr; 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("Rx Configuration: " + Register.ReceiveConfigurationRegister.Load(mem).ToString());
Console.WriteLine("Tx Configuration: " + Register.TransmitConfigurationRegister.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 Status Descr.: " + Register.TransmitStatusDescriptor.Load(mem).ToString());
Console.WriteLine("Tx Start Address: " + valueReg.TransmitStartAddress); Console.WriteLine("Tx Start Address: " + valueReg.TransmitStartAddress.ToString());
Console.WriteLine("Current Descrip.: " + Register.TransmitStatusDescriptor.GetCurrentTSDescriptor()); 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; UInt32 address = pciCard.BaseAddress1 + (byte)Register.MainRegister.Bit.RxEarlyCnt;
var xMem = new Kernel.MemoryAddressSpace(address, 1); var xMem = new Kernel.MemoryAddressSpace(address, 1);
xMem.Write8(0, (byte)bytecount); 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);
} }
/// <summary> /// <summary>

5
source/Cosmos/Cosmos.Hardware/Network/MACAddress.cs
View file

@ -75,6 +75,11 @@ namespace Cosmos.Hardware.Network
throw new ArgumentException("obj is not a MACAddress", "obj"); throw new ArgumentException("obj is not a MACAddress", "obj");
} }
public override int GetHashCode()
{
return (GetType().FullName + "|" + this.ToString()).GetHashCode();
}
public override string ToString() public override string ToString()
{ {
string address = string.Empty; string address = string.Empty;