|
 |
4c0d37 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
4c0d37 |
From: Peter Jones <pjones@redhat.com>
|
|
|
4c0d37 |
Date: Tue, 14 Jan 2020 10:13:30 -0500
|
|
|
4c0d37 |
Subject: [PATCH] lfbgrid: Make pointer size testing not arch name dependent.
|
|
|
4c0d37 |
|
|
|
4c0d37 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
4c0d37 |
---
|
|
|
4c0d37 |
apps/lfbgrid.c | 8 ++++----
|
|
|
4c0d37 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
4c0d37 |
|
|
|
4c0d37 |
diff --git a/apps/lfbgrid.c b/apps/lfbgrid.c
|
|
|
4c0d37 |
index ac50f4eafa9..e9fef957d94 100644
|
|
|
4c0d37 |
--- a/apps/lfbgrid.c
|
|
|
4c0d37 |
+++ b/apps/lfbgrid.c
|
|
|
4c0d37 |
@@ -51,9 +51,9 @@ draw_boxes(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop)
|
|
|
4c0d37 |
UINTN NumPixels;
|
|
|
4c0d37 |
UINT32 *PixelBuffer;
|
|
|
4c0d37 |
UINT32 CopySize, BufferSize;
|
|
|
4c0d37 |
-#if defined(__x86_64__) || defined(__aarch64__)
|
|
|
4c0d37 |
+#if __SIZEOF_POINTER__ == 8
|
|
|
4c0d37 |
UINT64 FrameBufferAddr;
|
|
|
4c0d37 |
-#elif defined(__i386__) || defined(__arm__)
|
|
|
4c0d37 |
+#elif __SIZEOF_POINTER__ == 4
|
|
|
4c0d37 |
UINT32 FrameBufferAddr;
|
|
|
4c0d37 |
#else
|
|
|
4c0d37 |
#error YOUR ARCH HERE
|
|
|
4c0d37 |
@@ -115,9 +115,9 @@ draw_boxes(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop)
|
|
|
4c0d37 |
Print(L"No linear framebuffer on this device.\n");
|
|
|
4c0d37 |
return;
|
|
|
4c0d37 |
}
|
|
|
4c0d37 |
-#if defined(__x86_64__) || defined(__aarch64__)
|
|
|
4c0d37 |
+#if __SIZEOF_POINTER__ == 8
|
|
|
4c0d37 |
FrameBufferAddr = (UINT64)gop->Mode->FrameBufferBase;
|
|
|
4c0d37 |
-#elif defined(__i386__) || defined(__arm__)
|
|
|
4c0d37 |
+#elif __SIZEOF_POINTER__ == 4
|
|
|
4c0d37 |
FrameBufferAddr = (UINT32)(UINT64)gop->Mode->FrameBufferBase;
|
|
|
4c0d37 |
#else
|
|
|
4c0d37 |
#error YOUR ARCH HERE
|