From owner-p4-projects@FreeBSD.ORG Sun Nov 28 04:37:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A48AB16A4D1; Sun, 28 Nov 2004 04:37:53 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4E58316A4CF for ; Sun, 28 Nov 2004 04:37:53 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D5A243D2F for ; Sun, 28 Nov 2004 04:37:53 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAS4braK073053 for ; Sun, 28 Nov 2004 04:37:53 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAS4bqor073050 for perforce@freebsd.org; Sun, 28 Nov 2004 04:37:52 GMT (envelope-from marcel@freebsd.org) Date: Sun, 28 Nov 2004 04:37:52 GMT Message-Id: <200411280437.iAS4bqor073050@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 65966 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Nov 2004 04:37:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=65966 Change 65966 by marcel@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;