# HG changeset patch
# Parent 80f64a8718701b0edfb52452752586937b89e8ce
Add support for accessing variables from efi's variable store.

diff -r 80f64a871870 sys/boot/amd64/efi/main.c
--- a/sys/boot/amd64/efi/main.c
+++ b/sys/boot/amd64/efi/main.c
@@ -115,6 +115,9 @@ main(int argc, CHAR16 *argv[])
 	    x86_efi_setcurrdev, env_nounset);
 	env_setenv("loaddev", EV_VOLATILE, x86_efi_fmtdev(&currdev), env_noset,
 	    env_nounset);
+	snprintf(vendor, sizeof(vendor), "%d.%02", ST->Hdr.Revision >> 16,
+	    ST->Hdr.Revision & 0xffff);
+	env_setenv("efi-version", EV_VOLATILE, vendor, env_noset, env_nounset);
 
 	setenv("LINES", "24", 1);	/* optional */
 
diff -r 80f64a871870 sys/boot/efi/libefi/Makefile
--- a/sys/boot/efi/libefi/Makefile
+++ b/sys/boot/efi/libefi/Makefile
@@ -3,7 +3,7 @@
 LIB=	efi
 INTERNALLIB=
 
-SRCS=	delay.c efi_console.c efinet.c efipart.c errno.c handles.c \
+SRCS=	delay.c efi_console.c efinet.c efipart.c env.c errno.c handles.c \
 	libefi.c time.c
 .PATH:	${.CURDIR}/../../i386/libi386
 SRCS+= nullconsole.c comconsole.c
@@ -20,7 +20,6 @@ CFLAGS+= -I${.CURDIR}/../../common
 
 CFLAGS+= -DNO_PCI
 
- 
 # Suppress warning from clang for FreeBSD %b and %D formats
 CFLAGS+= -fformat-extensions
 
diff -r 80f64a871870 sys/boot/efi/libefi/env.c
--- /dev/null
+++ b/sys/boot/efi/libefi/env.c
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 20014 Netflix, Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <efi.h>
+#include <efilib.h>
+
+/*
+ * Simple wrappers to the underlying UEFI functions.
+ * See http://wiki.phoenix.com/wiki/index.php/EFI_RUNTIME_SERVICES
+ * for details.
+ */
+EFI_STATUS
+efi_get_next_variable_name(UINTN *variable_name_size, CHAR16 *variable_name, EFI_GUID *vendor_guid)
+{
+	return RS->GetNextVariableName(variable_name_size, variable_name, vendor_guid);
+}
+
+static EFI_STATUS
+efi_get_variable(CHAR16 *variable_name, EFI_GUID *vendor_guid, UINT32 *attributes, UINTN *data_size,
+    void *data)
+{
+	return RS->GetVariable(variable_name, vendor_guid, attributes, data_size, data);
+}
+
+static EFI_STATUS
+efi_set_variable(CHAR16 *variable_name, EFI_GUID *vendor_guid, UINT32 attributes, UINTN data_size,
+    void *data)
+{
+	return RS->SetVariable(variable_name, vendor_guid, attributes, data_size, data);
+}