summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Jones <pjones@redhat.com>2023-03-28 12:21:08 +0100
committerNigel Croxon <ncroxon@redhat.com>2023-03-28 07:58:51 -0400
commit3d82853ffe4a767275bdfaac3921704b1eb659f3 (patch)
tree3722d30c6d9b524f73007dce4abaf56323a2add9
parent5e2444d11524a76e7b55c0e465447a167ea20000 (diff)
downloadgnu-efi-3d82853ffe4a767275bdfaac3921704b1eb659f3.tar.gz
lfbgrid: Make pointer size testing not arch name dependent
-rw-r--r--apps/lfbgrid.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/apps/lfbgrid.c b/apps/lfbgrid.c
index 3153ae1..8a5c6bd 100644
--- a/apps/lfbgrid.c
+++ b/apps/lfbgrid.c
@@ -51,11 +51,9 @@ draw_boxes(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop)
UINTN NumPixels;
UINT32 *PixelBuffer;
UINT32 CopySize, BufferSize;
-#if defined(__x86_64__) || defined(__aarch64__) || \
- (defined (__riscv) && __riscv_xlen == 64) || \
- defined(__loongarch64)
+#if __SIZEOF_POINTER__ == 8
UINT64 FrameBufferAddr;
-#elif defined(__i386__) || defined(__arm__)
+#elif __SIZEOF_POINTER__ == 4
UINT32 FrameBufferAddr;
#else
#error YOUR ARCH HERE
@@ -116,11 +114,9 @@ draw_boxes(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop)
Print(L"No linear framebuffer on this device.\n");
return;
}
-#if defined(__x86_64__) || defined(__aarch64__) || \
- (defined (__riscv) && __riscv_xlen == 64) || \
- defined(__loongarch64)
+#if __SIZEOF_POINTER__ == 8
FrameBufferAddr = (UINT64)gop->Mode->FrameBufferBase;
-#elif defined(__i386__) || defined(__arm__)
+#elif __SIZEOF_POINTER__ == 4
FrameBufferAddr = (UINT32)(UINT64)gop->Mode->FrameBufferBase;
#else
#error YOUR ARCH HERE