9072 libefi: Move EFI fmtdev functionality to libefi

Reviewed by: Alexander Eremin <alexander.eremin@nexenta.com>
Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk>
Approved by: Dan McDonald <danmcd@joyent.com>

5 files changed, 9 insertions, 11 deletions

diff --git a/usr/src/boot/sys/boot/efi/include/efilib.h b/usr/src/boot/sys/boot/efi/include/efilib.h
index 4fcc0ff712..d6bb4974b3 100644
--- a/usr/src/boot/sys/boot/efi/include/efilib.h
+++ b/usr/src/boot/sys/boot/efi/include/efilib.h
@@ -63,6 +63,10 @@ pdinfo_list_t *efiblk_get_pdinfo_list(struct devsw *dev);
 
 void *efi_get_table(EFI_GUID *tbl);
 
+int efi_getdev(void **, const char *, const char **);
+char *efi_fmtdev(void *);
+int efi_setcurrdev(struct env_var *, int, const void *);
+
 int efi_register_handles(struct devsw *, EFI_HANDLE *, EFI_HANDLE *, int);
 EFI_HANDLE efi_find_handle(struct devsw *, int);
 int efi_handle_lookup(EFI_HANDLE, struct devsw **, int *,  uint64_t *);
diff --git a/usr/src/boot/sys/boot/efi/libefi/Makefile b/usr/src/boot/sys/boot/efi/libefi/Makefile
index 0ca24675b6..e987cbc9d6 100644
--- a/usr/src/boot/sys/boot/efi/libefi/Makefile
+++ b/usr/src/boot/sys/boot/efi/libefi/Makefile
@@ -24,9 +24,9 @@ all:	lib$(LIB).a
 
 install:
 
-SRCS=	delay.c devpath.c efi_console.c efi_driver_utils.c efichar.c \
-	efinet.c efipart.c efizfs.c env.c errno.c handles.c libefi.c \
-	time.c wchar.c
+SRCS=	delay.c devicename.c devpath.c efi_console.c efi_driver_utils.c \
+	efichar.c efinet.c efipart.c efizfs.c env.c errno.c handles.c \
+	libefi.c time.c wchar.c
 
 #.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
 #SRCS +=	time.c
diff --git a/usr/src/boot/sys/boot/efi/loader/devicename.c b/usr/src/boot/sys/boot/efi/libefi/devicename.c
index 1e499c0b1b..c1c38c7a61 100644
--- a/usr/src/boot/sys/boot/efi/loader/devicename.c
+++ b/usr/src/boot/sys/boot/efi/libefi/devicename.c
@@ -38,8 +38,6 @@
 #include <efi.h>
 #include <efilib.h>
 
-#include "loader_efi.h"
-
 static int efi_parsedev(struct devdesc **, const char *, const char **);
 
 /*
diff --git a/usr/src/boot/sys/boot/efi/loader/Makefile b/usr/src/boot/sys/boot/efi/loader/Makefile
index 5914d1140f..0ae2ebbe3b 100644
--- a/usr/src/boot/sys/boot/efi/loader/Makefile
+++ b/usr/src/boot/sys/boot/efi/loader/Makefile
@@ -26,9 +26,9 @@ PROG=		loader.sym
 MACHINE=	$(MACH64)
 
 # architecture-specific loader code
-SRCS=	autoload.c bootinfo.c conf.c copy.c devicename.c efi_main.c main.c \
+SRCS=	autoload.c bootinfo.c conf.c copy.c efi_main.c main.c \
 	self_reloc.c smbios.c acpi.c vers.c memmap.c multiboot2.c
-OBJS= autoload.o bootinfo.o conf.o copy.o devicename.o efi_main.o main.o \
+OBJS= autoload.o bootinfo.o conf.o copy.o efi_main.o main.o \
 	self_reloc.o smbios.o acpi.o vers.o memmap.o multiboot2.o
 
 ASFLAGS=-m64 -fPIC
diff --git a/usr/src/boot/sys/boot/efi/loader/loader_efi.h b/usr/src/boot/sys/boot/efi/loader/loader_efi.h
index 59b1ecc5bd..7339515b6b 100644
--- a/usr/src/boot/sys/boot/efi/loader/loader_efi.h
+++ b/usr/src/boot/sys/boot/efi/loader/loader_efi.h
@@ -55,10 +55,6 @@ struct relocator {
 
 int	efi_autoload(void);
 
-int	efi_getdev(void **, const char *, const char **);
-char	*efi_fmtdev(void *);
-int	efi_setcurrdev(struct env_var *, int, const void *);
-
 ssize_t	efi_copyin(const void *, vm_offset_t, const size_t);
 ssize_t	efi_copyout(const vm_offset_t, void *, const size_t);
 ssize_t	efi_readin(const int, vm_offset_t, const size_t);