"Fix" IRQ routing for PCI devices

Author: valentinbreiz

source/Cosmos.HAL2/Drivers/PCI/Network/AMDPCNetII.cs

@@ -96,37 +96,19 @@ public AMDPCNetII(PCIDevice device)
             mTransmitBuffer = new Queue<byte[]>();
             mRecvBuffer = new Queue<byte[]>();
 
-            //INTs.SetIntHandler((byte)(0x20 + device.InterruptLine), HandleNetworkInterrupt);
-            //IOAPIC.SetEntry(19, (byte)(0x20 + device.InterruptLine));
+            INTs.SetIntHandler((byte)(0x20 + device.InterruptLine), HandleNetworkInterrupt);
 
-            /*Global.mDebugger.Send("device slot=" + device.slot);
-            Global.mDebugger.Send("device function=" + device.function);
-
-            foreach (var irqRouting in ACPI.IrqRoutingTable)
+            //Route IRQ for all IO/APIC PCI IRQ (I16-I20)
+            //We will have to fix this if we use multiple PCI devices that requires interrupts
+            //TODO: Use ACPI to find IRQ route
+            for (byte i = 0; i < 4; i++)
             {
-                byte slot = (byte)((irqRouting.Address >> 16) & 0xFFFF);
-                byte function = (byte)(irqRouting.Address & 0xFFFF);
-
-                Global.mDebugger.Send("slot=" + slot);
-                Global.mDebugger.Send("function=" + function);
-                Global.mDebugger.Send("Address=0x" + (irqRouting.Address).ToString("X"));
-                Global.mDebugger.Send("Pin=" + irqRouting.Pin);
-                Global.mDebugger.Send("Source=" + irqRouting.Source);
-                Global.mDebugger.Send("Source Index=" + irqRouting.SourceIndex);
-
-                if (device.slot == slot && device.function == function)
-                {
-                    Global.mDebugger.Send("DEVICE FOUND SETTING CUSTOM IRQ " + irqRouting.SourceIndex);
-
-                    
-                }
-            }*/
+                IOAPIC.SetEntry((byte)(16 + i), (ulong)(0x20 + device.InterruptLine));
+            }
         }
 
         protected void HandleNetworkInterrupt(ref INTs.IRQContext aContext)
         {
-            Global.mDebugger.Send("Network IRQ!");
-
             uint cur_status = StatusRegister;
 
             if ((cur_status & 0x100) != 0)

source/Cosmos.HAL2/Drivers/PCI/Network/RTL8139.cs

@@ -31,7 +31,15 @@ public RTL8139(PCIDevice device)
             // We are handling this device
             pciCard.Claimed = true;
             // Setup interrupt handling
-            INTs.SetIrqHandler(device.InterruptLine, HandleNetworkInterrupt);
+            INTs.SetIntHandler((byte)(0x20 + device.InterruptLine), HandleNetworkInterrupt);
+
+            //Route IRQ for all IO/APIC PCI IRQ (I16-I20)
+            //We will have to fix this if we use multiple PCI devices that requires interrupts
+            //TODO: Use ACPI to find IRQ route
+            for (byte i = 0; i < 4; i++)
+            {
+                IOAPIC.SetEntry((byte)(16 + i), (ulong)(0x20 + device.InterruptLine));
+            }
             // Get IO Address from PCI Bus
             // Enable the card
             pciCard.EnableDevice();