From 44338bfd223c0594420385c21eb25c77d45b405f Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 25 Jun 2014 14:44:13 +0100 Subject: [efi] Allow device paths to be easily included in debug messages Signed-off-by: Michael Brown --- src/include/ipxe/efi/efi.h | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'src/include/ipxe') diff --git a/src/include/ipxe/efi/efi.h b/src/include/ipxe/efi/efi.h index 05576f9da..38342f731 100644 --- a/src/include/ipxe/efi/efi.h +++ b/src/include/ipxe/efi/efi.h @@ -149,9 +149,10 @@ extern EFI_DEVICE_PATH_PROTOCOL *efi_loaded_image_path; extern EFI_SYSTEM_TABLE *efi_systab; extern const char * efi_guid_ntoa ( EFI_GUID *guid ); +extern const char * efi_devpath_text ( EFI_DEVICE_PATH_PROTOCOL *path ); +extern const char * efi_handle_devpath_text ( EFI_HANDLE handle ); extern void dbg_efi_protocols ( EFI_HANDLE handle ); -extern void dbg_efi_devpath ( EFI_DEVICE_PATH_PROTOCOL *path ); #define DBG_EFI_PROTOCOLS_IF( level, handle ) do { \ if ( DBG_ ## level ) { \ @@ -159,30 +160,15 @@ extern void dbg_efi_devpath ( EFI_DEVICE_PATH_PROTOCOL *path ); } \ } while ( 0 ) -#define DBG_EFI_DEVPATH_IF( level, path ) do { \ - if ( DBG_ ## level ) { \ - dbg_efi_devpath ( path ); \ - } \ - } while ( 0 ) - #define DBGC_EFI_PROTOCOLS_IF( level, id, ... ) do { \ DBG_AC_IF ( level, id ); \ DBG_EFI_PROTOCOLS_IF ( level, __VA_ARGS__ ); \ DBG_DC_IF ( level ); \ } while ( 0 ) -#define DBGC_EFI_DEVPATH_IF( level, id, ... ) do { \ - DBG_AC_IF ( level, id ); \ - DBG_EFI_DEVPATH_IF ( level, __VA_ARGS__ ); \ - DBG_DC_IF ( level ); \ - } while ( 0 ) - #define DBGC_EFI_PROTOCOLS( ... ) \ DBGC_EFI_PROTOCOLS_IF( LOG, ##__VA_ARGS__ ) -#define DBGC_EFI_DEVPATH( ... ) \ - DBGC_EFI_DEVPATH_IF( LOG, ##__VA_ARGS__ ) - extern EFI_STATUS efi_init ( EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *systab ); -- cgit v1.2.3-55-g7522