xCAT/xNBA
2
0
Fork 0
mirror of https://github.com/xcat2/xNBA.git synced 2024-11-25 11:00:15 +00:00
Code Issues Projects Releases Wiki Activity

[efi] Allow for optional protocols

Browse Source 
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2014-05-19 20:23:31 +01:00
parent f4e069bf2e
commit 95cff6a4d8
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/include/ipxe/efi/efi.h
View File

@ -59,6 +59,8 @@ struct efi_protocol {
EFI_GUID guid;
/** Variable containing pointer to protocol structure */
void **protocol;
/** Protocol is required */
int required;
};
/** EFI protocol table */
@ -78,6 +80,21 @@ struct efi_protocol {
.protocol = ( ( void ** ) ( void * ) \
( ( (_ptr) == ( ( _protocol ** ) (_ptr) ) ) ? \
(_ptr) : (_ptr) ) ), \
.required = 1, \
}
/** Declare an EFI protocol to be requested by iPXE
*
* @v _protocol EFI protocol name
* @v _ptr Pointer to protocol instance
*/
#define EFI_REQUEST_PROTOCOL( _protocol, _ptr ) \
struct efi_protocol __ ## _protocol __efi_protocol = { \
.guid = _protocol ## _GUID, \
.protocol = ( ( void ** ) ( void * ) \
( ( (_ptr) == ( ( _protocol ** ) (_ptr) ) ) ? \
(_ptr) : (_ptr) ) ), \
.required = 0, \
}
/** An EFI configuration table used by iPXE */

5
src/interface/efi/efi_init.c
View File

@ -187,8 +187,9 @@ EFI_STATUS efi_init ( EFI_HANDLE image_handle,
} else {
DBGC ( systab, "EFI does not provide protocol %s\n",
efi_guid_ntoa ( &prot->guid ) );
/* All protocols are required */
return efirc;
/* Fail if protocol is required */
if ( prot->required )
return efirc;
}
}