From a72f87e73146e2ef985ab19d623c61f5aa4e9a91 Mon Sep 17 00:00:00 2001
From: Rafal Kupiec <belliash@codingworkshop.eu.org>
Date: Mon, 29 Jan 2024 19:35:30 +0100
Subject: [PATCH] Update memory mapping related structures for i686
 architecture

---
 xtldr/arch/i686/memory.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/xtldr/arch/i686/memory.c b/xtldr/arch/i686/memory.c
index a2192d4..2ef67d0 100644
--- a/xtldr/arch/i686/memory.c
+++ b/xtldr/arch/i686/memory.c
@@ -23,12 +23,12 @@ XTCDECL
 EFI_STATUS
 BlBuildPageMap(IN PXTBL_PAGE_MAPPING PageMap)
 {
+    PLIST_ENTRY ListEntry, ModulesList, ModulesListEntry;
     EFI_PHYSICAL_ADDRESS Address, DirectoryAddress;
+    PXTBL_MODULE_INFO ModuleInfo;
+    PXTBL_MEMORY_MAPPING Mapping;
     EFI_STATUS Status;
     ULONG Index;
-    PLIST_ENTRY ListEntry, ModulesList, ModulesListEntry;
-    PXTBL_MODULE_INFO ModuleInfo;
-    PLOADER_MEMORY_MAPPING Mapping;
 
     /* Allocate pages for the Page Map */
     Status = BlAllocateMemoryPages(1, &Address);
@@ -119,7 +119,7 @@ BlBuildPageMap(IN PXTBL_PAGE_MAPPING PageMap)
     while(ListEntry != &PageMap->MemoryMap)
     {
         /* Take mapping from the list */
-        Mapping = CONTAIN_RECORD(ListEntry, LOADER_MEMORY_MAPPING, ListEntry);
+        Mapping = CONTAIN_RECORD(ListEntry, XTBL_MEMORY_MAPPING, ListEntry);
 
         /* Check if virtual address is set */
         if(Mapping->VirtualAddress)