From owner-svn-src-user@freebsd.org Mon Mar 28 05:15:38 2016 Return-Path: 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 933FFAE0DC6 for ; Mon, 28 Mar 2016 05:15:38 +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 4661B14F2; Mon, 28 Mar 2016 05:15:38 +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 u2S5Fbp5027140; Mon, 28 Mar 2016 05:15:37 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2S5FbsE027138; Mon, 28 Mar 2016 05:15:37 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201603280515.u2S5FbsE027138@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 28 Mar 2016 05:15:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r297332 - 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.21 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Mar 2016 05:15:38 -0000 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 */