From owner-svn-src-user@freebsd.org Fri Feb 5 09:28:05 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2A1B9A76AF4
for <svn-src-user@mailman.ysv.freebsd.org>;
Fri, 5 Feb 2016 09:28:05 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::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 EF4D81861;
Fri, 5 Feb 2016 09:28:04 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u159S3wL043186;
Fri, 5 Feb 2016 09:28:03 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u159S3vY043185;
Fri, 5 Feb 2016 09:28:03 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201602050928.u159S3vY043185@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Fri, 5 Feb 2016 09:28:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r295314 - user/ngie/stable-10-libnv/sys/boot/ia64/efi
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 09:28:05 -0000
Author: ngie
Date: Fri Feb 5 09:28:03 2016
New Revision: 295314
URL: https://svnweb.freebsd.org/changeset/base/295314
Log:
Fix the compile; the #if 0 code needs some work because
the old code dealt with `dev` as char*, not struct devsw*
Modified:
user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c
Modified: user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c
==============================================================================
--- user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c Fri Feb 5 08:41:27 2016 (r295313)
+++ user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c Fri Feb 5 09:28:03 2016 (r295314)
@@ -142,7 +142,7 @@ main(int argc, CHAR16 *argv[])
{
struct devdesc currdev;
EFI_LOADED_IMAGE *img;
- char *dev;
+ struct devsw *dev;
int i;
/*
@@ -179,28 +179,26 @@ main(int argc, CHAR16 *argv[])
BS->HandleProtocol(IH, &imgid, (VOID**)&img);
bzero(&currdev, sizeof(currdev));
- if (efi_handle_lookup(img->DeviceHandle, &dev, &unit, NULL) != 0)
+ if (efi_handle_lookup(img->DeviceHandle, &dev, &currdev.d_unit, NULL) != 0)
return (EFI_NOT_FOUND);
{
struct devdesc currdev;
+#if 0
dev = get_dev_option(argc, argv);
if (dev == NULL)
dev = ia64_fmtdev(&currdev);
+#endif
currdev.d_dev = dev;
- currdev.d_unit = unit;
currdev.d_opendata = NULL;
currdev.d_type = currdev.d_dev->dv_type;
- env_setenv("currdev", EV_VOLATILE, efi_fmtdev(&currdev),
- efi_setcurrdev, env_nounset);
- env_setenv("loaddev", EV_VOLATILE, efi_fmtdev(&currdev), env_noset,
+ env_setenv("currdev", EV_VOLATILE, ia64_fmtdev(&currdev),
+ ia64_setcurrdev, env_nounset);
+ env_setenv("loaddev", EV_VOLATILE, ia64_fmtdev(&currdev), env_noset,
env_nounset);
- break;
}
- env_setenv("currdev", EV_VOLATILE, dev, ia64_setcurrdev, env_nounset);
-
setenv("LINES", "24", 1); /* optional */
archsw.arch_autoload = ia64_autoload;