Date: Thu, 27 Mar 2014 19:53:37 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r263827 - in projects/uefi/sys: amd64/include dev/vt/hw/efifb Message-ID: <201403271953.s2RJrbrH050862@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <machine/efi.h> #include <machine/metadata.h> #include <machine/vm.h> #include <machine/vmparam.h> @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403271953.s2RJrbrH050862>