svn commit: r297332 - user/ngie/stable-10-libnv/sys/boot/ia64/efi

[Garrett Cooper]

Author: ngie
Date: Mon Mar 28 05:15:37 2016
New Revision: 297332
URL: https://svnweb.freebsd.org/changeset/base/297332

Log:
  Revert r295310:r295314; smh fixed the sys/boot/ia64/efi problem differently later on in ^/head and ^/stable/10

Modified:
  user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile
  user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c

Modified: user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile
==============================================================================
--- user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile	Mon Mar 28 04:22:22 2016	(r297331)
+++ user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile	Mon Mar 28 05:15:37 2016	(r297332)
@@ -7,10 +7,9 @@ MK_SSP=		no
 
 PROG=		loader.sym
 INTERNALPROG=
-
 SRCS=		conf.c efimd.c main.c pal.S start.S vers.c
 
-.PATH: ${.CURDIR}/../../../${MACHINE_CPUARCH}/${MACHINE_CPUARCH} ${.CURDIR}/../../efi/boot1
+.PATH: ${.CURDIR}/../../../${MACHINE_CPUARCH}/${MACHINE_CPUARCH}
 
 CFLAGS+=	-I${.CURDIR}/../common
 CFLAGS+=	-I${.CURDIR}/../../common

Modified: user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c
==============================================================================
--- user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c	Mon Mar 28 04:22:22 2016	(r297331)
+++ user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c	Mon Mar 28 05:15:37 2016	(r297332)
@@ -142,7 +142,7 @@ main(int argc, CHAR16 *argv[])
 {
 	struct devdesc currdev;
 	EFI_LOADED_IMAGE *img;
-	struct devsw *dev;
+	char *dev;
 	int i;
 
 	/* 
@@ -179,25 +179,17 @@ main(int argc, CHAR16 *argv[])
 	BS->HandleProtocol(IH, &imgid, (VOID**)&img);
 
 	bzero(&currdev, sizeof(currdev));
-	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_opendata = NULL;
-		currdev.d_type = currdev.d_dev->dv_type;
-		env_setenv("currdev", EV_VOLATILE, ia64_fmtdev(&currdev),
-			   ia64_setcurrdev, env_nounset);
-		env_setenv("loaddev", EV_VOLATILE, ia64_fmtdev(&currdev), env_noset,
-			   env_nounset);
-	}
+	efi_handle_lookup(img->DeviceHandle, &currdev.d_dev, &currdev.d_unit);
+	currdev.d_type = currdev.d_dev->dv_type;
+
+	env_setenv("loaddev", EV_VOLATILE, ia64_fmtdev(&currdev), env_noset,
+	    env_nounset);
+
+	dev = get_dev_option(argc, argv);
+	if (dev == NULL)
+		dev = ia64_fmtdev(&currdev);
+
+	env_setenv("currdev", EV_VOLATILE, dev, ia64_setcurrdev, env_nounset);
 
 	setenv("LINES", "24", 1);	/* optional */