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

loader: move device path definitions to include/efidevp.h

Browse Source 
No functional change, only moving uuid and protocol bits to include/efidevp.h

Reviewed by:	imp, jhb
Approved by:	imp (mentor)
Differential Revision:	https://reviews.freebsd.org/D9192
This commit is contained in:
tsoome 2017-01-16 20:57:01 +00:00
parent 58cfb7eb21
commit efc256fc7e
2 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/boot/efi/include/efidevp.h
View File

@ -73,8 +73,6 @@ typedef struct _EFI_DEVICE_PATH {
(a)->Length[1] = 0; \
}
/*
*
*/
@ -424,5 +422,33 @@ typedef union {
} EFI_DEV_PATH_PTR;
#define EFI_LOADED_IMAGE_DEVICE_PATH_PROTOCOL_GUID \
{ 0xbc62157e, 0x3e33, 0x4fec, { 0x99, 0x20, 0x2d, 0x3b, 0x36, 0xd7, 0x50, 0xdf } }
#define EFI_DEVICE_PATH_TO_TEXT_PROTOCOL_GUID \
{ 0x8b843e20, 0x8132, 0x4852, { 0x90, 0xcc, 0x55, 0x1a, 0x4e, 0x4a, 0x7f, 0x1c } }
INTERFACE_DECL(_EFI_DEVICE_PATH_PROTOCOL);
typedef
CHAR16*
(EFIAPI *EFI_DEVICE_PATH_TO_TEXT_NODE) (
IN struct _EFI_DEVICE_PATH *This,
IN BOOLEAN DisplayOnly,
IN BOOLEAN AllowShortCuts
);
typedef
CHAR16*
(EFIAPI *EFI_DEVICE_PATH_TO_TEXT_PATH) (
IN struct _EFI_DEVICE_PATH *This,
IN BOOLEAN DisplayOnly,
IN BOOLEAN AllowShortCuts
);
typedef struct _EFI_DEVICE_PATH_TO_TEXT_PROTOCOL {
EFI_DEVICE_PATH_TO_TEXT_NODE ConvertDeviceNodeToText;
EFI_DEVICE_PATH_TO_TEXT_PATH ConvertDevicePathToText;
} EFI_DEVICE_PATH_TO_TEXT_PROTOCOL;
#endif

30
sys/boot/efi/libefi/devpath.c
View File

@ -30,36 +30,6 @@ __FBSDID("$FreeBSD$");
#include <efi.h>
#include <efilib.h>
/* XXX: This belongs in an efifoo.h header. */
#define EFI_LOADED_IMAGE_DEVICE_PATH_PROTOCOL_GUID \
{ 0xbc62157e, 0x3e33, 0x4fec, { 0x99, 0x20, 0x2d, 0x3b, 0x36, 0xd7, 0x50, 0xdf } }
#define EFI_DEVICE_PATH_TO_TEXT_PROTOCOL_GUID \
{ 0x8b843e20, 0x8132, 0x4852, { 0x90, 0xcc, 0x55, 0x1a, 0x4e, 0x4a, 0x7f, 0x1c } }
INTERFACE_DECL(_EFI_DEVICE_PATH_PROTOCOL);
typedef
CHAR16*
(EFIAPI *EFI_DEVICE_PATH_TO_TEXT_NODE) (
IN struct _EFI_DEVICE_PATH *This,
IN BOOLEAN DisplayOnly,
IN BOOLEAN AllowShortCuts
);
typedef
CHAR16*
(EFIAPI *EFI_DEVICE_PATH_TO_TEXT_PATH) (
IN struct _EFI_DEVICE_PATH *This,
IN BOOLEAN DisplayOnly,
IN BOOLEAN AllowShortCuts
);
typedef struct _EFI_DEVICE_PATH_TO_TEXT_PROTOCOL {
EFI_DEVICE_PATH_TO_TEXT_NODE ConvertDeviceNodeToText;
EFI_DEVICE_PATH_TO_TEXT_PATH ConvertDevicePathToText;
} EFI_DEVICE_PATH_TO_TEXT_PROTOCOL;
static EFI_GUID ImageDevicePathGUID =
EFI_LOADED_IMAGE_DEVICE_PATH_PROTOCOL_GUID;
static EFI_GUID DevicePathGUID = DEVICE_PATH_PROTOCOL;