dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-05-24 12:35:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update AMDPCNetII.cs

Browse source
This commit is contained in:
Valentin Charbonnier 2018-01-22 22:36:42 +01:00 committed by GitHub
parent ce1c49a13d
commit 9c78f671ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
source/Cosmos.HAL2/Drivers/PCI/Network/AMDPCNetII.cs
View file

@ -10,7 +10,7 @@ namespace Cosmos.HAL.Drivers.PCI.Network
{ {
public class AMDPCNetII : NetworkDevice public class AMDPCNetII : NetworkDevice
{ {
protected PCIDevice pciCard; protected PCIDeviceNormal pciCard;
protected AMDPCNetIIIOGroup io; protected AMDPCNetIIIOGroup io;
protected MACAddress mac; protected MACAddress mac;
protected bool mInitDone; protected bool mInitDone;
@ -24,7 +24,7 @@ namespace Cosmos.HAL.Drivers.PCI.Network
protected Queue<byte[]> mTransmitBuffer; protected Queue<byte[]> mTransmitBuffer;
private int mNextTXDesc; private int mNextTXDesc;
public AMDPCNetII(PCIDevice device) public AMDPCNetII(PCIDeviceNormal device)
: base() : base()
{ {
if (device == null) if (device == null)
@ -33,10 +33,10 @@ namespace Cosmos.HAL.Drivers.PCI.Network
} }
this.pciCard = device; this.pciCard = device;
//this.pciCard.Claimed = true; // this.pciCard.Claimed = true;
//this.pciCard.EnableDevice(); //this.pciCard.EnableDevice();
this.io = new AMDPCNetIIIOGroup((ushort) this.pciCard.BaseAddressBar[0].BaseAddress); //this.io = new AMDPCNetIIIOGroup((ushort) this.pciCard.BaseAddresses[0].BaseAddress());
this.io.RegisterData.DWord = 0; this.io.RegisterData.DWord = 0;
// Get the EEPROM MAC Address and set it as the devices MAC // Get the EEPROM MAC Address and set it as the devices MAC
@ -129,55 +129,22 @@ namespace Cosmos.HAL.Drivers.PCI.Network
Cosmos.Core.Global.PIC.EoiSlave(); Cosmos.Core.Global.PIC.EoiSlave();
} }
//
// Retrieve all AMD PCNetII network cards found on computer.
//
//public static void FindAll()
//{
// Console.WriteLine("Scanning for AMD PCNetII cards...");
// PCIDevice device;
// device = HAL.PCI.GetDevice(0x1022, 0x2000);
// if (device != null)
// {
// AMDPCNetII nic = new AMDPCNetII(device);
// Console.WriteLine("Found AMD PCNetII NIC on PCI " + device.bus + ":" + device.slot + ":" +
// device.function);
// Console.WriteLine("NIC IRQ: " + device.InterruptLine);
// Console.WriteLine("NIC MAC Address: " + nic.MACAddress.ToString());
// }
//}
public static bool NetworkCardAvailable()
{
PCIDevice device;
device = HAL.PCI.GetDevice(VendorID.AMD, DeviceID.PCNETII);
if (device != null)
{
return true;
}
else
{
return false;
}
}
/// <summary> /// <summary>
/// Get MAC Address String /// Retrieve all AMD PCNetII network cards found on computer.
/// </summary> /// </summary>
public static string PhysicalAdress() public static void FindAll()
{ {
PCIDevice device; Console.WriteLine("Scanning for AMD PCNetII cards...");
device = HAL.PCI.GetDevice(VendorID.AMD, DeviceID.PCNETII); // PCIDevice device = Cosmos.HAL.PCI.GetDevice(VendorID.AMD, DeviceID.PCNETII);
if (NetworkCardAvailable()) // if (device != null)
{ // {
AMDPCNetII nic = new AMDPCNetII(device); // AMDPCNetII nic = new AMDPCNetII((PCIDeviceNormal) device);
return nic.MACAddress.ToString(); //
} // Console.WriteLine("Found AMD PCNetII NIC on PCI " + device.bus + ":" + device.slot + ":" +
else // device.function);
{ // Console.WriteLine("NIC IRQ: " + device.InterruptLine);
return ""; // Console.WriteLine("NIC MAC Address: " + nic.MACAddress.ToString());
} // }
} }
#region Register Access Properties #region Register Access Properties