From owner-svn-src-all@FreeBSD.ORG  Mon Mar 31 14:12:28 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6873E7A6;
 Mon, 31 Mar 2014 14:12:28 +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 5581726B;
 Mon, 31 Mar 2014 14:12:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2VECSDo015473;
 Mon, 31 Mar 2014 14:12:28 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2VECSgs015472;
 Mon, 31 Mar 2014 14:12:28 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201403311412.s2VECSgs015472@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 31 Mar 2014 14:12:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r263968 - head/sys/boot/i386/efi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Mar 2014 14:12:28 -0000

Author: emaste
Date: Mon Mar 31 14:12:27 2014
New Revision: 263968
URL: http://svnweb.freebsd.org/changeset/base/263968

Log:
  Merge r246607 by benno from projects/uefi
  
    Use EFI types for EFI values (silences warnings).
  
  EFI UINTN is actually a 64-bit type on 64-bit processors.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/boot/i386/efi/main.c

Modified: head/sys/boot/i386/efi/main.c
==============================================================================
--- head/sys/boot/i386/efi/main.c	Mon Mar 31 14:04:57 2014	(r263967)
+++ head/sys/boot/i386/efi/main.c	Mon Mar 31 14:12:27 2014	(r263968)
@@ -273,7 +273,8 @@ COMMAND_SET(mode, "mode", "change or dis
 static int
 command_mode(int argc, char *argv[])
 {
-	unsigned int cols, rows, mode;
+	UINTN cols, rows;
+	unsigned int mode;
 	int i;
 	char *cp;
 	char rowenv[8];
@@ -327,8 +328,7 @@ command_nvram(int argc, char *argv[])
 	CHAR16 *data;
 	EFI_STATUS status;
 	EFI_GUID varguid = { 0,0,0,{0,0,0,0,0,0,0,0} };
-	unsigned int varsz;
-	unsigned int datasz;
+	UINTN varsz, datasz;
 	SIMPLE_TEXT_OUTPUT_INTERFACE *conout;
 	int i;