Update FileLib to use pointer to BlockIo->Media and not a cached copy also add some...

[mirror_edk2.git] / EmbeddedPkg / Ebl / EfiDevice.c

diff --git a/EmbeddedPkg/Ebl/EfiDevice.c b/EmbeddedPkg/Ebl/EfiDevice.c
index f568a1f016491c4a77f62901cf4a6bc053e70d17..9b08fda12a3cd6f531ee315f45f461aa64d8a461 100644 (file)
--- a/EmbeddedPkg/Ebl/EfiDevice.c
+++ b/EmbeddedPkg/Ebl/EfiDevice.c
@@ -111,24 +111,24 @@ EblPrintBlkIoInfo (
           EfiClose (FsFile);\r
           break;\r
         }\r
+        EfiClose (FsFile);\r
       }\r
-      EfiClose (FsFile);\r
     }\r
   }\r
 \r
   // Print out useful Block IO media properties\r
-  if (File->FsBlockIoMedia.RemovableMedia) {\r
+  if (File->FsBlockIoMedia->RemovableMedia) {\r
     AsciiPrint ("Removable ");\r
   }\r
-  if (!File->FsBlockIoMedia.MediaPresent) {\r
-    AsciiPrint ("No Media ");\r
-  }\r
-  if (File->FsBlockIoMedia.LogicalPartition) {\r
-    AsciiPrint ("Partition ");\r
+  if (!File->FsBlockIoMedia->MediaPresent) {\r
+    AsciiPrint ("No Media\n");\r
+  } else {\r
+    if (File->FsBlockIoMedia->LogicalPartition) {\r
+      AsciiPrint ("Partition ");\r
+    }\r
+    DeviceSize = MultU64x32 (File->FsBlockIoMedia->LastBlock + 1, File->FsBlockIoMedia->BlockSize);\r
+    AsciiPrint ("Size = 0x%lX\n", DeviceSize);\r
   }\r
-  DeviceSize = MultU64x32 (File->FsBlockIoMedia.LastBlock + 1, File->FsBlockIoMedia.BlockSize);\r
-  AsciiPrint ("Size = 0x%lX\n", DeviceSize);\r
-\r
   EfiClose (File);\r
 }\r
 \r