1. Sync definition of EFI_DEBUG_IMAGE_INFO with UEFI spec

2. Make performance data for End of BDS is not recorded in Boot Manager Boot

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2431 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.c b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.c
index e6a5be480b6a827f636b065ef9c83bd46d09b2fc..fef5de9387124b68b8f999a54c03574d073de3c3 100644 (file)
--- a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.c
+++ b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.c
@@ -608,17 +608,7 @@ BotCommandPhase (
   cbw.dCBWSignature           = CBWSIG;\r
   cbw.dCBWTag                 = 0x01;\r
   cbw.dCBWDataTransferLength  = DataTransferLength;\r
-  switch (Direction) {\r
-  case EfiUsbDataOut:\r
-  case EfiUsbNoData:\r
-    cbw.bmCBWFlags            = 0;\r
-    break;\r
-  case EfiUsbDataIn:\r
-    cbw.bmCBWFlags            = 0x80;\r
-    break;\r
-  default:\r
-    break;\r
-  }\r
+  cbw.bmCBWFlags              = (UINT8) ((Direction == EfiUsbDataIn) ? 0x80 : 0);\r
   cbw.bCBWCBLength            = CommandSize;\r
 \r
   CopyMem (cbw.CBWCB, Command, CommandSize);\r

diff --git a/EdkModulePkg/Core/Dxe/DebugImageInfo.h b/EdkModulePkg/Core/Dxe/DebugImageInfo.h
index be1d1f1908a1da21f3b13127701030ced629fedb..006f629cf278e244e287c0aa487061eaa34abbac 100644 (file)
--- a/EdkModulePkg/Core/Dxe/DebugImageInfo.h
+++ b/EdkModulePkg/Core/Dxe/DebugImageInfo.h
@@ -79,7 +79,7 @@ Returns:
 \r
 VOID\r
 CoreNewDebugImageInfoEntry (\r
-  UINTN                    ImageInfoType,\r
+  UINT32                    ImageInfoType,\r
   EFI_LOADED_IMAGE_PROTOCOL *LoadedImage,\r
   EFI_HANDLE                ImageHandle\r
   )\r

diff --git a/EdkModulePkg/Core/Dxe/Misc/DebugImageInfo.c b/EdkModulePkg/Core/Dxe/Misc/DebugImageInfo.c
index e7f90de02531e1f30adb80b23d38c4857b33eef7..3ba1eca41895508768701aaf47186414f6dc16a4 100644 (file)
--- a/EdkModulePkg/Core/Dxe/Misc/DebugImageInfo.c
+++ b/EdkModulePkg/Core/Dxe/Misc/DebugImageInfo.c
@@ -132,7 +132,7 @@ Returns:
 \r
 VOID\r
 CoreNewDebugImageInfoEntry (\r
-  IN  UINTN                       ImageInfoType,\r
+  IN  UINT32                      ImageInfoType,\r
   IN  EFI_LOADED_IMAGE_PROTOCOL   *LoadedImage,\r
   IN  EFI_HANDLE                  ImageHandle\r
   )\r

diff --git a/EdkModulePkg/Library/EdkGenericBdsLib/BdsBoot.c b/EdkModulePkg/Library/EdkGenericBdsLib/BdsBoot.c
index 755c042706639b8b41e64dcdc0ec6b54d41d4557..4513aa94af5d87ab14da1d1e71f4384e8b042fe3 100644 (file)
--- a/EdkModulePkg/Library/EdkGenericBdsLib/BdsBoot.c
+++ b/EdkModulePkg/Library/EdkGenericBdsLib/BdsBoot.c
@@ -124,6 +124,11 @@ Returns:
   EFI_BLOCK_IO_PROTOCOL     *BlkIo;\r
   VOID                      *Buffer;\r
 \r
+  //\r
+  // Record the performance data for End of BDS\r
+  //\r
+  PERF_END (0, BDS_TOK, NULL, 0);\r
+\r
   *ExitDataSize = 0;\r
   *ExitData     = NULL;\r
 \r

diff --git a/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BdsEntry.c b/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BdsEntry.c
index 7c219b637c9efa396999649b6fb8724ca8354910..07789a36ab68ed657f25a8b000666a907a370968 100644 (file)
--- a/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BdsEntry.c
+++ b/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BdsEntry.c
@@ -218,7 +218,6 @@ Returns:
     // All the driver options should have been processed since\r
     // now boot will be performed.\r
     //\r
-    PERF_END (0, BDS_TOK, NULL, 0);\r
     Status = BdsLibBootViaBootOption (BootOption, BootOption->DevicePath, &ExitDataSize, &ExitData);\r
     if (EFI_ERROR (Status)) {\r
       //\r

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BdsEntry.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BdsEntry.c
index a26a79ffc5f2ed17042e9e5b678d80ff2c656907..6979db006c80a501ff4aba5573ced08e8fbc2673 100644 (file)
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BdsEntry.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BdsEntry.c
@@ -216,7 +216,6 @@ Returns:
     // All the driver options should have been processed since\r
     // now boot will be performed.\r
     //\r
-    PERF_END (0, BDS_TOK, NULL, 0);\r
     Status = BdsLibBootViaBootOption (BootOption, BootOption->DevicePath, &ExitDataSize, &ExitData);\r
     if (EFI_ERROR (Status)) {\r
       //\r

diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c b/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c
index 3963dbcd548a808660ae166e70aa9a30b7d0389a..0c744db224cba44eaa2ce6f8c5a11965b4108ac2 100644 (file)
--- a/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c
+++ b/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c
@@ -123,6 +123,11 @@ Returns:
   EFI_BLOCK_IO_PROTOCOL     *BlkIo;\r
   VOID                      *Buffer;\r
 \r
+  //\r
+  // Record the performance data for End of BDS\r
+  //\r
+  PERF_END (0, BDS_TOK, NULL, 0);\r
+\r
   *ExitDataSize = 0;\r
   *ExitData     = NULL;\r
 \r

diff --git a/MdePkg/Include/Guid/DebugImageInfoTable.h b/MdePkg/Include/Guid/DebugImageInfoTable.h
index f050a2e610861835fd29401d8cc2315bea2bef6a..0ab4248f0f38a666e29f98d56f4a5cf461096a41 100644 (file)
--- a/MdePkg/Include/Guid/DebugImageInfoTable.h
+++ b/MdePkg/Include/Guid/DebugImageInfoTable.h
@@ -45,7 +45,7 @@ typedef struct {
 } EFI_DEBUG_IMAGE_INFO_NORMAL;\r
 \r
 typedef union {\r
-  UINTN                       *ImageInfoType;\r
+  UINT32                      *ImageInfoType;\r
   EFI_DEBUG_IMAGE_INFO_NORMAL *NormalImage;\r
 } EFI_DEBUG_IMAGE_INFO;\r
 \r