From 9308aaa3006f25080a1808a5c64917f175200428 Mon Sep 17 00:00:00 2001 From: Curle Date: Mon, 19 Aug 2019 23:50:59 +0100 Subject: [PATCH] Fix some small pointer issues. --- kernel/memory.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/memory.c b/kernel/memory.c index c8a3ef4..4fcb336 100644 --- a/kernel/memory.c +++ b/kernel/memory.c @@ -143,7 +143,7 @@ size_t FetchInstalledMemory() { } // From Syncboot/memory.c -static const char Memory_Segments[16][27] = { +static const char Memory_Segments[20][27] = { "EfiReservedMemoryType ", "EfiLoaderCode ", "EfiLoaderData ", @@ -173,17 +173,17 @@ void PrintMemoryMap() { - printf(L"MemMapSize: %qx, MemMapDescriptorSize: %1u, MemMapDescriptorVersion: %u\r\n", Memory_Info.MemoryMapSize, Memory_Info.MemoryMapDescriptorSize, Memory_Info.MemoryMapDescriptorVersion); + printf("MemMapSize: %qx, MemMapDescriptorSize: %1u, MemMapDescriptorVersion: %u\r\n", Memory_Info.MemoryMapSize, Memory_Info.MemoryMapDescriptorSize, Memory_Info.MemoryMapDescriptorVersion); for (Piece = Memory_Info.MemoryMap; Piece < (EFI_MEMORY_DESCRIPTOR*)((uint8_t*)Memory_Info.MemoryMap + Memory_Info.MemoryMapSize); Piece = (EFI_MEMORY_DESCRIPTOR*)((UINT8*)Piece + Memory_Info.MemoryMapDescriptorSize)) { if (line % 20 == 0) { - printf(L"# Memory Type Phys Addr Start Num Of Pages Attr\r\n"); + printf("# Memory Type Phys Addr Start Num Of Pages Attr\r\n"); } - printf(L"%2hu: %s 0x%016qx 0x%qx 0x%qx\r\n", line, Memory_Segments[Piece->Type], Piece->PhysicalStart, Piece->NumberOfPages, Piece->Attribute); + printf("%2hu: %s 0x%016qx 0x%qx 0x%qx\r\n", line, Memory_Segments[Piece->Type], Piece->PhysicalStart, Piece->NumberOfPages, Piece->Attribute); line++; } }