From owner-svn-src-projects@FreeBSD.ORG Thu Mar 27 21:19:06 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9B07BAD0; Thu, 27 Mar 2014 21:19:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6E5517D4; Thu, 27 Mar 2014 21:19:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2RLJ6pu085335; Thu, 27 Mar 2014 21:19:06 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2RLJ6g8085332; Thu, 27 Mar 2014 21:19:06 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201403272119.s2RLJ6g8085332@svn.freebsd.org> From: Ed Maste Date: Thu, 27 Mar 2014 21:19:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r263840 - projects/uefi/sys/boot/amd64/efi X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Mar 2014 21:19:06 -0000 Author: emaste Date: Thu Mar 27 21:19:05 2014 New Revision: 263840 URL: http://svnweb.freebsd.org/changeset/base/263840 Log: Update for EFI header changes Sponsored by: The FreeBSD Foundation Modified: projects/uefi/sys/boot/amd64/efi/bootinfo.c projects/uefi/sys/boot/amd64/efi/framebuffer.c Modified: projects/uefi/sys/boot/amd64/efi/bootinfo.c ============================================================================== --- projects/uefi/sys/boot/amd64/efi/bootinfo.c Thu Mar 27 20:46:46 2014 (r263839) +++ projects/uefi/sys/boot/amd64/efi/bootinfo.c Thu Mar 27 21:19:05 2014 (r263840) @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include @@ -222,13 +221,13 @@ bi_load_efi_data(struct preloaded_file * size_t efisz; UINTN mmsz, pages, sz; UINT32 mmver; - struct efi_header *efihdr; + struct efi_map_header *efihdr; struct efi_fb efifb; if (efi_find_framebuffer(&efifb) == 0) file_addmetadata(kfp, MODINFOMD_EFI_FB, sizeof(efifb), &efifb); - efisz = (sizeof(struct efi_header) + 0xf) & ~0xf; + efisz = (sizeof(struct efi_map_header) + 0xf) & ~0xf; /* * Allocate enough pages to hold the bootinfo block and the memory @@ -257,7 +256,7 @@ bi_load_efi_data(struct preloaded_file * * memory map on a 16-byte boundary (the bootinfo block is page * aligned). */ - efihdr = (struct efi_header *)addr; + efihdr = (struct efi_map_header *)addr; mm = (void *)((uint8_t *)efihdr + efisz); sz = (EFI_PAGE_SIZE * pages) - efisz; status = BS->GetMemoryMap(&sz, mm, &x86_efi_mapkey, &mmsz, &mmver); Modified: projects/uefi/sys/boot/amd64/efi/framebuffer.c ============================================================================== --- projects/uefi/sys/boot/amd64/efi/framebuffer.c Thu Mar 27 20:46:46 2014 (r263839) +++ projects/uefi/sys/boot/amd64/efi/framebuffer.c Thu Mar 27 21:19:05 2014 (r263840) @@ -33,8 +33,7 @@ __FBSDID("$FreeBSD$"); #include #include - -#include +#include static EFI_GUID gop_guid = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID;