From def2fe5dc34172630d504077e413db5e0bf3535e Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sun, 21 Jan 2024 12:14:51 +0200
Subject: [PATCH] [HALAPIC] Rename a field for consistency

---
 hal/halx86/apic/apic.c  | 8 ++++----
 hal/halx86/apic/apicp.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hal/halx86/apic/apic.c b/hal/halx86/apic/apic.c
index 8ab184e917c..ae2c2e5a4ab 100644
--- a/hal/halx86/apic/apic.c
+++ b/hal/halx86/apic/apic.c
@@ -376,7 +376,7 @@ HalpAllocateSystemInterrupt(
 
     /* Setup a redirection entry */
     ReDirReg.Vector = Vector;
-    ReDirReg.DeliveryMode = APIC_MT_LowestPriority;
+    ReDirReg.MessageType = APIC_MT_LowestPriority;
     ReDirReg.DestinationMode = APIC_DM_Logical;
     ReDirReg.DeliveryStatus = 0;
     ReDirReg.Polarity = 0;
@@ -475,7 +475,7 @@ ApicInitializeIOApic(VOID)
 
     /* Setup a redirection entry */
     ReDirReg.Vector = APIC_FREE_VECTOR;
-    ReDirReg.DeliveryMode = APIC_MT_Fixed;
+    ReDirReg.MessageType = APIC_MT_Fixed;
     ReDirReg.DestinationMode = APIC_DM_Physical;
     ReDirReg.DeliveryStatus = 0;
     ReDirReg.Polarity = 0;
@@ -500,7 +500,7 @@ ApicInitializeIOApic(VOID)
 
     /* Enable the timer interrupt (but keep it masked) */
     ReDirReg.Vector = APIC_CLOCK_VECTOR;
-    ReDirReg.DeliveryMode = APIC_MT_Fixed;
+    ReDirReg.MessageType = APIC_MT_Fixed;
     ReDirReg.DestinationMode = APIC_DM_Physical;
     ReDirReg.TriggerMode = APIC_TGM_Edge;
     ReDirReg.Mask = 1;
@@ -696,7 +696,7 @@ HalEnableSystemInterrupt(
     if (ReDirReg.Vector != Vector)
     {
         ReDirReg.Vector = Vector;
-        ReDirReg.DeliveryMode = APIC_MT_LowestPriority;
+        ReDirReg.MessageType = APIC_MT_LowestPriority;
         ReDirReg.DestinationMode = APIC_DM_Logical;
         ReDirReg.Destination = 0;
     }
diff --git a/hal/halx86/apic/apicp.h b/hal/halx86/apic/apicp.h
index e794fa9131b..3ba238abfc7 100644
--- a/hal/halx86/apic/apicp.h
+++ b/hal/halx86/apic/apicp.h
@@ -298,7 +298,7 @@ typedef union _IOAPIC_REDIRECTION_REGISTER
     struct
     {
         UINT64 Vector:8;
-        UINT64 DeliveryMode:3;
+        UINT64 MessageType:3;
         UINT64 DestinationMode:1;
         UINT64 DeliveryStatus:1;
         UINT64 Polarity:1;