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
cbw.dCBWSignature = CBWSIG;\r
cbw.dCBWTag = 0x01;\r
cbw.dCBWDataTransferLength = DataTransferLength;\r
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
cbw.bCBWCBLength = CommandSize;\r
\r
CopyMem (cbw.CBWCB, Command, CommandSize);\r
\r
VOID\r
CoreNewDebugImageInfoEntry (\r
\r
VOID\r
CoreNewDebugImageInfoEntry (\r
+ UINT32 ImageInfoType,\r
EFI_LOADED_IMAGE_PROTOCOL *LoadedImage,\r
EFI_HANDLE ImageHandle\r
)\r
EFI_LOADED_IMAGE_PROTOCOL *LoadedImage,\r
EFI_HANDLE ImageHandle\r
)\r
\r
VOID\r
CoreNewDebugImageInfoEntry (\r
\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
IN EFI_LOADED_IMAGE_PROTOCOL *LoadedImage,\r
IN EFI_HANDLE ImageHandle\r
)\r
EFI_BLOCK_IO_PROTOCOL *BlkIo;\r
VOID *Buffer;\r
\r
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
*ExitDataSize = 0;\r
*ExitData = NULL;\r
\r
// All the driver options should have been processed since\r
// now boot will be performed.\r
//\r
// 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
Status = BdsLibBootViaBootOption (BootOption, BootOption->DevicePath, &ExitDataSize, &ExitData);\r
if (EFI_ERROR (Status)) {\r
//\r
// All the driver options should have been processed since\r
// now boot will be performed.\r
//\r
// 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
Status = BdsLibBootViaBootOption (BootOption, BootOption->DevicePath, &ExitDataSize, &ExitData);\r
if (EFI_ERROR (Status)) {\r
//\r
EFI_BLOCK_IO_PROTOCOL *BlkIo;\r
VOID *Buffer;\r
\r
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
*ExitDataSize = 0;\r
*ExitData = NULL;\r
\r
} EFI_DEBUG_IMAGE_INFO_NORMAL;\r
\r
typedef union {\r
} 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
EFI_DEBUG_IMAGE_INFO_NORMAL *NormalImage;\r
} EFI_DEBUG_IMAGE_INFO;\r
\r