d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make efichar.c routines available to libefi.

Browse Source 
Make efichar.c routines available to libefi as well as
libefivar. Define LIBEFI when building so we can conditionally include
stand.h vs the normal userland stuff.
This commit is contained in:
Warner Losh 2017-08-31 17:32:09 +00:00
parent 171e3d1a1f
commit 2c4b0cefde
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=323062
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/boot/efi/libefi/Makefile
View File

@ -11,7 +11,7 @@ LIB= efi
INTERNALLIB=
WARNS?= 2
SRCS= delay.c devpath.c efi_console.c efinet.c efipart.c env.c errno.c \
SRCS= delay.c devpath.c efi_console.c efichar.c efinet.c efipart.c env.c errno.c \
handles.c wchar.c libefi.c efi_driver_utils.c efizfs.c devicename.c
.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
@ -56,4 +56,6 @@ CFLAGS+= ${FORMAT_EXTENSIONS}
CFLAGS+= -DTERM_EMU
.endif
CFLAGS+= -DLIBEFI
.include <bsd.lib.mk>

4
sys/boot/efi/libefi/efichar.c
View File

@ -29,10 +29,14 @@ __FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <errno.h>
#ifdef LIBEFI
#include <stand.h>
#else
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#endif
#include <sys/efi.h>
#include <machine/efi.h>