Merge pull request CosmosOS#856 from valentinbreiz/patch-1

Little fix on PCI VendorID.
incognel · Jan 11, 2018 · 5378447 · 5378447
2 parents 40d54b2 + ac3a392
commit 5378447
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/source/Cosmos.HAL2/Drivers/PCI/Network/AMDPCNetII.cs b/source/Cosmos.HAL2/Drivers/PCI/Network/AMDPCNetII.cs
@@ -135,7 +135,7 @@ protected void HandleNetworkInterrupt(ref INTs.IRQContext aContext)
         public static void FindAll()
         {
           Console.WriteLine("Scanning for AMD PCNetII cards...");
-          // PCIDevice device = Cosmos.HAL.PCI.GetDevice(0x1022, 0x2000);
+          //  PCIDevice device = Cosmos.HAL.PCI.GetDevice(VendorID.AMD, DeviceID.PCNETII);
           //  if (device != null)
           // {
           //      AMDPCNetII nic = new AMDPCNetII((PCIDeviceNormal) device);
@@ -345,4 +345,4 @@ private void ReadRawData()
 
         #endregion
     }
-}
+}
diff --git a/source/Cosmos.HAL2/PCI.cs b/source/Cosmos.HAL2/PCI.cs
@@ -61,13 +61,14 @@ public enum ProgramIF
     public enum VendorID
     {
         Intel = 0x8086,
-        AMD = 0x0438,
+        AMD = 0x1022,
         VMWare = 0x15AD
     }
 
     public enum DeviceID
     {
-        SVGAIIAdapter = 0x0405
+        SVGAIIAdapter = 0x0405,
+        PCNETII = 0x2000
     }
 
     public class PCI