From owner-svn-src-head@FreeBSD.ORG  Fri Apr 10 19:26:46 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 54008B31;
 Fri, 10 Apr 2015 19:26:46 +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 3E9009A5;
 Fri, 10 Apr 2015 19:26:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3AJQknY077837;
 Fri, 10 Apr 2015 19:26:46 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3AJQkfc077836;
 Fri, 10 Apr 2015 19:26:46 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201504101926.t3AJQkfc077836@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Fri, 10 Apr 2015 19:26:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r281381 - head/sys/amd64/include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Apr 2015 19:26:46 -0000

Author: emaste
Date: Fri Apr 10 19:26:45 2015
New Revision: 281381
URL: https://svnweb.freebsd.org/changeset/base/281381

Log:
  Use explicitly sized types in EFI module metadata
  
  This will allow the same metadata struct to be used on all platforms.
  
  Differential Revision:	https://reviews.freebsd.org/D2275
  Reviewed by:	jhb

Modified:
  head/sys/amd64/include/metadata.h

Modified: head/sys/amd64/include/metadata.h
==============================================================================
--- head/sys/amd64/include/metadata.h	Fri Apr 10 19:09:51 2015	(r281380)
+++ head/sys/amd64/include/metadata.h	Fri Apr 10 19:26:45 2015	(r281381)
@@ -37,17 +37,17 @@
 #define	MODINFOMD_MODULEP	0x1006
 
 struct efi_map_header {
-	size_t		memory_size;
-	size_t		descriptor_size;
+	uint64_t	memory_size;
+	uint64_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_height;
+	uint32_t	fb_width;
+	uint32_t	fb_stride;
 	uint32_t	fb_mask_red;
 	uint32_t	fb_mask_green;
 	uint32_t	fb_mask_blue;