PERFORCE change 65966 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sat Nov 27 20:37:54 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=65966
Change 65966 by marcel at marcel_nfs on 2004/11/28 04:37:15
IFC @65965
Affected files ...
.. //depot/projects/ia64/sys/ia64/include/bootinfo.h#8 integrate
Differences ...
==== //depot/projects/ia64/sys/ia64/include/bootinfo.h#8 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/ia64/include/bootinfo.h,v 1.6 2002/12/08 20:32:56 marcel Exp $ */
+/* $FreeBSD: src/sys/ia64/include/bootinfo.h,v 1.7 2004/11/28 04:34:17 marcel Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
@@ -26,40 +26,25 @@
* rights to redistribute these changes.
*/
-/*
- * The boot program passes a pointer (in the boot environment virtual
- * address address space; "BEVA") to a bootinfo to the kernel using
- * the following convention:
- *
- * a0 contains first free page frame number
- * a1 contains page number of current level 1 page table
- * if a2 contains BOOTINFO_MAGIC and a4 is nonzero:
- * a3 contains pointer (BEVA) to bootinfo
- * a4 contains bootinfo version number
- * if a2 contains BOOTINFO_MAGIC and a4 contains 0 (backward compat):
- * a3 contains pointer (BEVA) to bootinfo version
- * (u_long), then the bootinfo
- */
-
-#define BOOTINFO_MAGIC 0xdeadbeeffeedface
-
struct bootinfo {
- u_int64_t bi_magic; /* BOOTINFO_MAGIC */
- u_int64_t bi_version; /* version 1 */
- u_int64_t bi_spare[6]; /* was: name of booted kernel */
- u_int64_t bi_hcdp; /* DIG64 HCDP table */
- u_int64_t bi_fpswa; /* FPSWA interface */
- u_int64_t bi_boothowto; /* value for boothowto */
- u_int64_t bi_systab; /* pa of EFI system table */
- u_int64_t bi_memmap; /* pa of EFI memory map */
- u_int64_t bi_memmap_size; /* size of EFI memory map */
- u_int64_t bi_memdesc_size; /* sizeof EFI memory desc */
- u_int32_t bi_memdesc_version; /* EFI memory desc version */
- u_int64_t bi_symtab; /* start of kernel sym table */
- u_int64_t bi_esymtab; /* end of kernel sym table */
- u_int64_t bi_kernend; /* end of kernel space */
- u_int64_t bi_envp; /* environment */
- u_int64_t bi_modulep; /* preloaded modules */
+ uint64_t bi_magic; /* BOOTINFO_MAGIC */
+#define BOOTINFO_MAGIC 0xdeadbeeffeedface
+ uint64_t bi_version; /* version 1 */
+ uint64_t bi_spare[6]; /* was: name of booted kernel */
+ uint64_t bi_hcdp; /* DIG64 HCDP table */
+ uint64_t bi_fpswa; /* FPSWA interface */
+ uint64_t bi_boothowto; /* value for boothowto */
+ uint64_t bi_systab; /* pa of EFI system table */
+ uint64_t bi_memmap; /* pa of EFI memory map */
+ uint64_t bi_memmap_size; /* size of EFI memory map */
+ uint64_t bi_memdesc_size; /* sizeof EFI memory desc */
+ uint32_t bi_memdesc_version; /* EFI memory desc version */
+ uint32_t bi_spare2;
+ uint64_t bi_symtab; /* start of kernel sym table */
+ uint64_t bi_esymtab; /* end of kernel sym table */
+ uint64_t bi_kernend; /* end of kernel space */
+ uint64_t bi_envp; /* environment */
+ uint64_t bi_modulep; /* preloaded modules */
};
extern struct bootinfo bootinfo;
More information about the p4-projects
mailing list