mirror of
https://github.com/acidanthera/audk.git
synced 2025-07-29 08:34:07 +02:00
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
This commit is contained in:
parent
5b396948e7
commit
df557cca2f
@ -608,17 +608,7 @@ BotCommandPhase (
|
|||||||
cbw.dCBWSignature = CBWSIG;
|
cbw.dCBWSignature = CBWSIG;
|
||||||
cbw.dCBWTag = 0x01;
|
cbw.dCBWTag = 0x01;
|
||||||
cbw.dCBWDataTransferLength = DataTransferLength;
|
cbw.dCBWDataTransferLength = DataTransferLength;
|
||||||
switch (Direction) {
|
cbw.bmCBWFlags = (UINT8) ((Direction == EfiUsbDataIn) ? 0x80 : 0);
|
||||||
case EfiUsbDataOut:
|
|
||||||
case EfiUsbNoData:
|
|
||||||
cbw.bmCBWFlags = 0;
|
|
||||||
break;
|
|
||||||
case EfiUsbDataIn:
|
|
||||||
cbw.bmCBWFlags = 0x80;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
cbw.bCBWCBLength = CommandSize;
|
cbw.bCBWCBLength = CommandSize;
|
||||||
|
|
||||||
CopyMem (cbw.CBWCB, Command, CommandSize);
|
CopyMem (cbw.CBWCB, Command, CommandSize);
|
||||||
|
@ -79,7 +79,7 @@ Returns:
|
|||||||
|
|
||||||
VOID
|
VOID
|
||||||
CoreNewDebugImageInfoEntry (
|
CoreNewDebugImageInfoEntry (
|
||||||
UINTN ImageInfoType,
|
UINT32 ImageInfoType,
|
||||||
EFI_LOADED_IMAGE_PROTOCOL *LoadedImage,
|
EFI_LOADED_IMAGE_PROTOCOL *LoadedImage,
|
||||||
EFI_HANDLE ImageHandle
|
EFI_HANDLE ImageHandle
|
||||||
)
|
)
|
||||||
|
@ -132,7 +132,7 @@ Returns:
|
|||||||
|
|
||||||
VOID
|
VOID
|
||||||
CoreNewDebugImageInfoEntry (
|
CoreNewDebugImageInfoEntry (
|
||||||
IN UINTN ImageInfoType,
|
IN UINT32 ImageInfoType,
|
||||||
IN EFI_LOADED_IMAGE_PROTOCOL *LoadedImage,
|
IN EFI_LOADED_IMAGE_PROTOCOL *LoadedImage,
|
||||||
IN EFI_HANDLE ImageHandle
|
IN EFI_HANDLE ImageHandle
|
||||||
)
|
)
|
||||||
|
@ -124,6 +124,11 @@ Returns:
|
|||||||
EFI_BLOCK_IO_PROTOCOL *BlkIo;
|
EFI_BLOCK_IO_PROTOCOL *BlkIo;
|
||||||
VOID *Buffer;
|
VOID *Buffer;
|
||||||
|
|
||||||
|
//
|
||||||
|
// Record the performance data for End of BDS
|
||||||
|
//
|
||||||
|
PERF_END (0, BDS_TOK, NULL, 0);
|
||||||
|
|
||||||
*ExitDataSize = 0;
|
*ExitDataSize = 0;
|
||||||
*ExitData = NULL;
|
*ExitData = NULL;
|
||||||
|
|
||||||
|
@ -218,7 +218,6 @@ Returns:
|
|||||||
// All the driver options should have been processed since
|
// All the driver options should have been processed since
|
||||||
// now boot will be performed.
|
// now boot will be performed.
|
||||||
//
|
//
|
||||||
PERF_END (0, BDS_TOK, NULL, 0);
|
|
||||||
Status = BdsLibBootViaBootOption (BootOption, BootOption->DevicePath, &ExitDataSize, &ExitData);
|
Status = BdsLibBootViaBootOption (BootOption, BootOption->DevicePath, &ExitDataSize, &ExitData);
|
||||||
if (EFI_ERROR (Status)) {
|
if (EFI_ERROR (Status)) {
|
||||||
//
|
//
|
||||||
|
@ -216,7 +216,6 @@ Returns:
|
|||||||
// All the driver options should have been processed since
|
// All the driver options should have been processed since
|
||||||
// now boot will be performed.
|
// now boot will be performed.
|
||||||
//
|
//
|
||||||
PERF_END (0, BDS_TOK, NULL, 0);
|
|
||||||
Status = BdsLibBootViaBootOption (BootOption, BootOption->DevicePath, &ExitDataSize, &ExitData);
|
Status = BdsLibBootViaBootOption (BootOption, BootOption->DevicePath, &ExitDataSize, &ExitData);
|
||||||
if (EFI_ERROR (Status)) {
|
if (EFI_ERROR (Status)) {
|
||||||
//
|
//
|
||||||
|
@ -123,6 +123,11 @@ Returns:
|
|||||||
EFI_BLOCK_IO_PROTOCOL *BlkIo;
|
EFI_BLOCK_IO_PROTOCOL *BlkIo;
|
||||||
VOID *Buffer;
|
VOID *Buffer;
|
||||||
|
|
||||||
|
//
|
||||||
|
// Record the performance data for End of BDS
|
||||||
|
//
|
||||||
|
PERF_END (0, BDS_TOK, NULL, 0);
|
||||||
|
|
||||||
*ExitDataSize = 0;
|
*ExitDataSize = 0;
|
||||||
*ExitData = NULL;
|
*ExitData = NULL;
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ typedef struct {
|
|||||||
} EFI_DEBUG_IMAGE_INFO_NORMAL;
|
} EFI_DEBUG_IMAGE_INFO_NORMAL;
|
||||||
|
|
||||||
typedef union {
|
typedef union {
|
||||||
UINTN *ImageInfoType;
|
UINT32 *ImageInfoType;
|
||||||
EFI_DEBUG_IMAGE_INFO_NORMAL *NormalImage;
|
EFI_DEBUG_IMAGE_INFO_NORMAL *NormalImage;
|
||||||
} EFI_DEBUG_IMAGE_INFO;
|
} EFI_DEBUG_IMAGE_INFO;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user