summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2015-09-03 15:52:17 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2015-09-03 15:52:17 +0000
commit3ddd6f773b3d747e191065e36c1e375178c993ee (patch)
treee92ebedfe40b275a762f2d608062b2514044b2f7 /sys
parent53bb6ff8aafd3cd4f1aaa924bbd82f949cdc4931 (diff)
match amd64; bios_efi_info_t is required here as well, because acpidump
compiles on more than one platform.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/i386/include/biosvar.h18
1 files changed, 17 insertions, 1 deletions
diff --git a/sys/arch/i386/include/biosvar.h b/sys/arch/i386/include/biosvar.h
index 9852bd8b45d..f51b2d020b5 100644
--- a/sys/arch/i386/include/biosvar.h
+++ b/sys/arch/i386/include/biosvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: biosvar.h,v 1.63 2015/07/17 21:36:56 mlarkin Exp $ */
+/* $OpenBSD: biosvar.h,v 1.64 2015/09/03 15:52:16 deraadt Exp $ */
/*
* Copyright (c) 1997-1999 Michael Shalayeff
@@ -222,6 +222,21 @@ typedef struct _bios_bootsr {
u_int8_t maskkey[BOOTSR_CRYPTO_MAXKEYBYTES];
} __packed bios_bootsr_t;
+#define BOOTARG_EFIINFO 11
+typedef struct _bios_efiinfo {
+ uint64_t config_acpi;
+ uint64_t config_smbios;
+ uint64_t fb_addr;
+ uint64_t fb_size;
+ uint32_t fb_height;
+ uint32_t fb_width;
+ uint32_t fb_pixpsl; /* pixels per scan line */
+ uint32_t fb_red_mask;
+ uint32_t fb_green_mask;
+ uint32_t fb_blue_mask;
+ uint32_t fb_reserved_mask;
+} __packed bios_efiinfo_t;
+
#if defined(_KERNEL) || defined (_STANDALONE)
#ifdef _LOCORE
@@ -272,6 +287,7 @@ void bios32_cleanup(void);
extern u_int bootapiver;
extern bios_memmap_t *bios_memmap;
+extern bios_efiinfo_t *bios_efiinfo;
extern void *bios_smpinfo;
extern bios_pciinfo_t *bios_pciinfo;