🐛 Fix IRQ handling

CosmosOS · Dec 26, 2023 · bda39ef · bda39ef
1 parent 757da7b
commit bda39ef
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/source/Cosmos.Core/INTs.cs b/source/Cosmos.Core/INTs.cs
@@ -283,7 +283,7 @@ public static void SetIntHandler(byte aIntNo, IRQDelegate aHandler) {
         /// <param name="aIrqNo">IRQ index.</param>
         /// <param name="aHandler">IRQ handler.</param>
         public static void SetIrqHandler(byte aIrqNo, IRQDelegate aHandler) {
-            IOAPIC.SetEntry(aIrqNo);
+            IOAPIC.SetEntry((uint)aIrqNo + 0x20);
             SetIntHandler((byte)(0x20 + aIrqNo), aHandler);
         }
 

diff --git a/source/Cosmos.Core/IOAPIC.cs b/source/Cosmos.Core/IOAPIC.cs
@@ -82,22 +82,20 @@ public static uint In(byte reg)
         /// <summary>
         /// Set IO APIC Entry.
         /// </summary>
-        /// <param name="index">Entry index.</param>
-        /// <param name="data">Data.</param>
-        /// <param name="lapicId">Local APIC Id.</param>
-        public static void SetEntry(byte index, ulong data, uint lapicId = 0)
+        /// <param name="data">Irq ID.</param>
+        public static void SetEntry(uint irq)
         {
-            Out((byte)(IOREDTBL + index * 2), (uint)data);
-            Out((byte)(IOREDTBL + index * 2 + 1), (lapicId << 24));
+            SetEntry((byte)ACPI.RemapIRQ(irq - 0x20), irq);
         }
 
         /// <summary>
         /// Set IO APIC Entry.
         /// </summary>
         /// <param name="data">Irq ID.</param>
-        public static void SetEntry(uint irq)
+        public static void SetEntry(byte index, ulong data)
         {
-            SetEntry((byte)ACPI.RemapIRQ(irq), 0x20 + irq);
+            Out((byte)(IOREDTBL + index * 2), (uint)data);
+            Out((byte)(IOREDTBL + index * 2 + 1), (uint)(data >> 32));
         }
 
         /// <summary>

diff --git a/source/Cosmos.HAL2/Drivers/Network/AMDPCNetII.cs b/source/Cosmos.HAL2/Drivers/Network/AMDPCNetII.cs
@@ -149,7 +149,6 @@ protected void HandleNetworkInterrupt(ref INTs.IRQContext aContext)
             }
 
             StatusRegister = cur_status;
-            Core.Global.PIC.EoiSlave();
         }
 
         /// <summary>