diff options
| author | Warner Losh <imp@FreeBSD.org> | 2022-09-16 15:09:16 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2022-09-16 15:18:57 +0000 |
| commit | 59b1d074280d6b060cca6f502a2b33933614cce0 (patch) | |
| tree | 96bed36844385c30f2010a6ffaa9222100fd0827 /sys/i386/include/bootinfo.h | |
| parent | d43bcf62a2182d3f00c11e5145c8912f4468871a (diff) | |
Diffstat (limited to 'sys/i386/include/bootinfo.h')
| -rw-r--r-- | sys/i386/include/bootinfo.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sys/i386/include/bootinfo.h b/sys/i386/include/bootinfo.h index 71cc5dc4a348..5b9473ddcaba 100644 --- a/sys/i386/include/bootinfo.h +++ b/sys/i386/include/bootinfo.h @@ -40,7 +40,7 @@ /* Only change the version number if you break compatibility. */ #define BOOTINFO_VERSION 1 -#define N_BIOS_GEOM 8 +#define _WAS_N_BIOS_GEOM 8 /* * A zero bootinfo field often means that there is no info available. @@ -52,12 +52,12 @@ struct bootinfo { u_int32_t bi_kernelname; /* represents a char * */ u_int32_t bi_nfs_diskless; /* struct nfs_diskless * */ /* End of fields that are always present. */ -#define bi_endcommon bi_n_bios_used - u_int32_t bi_n_bios_used; - u_int32_t bi_bios_geom[N_BIOS_GEOM]; +#define bi_endcommon _was_bi_n_bios_used + u_int32_t _was_bi_n_bios_used; + u_int32_t _was_bi_bios_geom[_WAS_N_BIOS_GEOM]; u_int32_t bi_size; u_int8_t bi_memsizes_valid; - u_int8_t bi_bios_dev; /* bootdev BIOS unit number */ + u_int8_t bi_bios_dev; /* bootdev BIOS unit number (bootX -> loader only) */ u_int8_t bi_pad[2]; u_int32_t bi_basemem; u_int32_t bi_extmem; @@ -67,13 +67,13 @@ struct bootinfo { u_int32_t bi_kernend; /* end of kernel space */ u_int32_t bi_envp; /* environment */ u_int32_t bi_modulep; /* preloaded modules */ - uint32_t bi_memdesc_version; /* EFI memory desc version */ - uint64_t bi_memdesc_size; /* sizeof EFI memory desc */ - uint64_t bi_memmap; /* pa of EFI memory map */ - uint64_t bi_memmap_size; /* size of EFI memory map */ - uint64_t bi_hcdp; /* DIG64 HCDP table */ - uint64_t bi_fpswa; /* FPSWA interface */ - uint64_t bi_systab; /* pa of EFI system table */ + uint32_t _was_bi_memdesc_version;/* EFI memory desc version */ + uint64_t _was_bi_memdesc_size; /* sizeof EFI memory desc */ + uint64_t _was_bi_memmap; /* pa of EFI memory map */ + uint64_t _was_bi_memmap_size; /* size of EFI memory map */ + uint64_t _was_bi_hcdp; /* DIG64 HCDP table */ + uint64_t _was_bi_fpswa; /* FPSWA interface */ + uint64_t _was_bi_systab; /* pa of EFI system table */ }; #ifdef _KERNEL |