diff options
| -rw-r--r-- | EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.c | 12 | ||||
| -rw-r--r-- | EdkModulePkg/Core/Dxe/DebugImageInfo.h | 2 | ||||
| -rw-r--r-- | EdkModulePkg/Core/Dxe/Misc/DebugImageInfo.c | 2 | ||||
| -rw-r--r-- | EdkModulePkg/Library/EdkGenericBdsLib/BdsBoot.c | 5 | ||||
| -rw-r--r-- | EdkModulePkg/Library/EdkGenericPlatformBdsLib/BdsEntry.c | 1 | ||||
| -rw-r--r-- | EdkNt32Pkg/Dxe/PlatformBds/Generic/BdsEntry.c | 1 | ||||
| -rw-r--r-- | EdkNt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c | 5 | ||||
| -rw-r--r-- | MdePkg/Include/Guid/DebugImageInfoTable.h | 2 |
8 files changed, 14 insertions, 16 deletions
diff --git a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.c b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.c index e6a5be480b..fef5de9387 100644 --- a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.c +++ b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.c @@ -608,17 +608,7 @@ BotCommandPhase ( cbw.dCBWSignature = CBWSIG;
cbw.dCBWTag = 0x01;
cbw.dCBWDataTransferLength = DataTransferLength;
- switch (Direction) {
- case EfiUsbDataOut:
- case EfiUsbNoData:
- cbw.bmCBWFlags = 0;
- break;
- case EfiUsbDataIn:
- cbw.bmCBWFlags = 0x80;
- break;
- default:
- break;
- }
+ cbw.bmCBWFlags = (UINT8) ((Direction == EfiUsbDataIn) ? 0x80 : 0);
cbw.bCBWCBLength = CommandSize;
CopyMem (cbw.CBWCB, Command, CommandSize);
diff --git a/EdkModulePkg/Core/Dxe/DebugImageInfo.h b/EdkModulePkg/Core/Dxe/DebugImageInfo.h index be1d1f1908..006f629cf2 100644 --- a/EdkModulePkg/Core/Dxe/DebugImageInfo.h +++ b/EdkModulePkg/Core/Dxe/DebugImageInfo.h @@ -79,7 +79,7 @@ Returns: VOID
CoreNewDebugImageInfoEntry (
- UINTN ImageInfoType,
+ UINT32 ImageInfoType,
EFI_LOADED_IMAGE_PROTOCOL *LoadedImage,
EFI_HANDLE ImageHandle
)
diff --git a/EdkModulePkg/Core/Dxe/Misc/DebugImageInfo.c b/EdkModulePkg/Core/Dxe/Misc/DebugImageInfo.c index e7f90de025..3ba1eca418 100644 --- a/EdkModulePkg/Core/Dxe/Misc/DebugImageInfo.c +++ b/EdkModulePkg/Core/Dxe/Misc/DebugImageInfo.c @@ -132,7 +132,7 @@ Returns: VOID
CoreNewDebugImageInfoEntry (
- IN UINTN ImageInfoType,
+ IN UINT32 ImageInfoType,
IN EFI_LOADED_IMAGE_PROTOCOL *LoadedImage,
IN EFI_HANDLE ImageHandle
)
diff --git a/EdkModulePkg/Library/EdkGenericBdsLib/BdsBoot.c b/EdkModulePkg/Library/EdkGenericBdsLib/BdsBoot.c index 755c042706..4513aa94af 100644 --- a/EdkModulePkg/Library/EdkGenericBdsLib/BdsBoot.c +++ b/EdkModulePkg/Library/EdkGenericBdsLib/BdsBoot.c @@ -124,6 +124,11 @@ Returns: EFI_BLOCK_IO_PROTOCOL *BlkIo;
VOID *Buffer;
+ //
+ // Record the performance data for End of BDS
+ //
+ PERF_END (0, BDS_TOK, NULL, 0);
+
*ExitDataSize = 0;
*ExitData = NULL;
diff --git a/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BdsEntry.c b/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BdsEntry.c index 7c219b637c..07789a36ab 100644 --- 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
// now boot will be performed.
//
- PERF_END (0, BDS_TOK, NULL, 0);
Status = BdsLibBootViaBootOption (BootOption, BootOption->DevicePath, &ExitDataSize, &ExitData);
if (EFI_ERROR (Status)) {
//
diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BdsEntry.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BdsEntry.c index a26a79ffc5..6979db006c 100644 --- 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
// now boot will be performed.
//
- PERF_END (0, BDS_TOK, NULL, 0);
Status = BdsLibBootViaBootOption (BootOption, BootOption->DevicePath, &ExitDataSize, &ExitData);
if (EFI_ERROR (Status)) {
//
diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c b/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c index 3963dbcd54..0c744db224 100644 --- a/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c +++ b/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c @@ -123,6 +123,11 @@ Returns: EFI_BLOCK_IO_PROTOCOL *BlkIo;
VOID *Buffer;
+ //
+ // Record the performance data for End of BDS
+ //
+ PERF_END (0, BDS_TOK, NULL, 0);
+
*ExitDataSize = 0;
*ExitData = NULL;
diff --git a/MdePkg/Include/Guid/DebugImageInfoTable.h b/MdePkg/Include/Guid/DebugImageInfoTable.h index f050a2e610..0ab4248f0f 100644 --- a/MdePkg/Include/Guid/DebugImageInfoTable.h +++ b/MdePkg/Include/Guid/DebugImageInfoTable.h @@ -45,7 +45,7 @@ typedef struct { } EFI_DEBUG_IMAGE_INFO_NORMAL;
typedef union {
- UINTN *ImageInfoType;
+ UINT32 *ImageInfoType;
EFI_DEBUG_IMAGE_INFO_NORMAL *NormalImage;
} EFI_DEBUG_IMAGE_INFO;
|