diff options
| author | Michael Brown | 2013-03-20 16:25:16 +0100 |
|---|---|---|
| committer | Michael Brown | 2013-03-20 16:25:16 +0100 |
| commit | 1920aa43764981597da57616cdb75c040d730712 (patch) | |
| tree | 51e112a4bd77c304a6cbd5747d1a814ebd6cbb52 /src/interface/efi/efi_init.c | |
| parent | [uuid] Abstract UUID mangling code out to a separate uuid_mangle() function (diff) | |
| download | ipxe-1920aa43764981597da57616cdb75c040d730712.tar.gz ipxe-1920aa43764981597da57616cdb75c040d730712.tar.xz ipxe-1920aa43764981597da57616cdb75c040d730712.zip | |
[efi] Provide efi_guid_ntoa() for printing EFI GUIDs
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/interface/efi/efi_init.c')
| -rw-r--r-- | src/interface/efi/efi_init.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/interface/efi/efi_init.c b/src/interface/efi/efi_init.c index aaf89471..48cac538 100644 --- a/src/interface/efi/efi_init.c +++ b/src/interface/efi/efi_init.c @@ -121,13 +121,14 @@ EFI_STATUS efi_init ( EFI_HANDLE image_handle, /* Look up used protocols */ for_each_table_entry ( prot, EFI_PROTOCOLS ) { - if ( ( efirc = bs->LocateProtocol ( &prot->u.guid, NULL, + if ( ( efirc = bs->LocateProtocol ( &prot->guid, NULL, prot->protocol ) ) == 0 ) { DBGC ( systab, "EFI protocol %s is at %p\n", - uuid_ntoa ( &prot->u.uuid ), *(prot->protocol)); + efi_guid_ntoa ( &prot->guid ), + *(prot->protocol) ); } else { DBGC ( systab, "EFI does not provide protocol %s\n", - uuid_ntoa ( &prot->u.uuid ) ); + efi_guid_ntoa ( &prot->guid ) ); /* All protocols are required */ return efirc; } @@ -135,12 +136,12 @@ EFI_STATUS efi_init ( EFI_HANDLE image_handle, /* Look up used configuration tables */ for_each_table_entry ( tab, EFI_CONFIG_TABLES ) { - if ( ( *(tab->table) = efi_find_table ( &tab->u.guid ) ) ) { + if ( ( *(tab->table) = efi_find_table ( &tab->guid ) ) ) { DBGC ( systab, "EFI configuration table %s is at %p\n", - uuid_ntoa ( &tab->u.uuid ), *(tab->table) ); + efi_guid_ntoa ( &tab->guid ), *(tab->table) ); } else { DBGC ( systab, "EFI does not provide configuration " - "table %s\n", uuid_ntoa ( &tab->u.uuid ) ); + "table %s\n", efi_guid_ntoa ( &tab->guid ) ); if ( tab->required ) return EFI_NOT_AVAILABLE_YET; } |