From owner-svn-src-projects@FreeBSD.ORG Thu Mar 27 19:53:38 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 52975D91; Thu, 27 Mar 2014 19:53:38 +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 25C14D3C; Thu, 27 Mar 2014 19:53:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2RJrclP050864; Thu, 27 Mar 2014 19:53:38 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2RJrbrH050862; Thu, 27 Mar 2014 19:53:37 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201403271953.s2RJrbrH050862@svn.freebsd.org> From: Ed Maste Date: Thu, 27 Mar 2014 19:53:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r263827 - in projects/uefi/sys: amd64/include dev/vt/hw/efifb 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 19:53:38 -0000 Author: emaste Date: Thu Mar 27 19:53:37 2014 New Revision: 263827 URL: http://svnweb.freebsd.org/changeset/base/263827 Log: Merge ^/head@263826 Sponsored by: The FreeBSD Foundation Modified: projects/uefi/sys/amd64/include/metadata.h projects/uefi/sys/dev/vt/hw/efifb/efifb.c Directory Properties: projects/uefi/ (props changed) projects/uefi/sys/ (props changed) Modified: projects/uefi/sys/amd64/include/metadata.h ============================================================================== --- projects/uefi/sys/amd64/include/metadata.h Thu Mar 27 19:43:38 2014 (r263826) +++ projects/uefi/sys/amd64/include/metadata.h Thu Mar 27 19:53:37 2014 (r263827) @@ -35,10 +35,22 @@ #define MODINFOMD_EFI_MAP 0x1004 #define MODINFOMD_EFI_FB 0x1005 -struct efi_map_header { +struct efi_map_header { size_t memory_size; size_t descriptor_size; uint32_t descriptor_version; }; +struct efi_fb { + uint64_t fb_addr; + uint64_t fb_size; + int fb_height; + int fb_width; + int fb_stride; + uint32_t fb_mask_red; + uint32_t fb_mask_green; + uint32_t fb_mask_blue; + uint32_t fb_mask_reserved; +}; + #endif /* !_MACHINE_METADATA_H_ */ Modified: projects/uefi/sys/dev/vt/hw/efifb/efifb.c ============================================================================== --- projects/uefi/sys/dev/vt/hw/efifb/efifb.c Thu Mar 27 19:43:38 2014 (r263826) +++ projects/uefi/sys/dev/vt/hw/efifb/efifb.c Thu Mar 27 19:53:37 2014 (r263827) @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_platform.h" -#include #include #include #include @@ -85,8 +84,8 @@ vt_efb_init(struct vt_device *vd) kmdp = preload_search_by_type("elf kernel"); if (kmdp == NULL) kmdp = preload_search_by_type("elf64 kernel"); - efifb = (struct efi_fb *)preload_search_info(kmdp, - MODINFO_METADATA | MODINFOMD_EFI_FB); + efifb = (struct efi_fb *)preload_search_info(kmdp, + MODINFO_METADATA | MODINFOMD_EFI_FB); if (efifb == NULL) return (CN_DEAD);