dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-05-27 14:02:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12 from aura-systems/network-update

Browse source 
MAC Address
This commit is contained in:
GeomTech 2017-10-03 23:02:28 +02:00 committed by GitHub
commit f7a21100e5
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,7 @@ namespace Cosmos.HAL.Drivers.PCI.Network
{
public class AMDPCNetII : NetworkDevice
{
protected PCIDeviceNormal pciCard;
protected PCIDevice pciCard;
protected AMDPCNetIIIOGroup io;
protected MACAddress mac;
protected bool mInitDone;
@ -24,7 +24,7 @@ namespace Cosmos.HAL.Drivers.PCI.Network
protected Queue<byte[]> mTransmitBuffer;
private int mNextTXDesc;
public AMDPCNetII(PCIDeviceNormal device)
public AMDPCNetII(PCIDevice device)
: base()
{
if (device == null)
@ -33,10 +33,10 @@ namespace Cosmos.HAL.Drivers.PCI.Network
}
this.pciCard = device;
// this.pciCard.Claimed = true;
//this.pciCard.Claimed = true;
//this.pciCard.EnableDevice();
//this.io = new AMDPCNetIIIOGroup((ushort) this.pciCard.BaseAddresses[0].BaseAddress());
this.io = new AMDPCNetIIIOGroup((ushort) this.pciCard.BaseAddressBar[0].BaseAddress);
this.io.RegisterData.DWord = 0;
// Get the EEPROM MAC Address and set it as the devices MAC
@ -134,17 +134,18 @@ namespace Cosmos.HAL.Drivers.PCI.Network
/// </summary>
public static void FindAll()
{
Console.WriteLine("Scanning for AMD PCNetII cards...");
// PCIDevice device = Cosmos.HAL.PCI.GetDevice(0x1022, 0x2000);
// if (device != null)
// {
// AMDPCNetII nic = new AMDPCNetII((PCIDeviceNormal) 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());
// }
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());
}
}
#region Register Access Properties
@ -345,4 +346,4 @@ namespace Cosmos.HAL.Drivers.PCI.Network
#endregion
}
}
}