From a0a107523bf0823cd3c4113c163e5f8876e70695 Mon Sep 17 00:00:00 2001 From: GeomTech Date: Tue, 3 Oct 2017 23:01:31 +0200 Subject: [PATCH] MAC Address --- .../Drivers/PCI/Network/AMDPCNetII.cs | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/source/Cosmos.HAL2/Drivers/PCI/Network/AMDPCNetII.cs b/source/Cosmos.HAL2/Drivers/PCI/Network/AMDPCNetII.cs index b22c99843..7bd2fdc87 100644 --- a/source/Cosmos.HAL2/Drivers/PCI/Network/AMDPCNetII.cs +++ b/source/Cosmos.HAL2/Drivers/PCI/Network/AMDPCNetII.cs @@ -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 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 /// 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 } -} \ No newline at end of file +}