diff options
| author | Pete Batard <pete@akeo.ie> | 2021-03-01 11:53:54 +0000 |
|---|---|---|
| committer | Nigel Croxon <ncroxon@redhat.com> | 2021-03-08 14:59:46 -0500 |
| commit | 2458595367a809856174ca2344f2cb536076b0c6 (patch) | |
| tree | 6b22147e84729a20c3eb62a4a88302970b5cea8c /inc | |
| parent | 6c77f27793bf8086a738e13a625fea77df515b33 (diff) | |
| download | gnu-efi-2458595367a809856174ca2344f2cb536076b0c6.tar.gz | |
Use EFI_FILE_SYSTEM_VOLUME_LABEL rather than EFI_FILE_SYSTEM_VOLUME_LABEL_INFO
Per https://github.com/tianocore/edk2/blob/master/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h
the EDK2 uses EFI_FILE_SYSTEM_VOLUME_LABEL and EFI_FILE_SYSTEM_VOLUME_LABEL_ID rather
than EFI_FILE_SYSTEM_VOLUME_LABEL_INFO and EFI_FILE_SYSTEM_VOLUME_LABEL_INFO_ID.
We redefine those to the proper EDK2 names, while also adding defines for compatibility.
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/efiprot.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/inc/efiprot.h b/inc/efiprot.h index 53fc560..1d849d1 100644 --- a/inc/efiprot.h +++ b/inc/efiprot.h @@ -517,14 +517,20 @@ typedef struct { #define SIZE_OF_EFI_FILE_SYSTEM_INFO EFI_FIELD_OFFSET(EFI_FILE_SYSTEM_INFO,VolumeLabel) -#define EFI_FILE_SYSTEM_VOLUME_LABEL_INFO_ID \ +#define EFI_FILE_SYSTEM_VOLUME_LABEL_ID \ { 0xDB47D7D3,0xFE81, 0x11d3, {0x9A, 0x35, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D} } typedef struct { CHAR16 VolumeLabel[1]; -} EFI_FILE_SYSTEM_VOLUME_LABEL_INFO; +} EFI_FILE_SYSTEM_VOLUME_LABEL; -#define SIZE_OF_EFI_FILE_SYSTEM_VOLUME_LABEL_INFO EFI_FIELD_OFFSET(EFI_FILE_SYSTEM_VOLUME_LABEL_INFO,VolumeLabel) +#define SIZE_OF_EFI_FILE_SYSTEM_VOLUME_LABEL_INFO EFI_FIELD_OFFSET(EFI_FILE_SYSTEM_VOLUME_LABEL,VolumeLabel) + +// +// For compatibility with older versions of gnu-efi +// +#define EFI_FILE_SYSTEM_VOLUME_LABEL_INFO_ID EFI_FILE_SYSTEM_VOLUME_LABEL_ID +#define EFI_FILE_SYSTEM_VOLUME_LABEL_INFO EFI_FILE_SYSTEM_VOLUME_LABEL // // Load file protocol |