Fix the build error caused by recent MdePkg clean up

(based on FatPkg commit 89452d777f567e38fb24569dbda2477a05bbcd70)

[jordan.l.justen@intel.com: Use script to relicense to 2-clause BSD]
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Acked-by: Mark Doran <mark.doran@intel.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/FatPkg/EnhancedFatDxe/Info.c b/FatPkg/EnhancedFatDxe/Info.c
index 2ef4e9c809f9a0fc1088ce15c62966ebe82797c6..740a0df5e443ca84b44bfbf0460bf953a1b5aae5 100644 (file)
--- a/FatPkg/EnhancedFatDxe/Info.c
+++ b/FatPkg/EnhancedFatDxe/Info.c
@@ -172,7 +172,7 @@ Returns:
   CHAR16                            Name[FAT_NAME_LEN + 1];\r
   EFI_STATUS                        Status;\r
 \r
-  Size        = SIZE_OF_EFI_FILE_SYSTEM_VOLUME_LABEL_INFO;\r
+  Size        = SIZE_OF_EFI_FILE_SYSTEM_VOLUME_LABEL;\r
   Status      = FatGetVolumeEntry (Volume, Name);\r
   NameSize    = StrSize (Name);\r
   ResultSize  = Size + NameSize;\r
@@ -252,11 +252,11 @@ Returns:
 \r
 --*/\r
 {\r
-  EFI_FILE_SYSTEM_VOLUME_LABEL_INFO *Info;\r
+  EFI_FILE_SYSTEM_VOLUME_LABEL *Info;\r
 \r
-  Info = (EFI_FILE_SYSTEM_VOLUME_LABEL_INFO *) Buffer;\r
+  Info = (EFI_FILE_SYSTEM_VOLUME_LABEL *) Buffer;\r
 \r
-  if (BufferSize < SIZE_OF_EFI_FILE_SYSTEM_VOLUME_LABEL_INFO + 2) {\r
+  if (BufferSize < SIZE_OF_EFI_FILE_SYSTEM_VOLUME_LABEL + 2) {\r
     return EFI_BAD_BUFFER_SIZE;\r
   }\r
 \r

diff --git a/FatPkg/FatPkg.dsc b/FatPkg/FatPkg.dsc
index 16b379a084d6725a258f2d93e9d481752b441e7b..0acaaa76a59bde61a3428e504ac2b75ae8947a41 100644 (file)
--- a/FatPkg/FatPkg.dsc
+++ b/FatPkg/FatPkg.dsc
@@ -44,6 +44,7 @@
   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
   UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf\r
   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf\r
+  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
 \r
 [Components.common]\r
-  FatPkg\EnhancedFatDxe\Fat.inf\r
+  FatPkg/EnhancedFatDxe/Fat.inf\r