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

[Garrett Cooper]

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;