From 0beb57eae885237e3fdaff65bdadbd2828a7dee4 Mon Sep 17 00:00:00 2001
From: Alex <enderice2@users.noreply.github.com>
Date: Tue, 25 Oct 2022 02:51:53 +0300
Subject: [PATCH] Fix for APIC

---
 .../cpu/AdvancedProgrammableInterruptController.cpp   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Architecture/amd64/cpu/AdvancedProgrammableInterruptController.cpp b/Architecture/amd64/cpu/AdvancedProgrammableInterruptController.cpp
index e5c7dcb..6ad3bc1 100644
--- a/Architecture/amd64/cpu/AdvancedProgrammableInterruptController.cpp
+++ b/Architecture/amd64/cpu/AdvancedProgrammableInterruptController.cpp
@@ -86,7 +86,7 @@ namespace APIC
 
     void APIC::WaitForIPI()
     {
-        InterruptCommandRegisterLow icr;
+        InterruptCommandRegisterLow icr = {.raw = 0};
         do
         {
             icr.raw = this->Read(APIC_ICRLO);
@@ -119,7 +119,7 @@ namespace APIC
         }
         else
         {
-            InterruptCommandRegisterLow icr;
+            InterruptCommandRegisterLow icr = {.raw = 0};
             icr.DeliveryMode = INIT;
             icr.Level = Assert;
             this->Write(APIC_ICRHI, (CPU << 24));
@@ -138,7 +138,7 @@ namespace APIC
         }
         else
         {
-            InterruptCommandRegisterLow icr;
+            InterruptCommandRegisterLow icr = {.raw = 0};
             icr.Vector = StartupAddress >> 12;
             icr.DeliveryMode = Startup;
             icr.Level = Assert;
@@ -173,6 +173,8 @@ namespace APIC
             return;
         }
 
+        // TODO: IOAPICRedirectEntry Entry = {.raw = 0};
+
         if (Flags & ActiveHighLow)
             Value |= (1 << 13);
 
@@ -182,8 +184,7 @@ namespace APIC
         if (!Status)
             Value |= (1 << 16);
 
-        // Value |= (((uintptr_t)GetCPU(CPU)->Data->LAPIC.APICId) << 56);
-        Value |= (((uintptr_t)0) << 56);
+        Value |= (((uintptr_t)CPU) << 56);
         uint32_t IORegister = (GSI - ((ACPI::MADT *)PowerManager->GetMADT())->ioapic[IOAPICTarget]->GSIBase) * 2 + 16;
 
         this->IOWrite(((ACPI::MADT *)PowerManager->GetMADT())->ioapic[IOAPICTarget]->Address, IORegister, (uint32_t)Value);