#ifndef __FILE_SYSTEM_VOLUME_LABEL_INFO_H__\r
#define __FILE_SYSTEM_VOLUME_LABEL_INFO_H__\r
\r
-#define EFI_FILE_SYSTEM_VOLUME_LABEL_INFO_ID_GUID \\r
+#define EFI_FILE_SYSTEM_VOLUME_LABEL_ID \\r
{ \\r
0xDB47D7D3, 0xFE81, 0x11d3, {0x9A, 0x35, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D } \\r
}\r
\r
-#define EFI_FILE_SYSTEM_VOLUME_LABEL_ID \\r
- EFI_FILE_SYSTEM_VOLUME_LABEL_INFO_ID_GUID\r
-\r
typedef struct {\r
///\r
/// The Null-terminated string that is the volume's label.\r
///\r
CHAR16 VolumeLabel[1];\r
-} EFI_FILE_SYSTEM_VOLUME_LABEL_INFO;\r
-\r
-typedef EFI_FILE_SYSTEM_VOLUME_LABEL_INFO EFI_FILE_SYSTEM_VOLUME_LABEL;\r
+} EFI_FILE_SYSTEM_VOLUME_LABEL;\r
\r
-#define SIZE_OF_EFI_FILE_SYSTEM_VOLUME_LABEL_INFO \\r
- EFI_FIELD_OFFSET (EFI_FILE_SYSTEM_VOLUME_LABEL_INFO, VolumeLabel)\r
+#define SIZE_OF_EFI_FILE_SYSTEM_VOLUME_LABEL \\r
+ EFI_FIELD_OFFSET (EFI_FILE_SYSTEM_VOLUME_LABEL, VolumeLabel)\r
\r
extern EFI_GUID gEfiFileSystemVolumeLabelInfoIdGuid;\r
\r