API removal:
BltLibVideoToBltBuffer
BltLibBufferToVideo
BltLibGopBlt
API rename:
BltLibVideoToBltBufferEx -> BltVideoToBuffer
BltLibBufferToVideoEx -> BltBufferToVideo
BltLibVideoToVideo -> BltVideoToVideo
BltLibVideoFill -> BltVideoFill
BltLibConfigure -> BltConfigure
The 3 APIs in above are removed because their functionality overlaps with
the other APIs.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu...@intel.com>
Cc: Laszlo Ersek <ler...@redhat.com>
Cc: Jordan Justen <jordan.l.jus...@intel.com>
---
.../Application/BltLibSample/BltLibSample.c | 16 +-
OptionRomPkg/Include/Library/BltLib.h | 101 +------------
.../Library/FrameBufferBltLib/FrameBufferBltLib.c | 168 +--------------------
OptionRomPkg/Library/GopBltLib/GopBltLib.c | 138 +----------------
OvmfPkg/QemuVideoDxe/Gop.c | 73 ++++++---
5 files changed, 74 insertions(+), 422 deletions(-)
diff --git a/OptionRomPkg/Application/BltLibSample/BltLibSample.c
b/OptionRomPkg/Application/BltLibSample/BltLibSample.c
index 3409b2c..333b054 100644
--- a/OptionRomPkg/Application/BltLibSample/BltLibSample.c
+++ b/OptionRomPkg/Application/BltLibSample/BltLibSample.c
@@ -93,7 +93,7 @@ TestFills (
Y = 0;
}
*(UINT32*) (&Color) = Rand32 () & 0xffffff;
- BltLibVideoFill (&Color, X, Y, W, H);
+ BltVideoFill (&Color, X, Y, W, H);
}
}
@@ -115,7 +115,7 @@ TestColor1 (
Color.Red = (UINT8) ((X * 0x100) / HorizontalResolution);
Color.Green = (UINT8) ((Y * 0x100) / VerticalResolution);
Color.Blue = (UINT8) ((Y * 0x100) / VerticalResolution);
- BltLibVideoFill (&Color, X, Y, 1, 1);
+ BltVideoFill (&Color, X, Y, 1, 1);
}
}
}
@@ -189,7 +189,7 @@ TestColor (
UINT32 ColorDist;
*(UINT32*) (&Color) = 0;
- BltLibVideoFill (&Color, 0, 0, HorizontalResolution, VerticalResolution);
+ BltVideoFill (&Color, 0, 0, HorizontalResolution, VerticalResolution);
TriWidth = (UINTN) DivU64x32 (
MultU64x32 (11547005, (UINT32) VerticalResolution),
@@ -231,7 +231,7 @@ TestColor (
ColorDist = Uint32Dist(X3 - X, Y1 - Y);
Color.Blue = GetTriColor (ColorDist, TriWidth);
- BltLibVideoFill (&Color, X, Y, 1, 1);
+ BltVideoFill (&Color, X, Y, 1, 1);
}
}
@@ -255,14 +255,14 @@ TestMove1 (
Width = 100;
Height = 20;
- BltLibVideoFill (&Black, 0, 0, HorizontalResolution, VerticalResolution);
+ BltVideoFill (&Black, 0, 0, HorizontalResolution, VerticalResolution);
*(UINT32 *) &Blue = 0;
Blue.Blue = 0xff;
- BltLibVideoFill (&Blue, 0, 0, Width, Height);
+ BltVideoFill (&Blue, 0, 0, Width, Height);
for (X = 1, Y = 1; X < HorizontalResolution && Y < VerticalResolution; X++,
Y++) {
- BltLibVideoToVideo (X - 1, Y - 1, X, Y, Width, Height);
+ BltVideoToVideo (X - 1, Y - 1, X, Y, Width, Height);
gBS->Stall (100);
}
gBS->Stall (1000 * 1000 * 2);
@@ -298,7 +298,7 @@ UefiMain (
return Status;
}
- Status = BltLibConfigure (
+ Status = BltConfigure (
(VOID*)(UINTN) Gop->Mode->FrameBufferBase,
Gop->Mode->Info
);
diff --git a/OptionRomPkg/Include/Library/BltLib.h
b/OptionRomPkg/Include/Library/BltLib.h
index 8bc5d91..230dac2 100644
--- a/OptionRomPkg/Include/Library/BltLib.h
+++ b/OptionRomPkg/Include/Library/BltLib.h
@@ -30,48 +30,11 @@
**/
EFI_STATUS
EFIAPI
-BltLibConfigure (
+BltConfigure (
IN VOID *FrameBuffer,
IN EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *FrameBufferInfo
);
-
-/**
- Performs a UEFI Graphics Output Protocol Blt operation.
-
- @param[in,out] BltBuffer - The data to transfer to screen
- @param[in] BltOperation - The operation to perform
- @param[in] SourceX - The X coordinate of the source for
BltOperation
- @param[in] SourceY - The Y coordinate of the source for
BltOperation
- @param[in] DestinationX - The X coordinate of the destination for
BltOperation
- @param[in] DestinationY - The Y coordinate of the destination for
BltOperation
- @param[in] Width - The width of a rectangle in the blt rectangle
in pixels
- @param[in] Height - The height of a rectangle in the blt
rectangle in pixels
- @param[in] Delta - Not used for EfiBltVideoFill and
EfiBltVideoToVideo operation.
- If a Delta of 0 is used, the entire BltBuffer
will be operated on.
- If a subrectangle of the BltBuffer is used,
then Delta represents
- the number of bytes in a row of the BltBuffer.
-
- @retval EFI_DEVICE_ERROR - A hardware error occured
- @retval EFI_INVALID_PARAMETER - Invalid parameter passed in
- @retval EFI_SUCCESS - Blt operation success
-
-**/
-EFI_STATUS
-EFIAPI
-BltLibGopBlt (
- IN OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer, OPTIONAL
- IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation,
- IN UINTN SourceX,
- IN UINTN SourceY,
- IN UINTN DestinationX,
- IN UINTN DestinationY,
- IN UINTN Width,
- IN UINTN Height,
- IN UINTN Delta
- );
-
-
/**
Performs a UEFI Graphics Output Protocol Blt Video Fill.
@@ -88,7 +51,7 @@ BltLibGopBlt (
**/
EFI_STATUS
EFIAPI
-BltLibVideoFill (
+BltVideoFill (
IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Color,
IN UINTN DestinationX,
IN UINTN DestinationY,
@@ -96,39 +59,12 @@ BltLibVideoFill (
IN UINTN Height
);
-
/**
Performs a UEFI Graphics Output Protocol Blt Video to Buffer operation.
@param[out] BltBuffer Output buffer for pixel color data
@param[in] SourceX X location within video
@param[in] SourceY Y location within video
- @param[in] Width Width (in pixels)
- @param[in] Height Height
-
- @retval EFI_DEVICE_ERROR - A hardware error occured
- @retval EFI_INVALID_PARAMETER - Invalid parameter passed in
- @retval EFI_SUCCESS - Blt operation success
-
-**/
-EFI_STATUS
-EFIAPI
-BltLibVideoToBltBuffer (
- OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer,
- IN UINTN SourceX,
- IN UINTN SourceY,
- IN UINTN Width,
- IN UINTN Height
- );
-
-
-/**
- Performs a UEFI Graphics Output Protocol Blt Video to Buffer operation
- with extended parameters.
-
- @param[out] BltBuffer Output buffer for pixel color data
- @param[in] SourceX X location within video
- @param[in] SourceY Y location within video
@param[in] DestinationX X location within BltBuffer
@param[in] DestinationY Y location within BltBuffer
@param[in] Width Width (in pixels)
@@ -142,7 +78,7 @@ BltLibVideoToBltBuffer (
**/
EFI_STATUS
EFIAPI
-BltLibVideoToBltBufferEx (
+BltVideoToBuffer (
OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer,
IN UINTN SourceX,
IN UINTN SourceY,
@@ -153,37 +89,10 @@ BltLibVideoToBltBufferEx (
IN UINTN Delta
);
-
/**
Performs a UEFI Graphics Output Protocol Blt Buffer to Video operation.
@param[in] BltBuffer Output buffer for pixel color data
- @param[in] DestinationX X location within video
- @param[in] DestinationY Y location within video
- @param[in] Width Width (in pixels)
- @param[in] Height Height
-
- @retval EFI_DEVICE_ERROR - A hardware error occured
- @retval EFI_INVALID_PARAMETER - Invalid parameter passed in
- @retval EFI_SUCCESS - Blt operation success
-
-**/
-EFI_STATUS
-EFIAPI
-BltLibBufferToVideo (
- IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer,
- IN UINTN DestinationX,
- IN UINTN DestinationY,
- IN UINTN Width,
- IN UINTN Height
- );
-
-
-/**
- Performs a UEFI Graphics Output Protocol Blt Buffer to Video operation
- with extended parameters.
-
- @param[in] BltBuffer Output buffer for pixel color data
@param[in] SourceX X location within BltBuffer
@param[in] SourceY Y location within BltBuffer
@param[in] DestinationX X location within video
@@ -199,7 +108,7 @@ BltLibBufferToVideo (
**/
EFI_STATUS
EFIAPI
-BltLibBufferToVideoEx (
+BltBufferToVideo (
IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer,
IN UINTN SourceX,
IN UINTN SourceY,
@@ -228,7 +137,7 @@ BltLibBufferToVideoEx (
**/
EFI_STATUS
EFIAPI
-BltLibVideoToVideo (
+BltVideoToVideo (
IN UINTN SourceX,
IN UINTN SourceY,
IN UINTN DestinationX,
diff --git a/OptionRomPkg/Library/FrameBufferBltLib/FrameBufferBltLib.c
b/OptionRomPkg/Library/FrameBufferBltLib/FrameBufferBltLib.c
index 7066e76..8b0d2bd 100644
--- a/OptionRomPkg/Library/FrameBufferBltLib/FrameBufferBltLib.c
+++ b/OptionRomPkg/Library/FrameBufferBltLib/FrameBufferBltLib.c
@@ -86,7 +86,7 @@ ConfigurePixelBitMaskFormat (
**/
EFI_STATUS
EFIAPI
-BltLibConfigure (
+BltConfigure (
IN VOID *FrameBuffer,
IN EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *FrameBufferInfo
)
@@ -126,89 +126,6 @@ BltLibConfigure (
}
/**
- Performs a UEFI Graphics Output Protocol Blt operation.
-
- @param[in,out] BltBuffer - The data to transfer to screen
- @param[in] BltOperation - The operation to perform
- @param[in] SourceX - The X coordinate of the source for
BltOperation
- @param[in] SourceY - The Y coordinate of the source for
BltOperation
- @param[in] DestinationX - The X coordinate of the destination for
BltOperation
- @param[in] DestinationY - The Y coordinate of the destination for
BltOperation
- @param[in] Width - The width of a rectangle in the blt rectangle
in pixels
- @param[in] Height - The height of a rectangle in the blt
rectangle in pixels
- @param[in] Delta - Not used for EfiBltVideoFill and
EfiBltVideoToVideo operation.
- If a Delta of 0 is used, the entire BltBuffer
will be operated on.
- If a subrectangle of the BltBuffer is used,
then Delta represents
- the number of bytes in a row of the BltBuffer.
-
- @retval EFI_DEVICE_ERROR - A hardware error occured
- @retval EFI_INVALID_PARAMETER - Invalid parameter passed in
- @retval EFI_SUCCESS - Blt operation success
-
-**/
-EFI_STATUS
-EFIAPI
-BltLibGopBlt (
- IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer, OPTIONAL
- IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation,
- IN UINTN SourceX,
- IN UINTN SourceY,
- IN UINTN DestinationX,
- IN UINTN DestinationY,
- IN UINTN Width,
- IN UINTN Height,
- IN UINTN Delta
- )
-{
- switch (BltOperation) {
- case EfiBltVideoToBltBuffer:
- return BltLibVideoToBltBufferEx (
- BltBuffer,
- SourceX,
- SourceY,
- DestinationX,
- DestinationY,
- Width,
- Height,
- Delta
- );
-
- case EfiBltVideoToVideo:
- return BltLibVideoToVideo (
- SourceX,
- SourceY,
- DestinationX,
- DestinationY,
- Width,
- Height
- );
-
- case EfiBltVideoFill:
- return BltLibVideoFill (
- BltBuffer,
- DestinationX,
- DestinationY,
- Width,
- Height
- );
-
- case EfiBltBufferToVideo:
- return BltLibBufferToVideoEx (
- BltBuffer,
- SourceX,
- SourceY,
- DestinationX,
- DestinationY,
- Width,
- Height,
- Delta
- );
- default:
- return EFI_INVALID_PARAMETER;
- }
-}
-
-/**
Performs a UEFI Graphics Output Protocol Blt Video Fill.
@param[in] Color Color to fill the region with
@@ -224,7 +141,7 @@ BltLibGopBlt (
**/
EFI_STATUS
EFIAPI
-BltLibVideoFill (
+BltVideoFill (
IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Color,
IN UINTN DestinationX,
IN UINTN DestinationY,
@@ -359,43 +276,6 @@ BltLibVideoFill (
@param[out] BltBuffer Output buffer for pixel color data
@param[in] SourceX X location within video
@param[in] SourceY Y location within video
- @param[in] Width Width (in pixels)
- @param[in] Height Height
-
- @retval EFI_DEVICE_ERROR - A hardware error occured
- @retval EFI_INVALID_PARAMETER - Invalid parameter passed in
- @retval EFI_SUCCESS - The sizes were returned
-
-**/
-EFI_STATUS
-EFIAPI
-BltLibVideoToBltBuffer (
- OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer,
- IN UINTN SourceX,
- IN UINTN SourceY,
- IN UINTN Width,
- IN UINTN Height
- )
-{
- return BltLibVideoToBltBufferEx (
- BltBuffer,
- SourceX,
- SourceY,
- 0,
- 0,
- Width,
- Height,
- 0
- );
-}
-
-/**
- Performs a UEFI Graphics Output Protocol Blt Video to Buffer operation
- with extended parameters.
-
- @param[out] BltBuffer Output buffer for pixel color data
- @param[in] SourceX X location within video
- @param[in] SourceY Y location within video
@param[in] DestinationX X location within BltBuffer
@param[in] DestinationY Y location within BltBuffer
@param[in] Width Width (in pixels)
@@ -409,7 +289,7 @@ BltLibVideoToBltBuffer (
**/
EFI_STATUS
EFIAPI
-BltLibVideoToBltBufferEx (
+BltVideoToBuffer (
OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer,
IN UINTN SourceX,
IN UINTN SourceY,
@@ -494,44 +374,6 @@ BltLibVideoToBltBufferEx (
Performs a UEFI Graphics Output Protocol Blt Buffer to Video operation.
@param[in] BltBuffer Output buffer for pixel color data
- @param[in] DestinationX X location within video
- @param[in] DestinationY Y location within video
- @param[in] Width Width (in pixels)
- @param[in] Height Height
-
- @retval EFI_DEVICE_ERROR - A hardware error occured
- @retval EFI_INVALID_PARAMETER - Invalid parameter passed in
- @retval EFI_SUCCESS - The sizes were returned
-
-**/
-EFI_STATUS
-EFIAPI
-BltLibBufferToVideo (
- IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer,
- IN UINTN DestinationX,
- IN UINTN DestinationY,
- IN UINTN Width,
- IN UINTN Height
- )
-{
- return BltLibBufferToVideoEx (
- BltBuffer,
- 0,
- 0,
- DestinationX,
- DestinationY,
- Width,
- Height,
- 0
- );
-}
-
-
-/**
- Performs a UEFI Graphics Output Protocol Blt Buffer to Video operation
- with extended parameters.
-
- @param[in] BltBuffer Output buffer for pixel color data
@param[in] SourceX X location within BltBuffer
@param[in] SourceY Y location within BltBuffer
@param[in] DestinationX X location within video
@@ -547,7 +389,7 @@ BltLibBufferToVideo (
**/
EFI_STATUS
EFIAPI
-BltLibBufferToVideoEx (
+BltBufferToVideo (
IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer,
IN UINTN SourceX,
IN UINTN SourceY,
@@ -644,7 +486,7 @@ BltLibBufferToVideoEx (
**/
EFI_STATUS
EFIAPI
-BltLibVideoToVideo (
+BltVideoToVideo (
IN UINTN SourceX,
IN UINTN SourceY,
IN UINTN DestinationX,
diff --git a/OptionRomPkg/Library/GopBltLib/GopBltLib.c
b/OptionRomPkg/Library/GopBltLib/GopBltLib.c
index 70377db..8f598f2 100644
--- a/OptionRomPkg/Library/GopBltLib/GopBltLib.c
+++ b/OptionRomPkg/Library/GopBltLib/GopBltLib.c
@@ -39,7 +39,7 @@ EFI_GRAPHICS_OUTPUT_PROTOCOL *mGop = NULL;
**/
EFI_STATUS
EFIAPI
-BltLibConfigure (
+BltConfigure (
IN VOID *FrameBuffer,
IN EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *FrameBufferInfo
)
@@ -131,56 +131,6 @@ InternalGopBltCommon (
);
}
-
-/**
- Performs a UEFI Graphics Output Protocol Blt operation.
-
- @param[in,out] BltBuffer - The data to transfer to screen
- @param[in] BltOperation - The operation to perform
- @param[in] SourceX - The X coordinate of the source for
BltOperation
- @param[in] SourceY - The Y coordinate of the source for
BltOperation
- @param[in] DestinationX - The X coordinate of the destination for
BltOperation
- @param[in] DestinationY - The Y coordinate of the destination for
BltOperation
- @param[in] Width - The width of a rectangle in the blt rectangle
in pixels
- @param[in] Height - The height of a rectangle in the blt
rectangle in pixels
- @param[in] Delta - Not used for EfiBltVideoFill and
EfiBltVideoToVideo operation.
- If a Delta of 0 is used, the entire BltBuffer
will be operated on.
- If a subrectangle of the BltBuffer is used,
then Delta represents
- the number of bytes in a row of the BltBuffer.
-
- @retval EFI_DEVICE_ERROR - A hardware error occured
- @retval EFI_INVALID_PARAMETER - Invalid parameter passed in
- @retval EFI_SUCCESS - Blt operation success
-
-**/
-EFI_STATUS
-EFIAPI
-BltLibGopBlt (
- IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer, OPTIONAL
- IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation,
- IN UINTN SourceX,
- IN UINTN SourceY,
- IN UINTN DestinationX,
- IN UINTN DestinationY,
- IN UINTN Width,
- IN UINTN Height,
- IN UINTN Delta
- )
-{
- return InternalGopBltCommon (
- BltBuffer,
- BltOperation,
- SourceX,
- SourceY,
- DestinationX,
- DestinationY,
- Width,
- Height,
- Delta
- );
-}
-
-
/**
Performs a UEFI Graphics Output Protocol Blt Video Fill.
@@ -197,7 +147,7 @@ BltLibGopBlt (
**/
EFI_STATUS
EFIAPI
-BltLibVideoFill (
+BltVideoFill (
IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Color,
IN UINTN DestinationX,
IN UINTN DestinationY,
@@ -225,45 +175,6 @@ BltLibVideoFill (
@param[out] BltBuffer Output buffer for pixel color data
@param[in] SourceX X location within video
@param[in] SourceY Y location within video
- @param[in] Width Width (in pixels)
- @param[in] Height Height
-
- @retval EFI_DEVICE_ERROR - A hardware error occured
- @retval EFI_INVALID_PARAMETER - Invalid parameter passed in
- @retval EFI_SUCCESS - The sizes were returned
-
-**/
-EFI_STATUS
-EFIAPI
-BltLibVideoToBltBuffer (
- OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer,
- IN UINTN SourceX,
- IN UINTN SourceY,
- IN UINTN Width,
- IN UINTN Height
- )
-{
- return InternalGopBltCommon (
- BltBuffer,
- EfiBltVideoToBltBuffer,
- SourceX,
- SourceY,
- 0,
- 0,
- Width,
- Height,
- 0
- );
-}
-
-
-/**
- Performs a UEFI Graphics Output Protocol Blt Video to Buffer operation
- with extended parameters.
-
- @param[out] BltBuffer Output buffer for pixel color data
- @param[in] SourceX X location within video
- @param[in] SourceY Y location within video
@param[in] DestinationX X location within BltBuffer
@param[in] DestinationY Y location within BltBuffer
@param[in] Width Width (in pixels)
@@ -277,7 +188,7 @@ BltLibVideoToBltBuffer (
**/
EFI_STATUS
EFIAPI
-BltLibVideoToBltBufferEx (
+BltVideoToBuffer (
OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer,
IN UINTN SourceX,
IN UINTN SourceY,
@@ -306,45 +217,6 @@ BltLibVideoToBltBufferEx (
Performs a UEFI Graphics Output Protocol Blt Buffer to Video operation.
@param[in] BltBuffer Output buffer for pixel color data
- @param[in] DestinationX X location within video
- @param[in] DestinationY Y location within video
- @param[in] Width Width (in pixels)
- @param[in] Height Height
-
- @retval EFI_DEVICE_ERROR - A hardware error occured
- @retval EFI_INVALID_PARAMETER - Invalid parameter passed in
- @retval EFI_SUCCESS - The sizes were returned
-
-**/
-EFI_STATUS
-EFIAPI
-BltLibBufferToVideo (
- IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer,
- IN UINTN DestinationX,
- IN UINTN DestinationY,
- IN UINTN Width,
- IN UINTN Height
- )
-{
- return InternalGopBltCommon (
- BltBuffer,
- EfiBltBufferToVideo,
- 0,
- 0,
- DestinationX,
- DestinationY,
- Width,
- Height,
- 0
- );
-}
-
-
-/**
- Performs a UEFI Graphics Output Protocol Blt Buffer to Video operation
- with extended parameters.
-
- @param[in] BltBuffer Output buffer for pixel color data
@param[in] SourceX X location within BltBuffer
@param[in] SourceY Y location within BltBuffer
@param[in] DestinationX X location within video
@@ -360,7 +232,7 @@ BltLibBufferToVideo (
**/
EFI_STATUS
EFIAPI
-BltLibBufferToVideoEx (
+BltBufferToVideo (
IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer,
IN UINTN SourceX,
IN UINTN SourceY,
@@ -402,7 +274,7 @@ BltLibBufferToVideoEx (
**/
EFI_STATUS
EFIAPI
-BltLibVideoToVideo (
+BltVideoToVideo (
IN UINTN SourceX,
IN UINTN SourceY,
IN UINTN DestinationX,
diff --git a/OvmfPkg/QemuVideoDxe/Gop.c b/OvmfPkg/QemuVideoDxe/Gop.c
index 18d0779..131e5c1 100644
--- a/OvmfPkg/QemuVideoDxe/Gop.c
+++ b/OvmfPkg/QemuVideoDxe/Gop.c
@@ -1,7 +1,7 @@
/** @file
Graphics Output Protocol functions for the QEMU video controller.
- Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -201,7 +201,7 @@ Routine Description:
QemuVideoCompleteModeData (Private, This->Mode);
- BltLibConfigure (
+ BltConfigure (
(VOID*)(UINTN) This->Mode->FrameBufferBase,
This->Mode->Info
);
@@ -252,40 +252,69 @@ Returns:
--*/
{
- EFI_STATUS Status;
- EFI_TPL OriginalTPL;
-
+ EFI_STATUS Status;
+ EFI_TPL Tpl;
//
- // We have to raise to TPL Notify, so we make an atomic write the frame
buffer.
+ // We have to raise to TPL_NOTIFY, so we make an atomic write to the frame
buffer.
// We would not want a timer based event (Cursor, ...) to come in while we
are
// doing this operation.
//
- OriginalTPL = gBS->RaiseTPL (TPL_NOTIFY);
+ Tpl = gBS->RaiseTPL (TPL_NOTIFY);
switch (BltOperation) {
case EfiBltVideoToBltBuffer:
- case EfiBltBufferToVideo:
- case EfiBltVideoFill:
+ Status = BltVideoToBuffer (
+ BltBuffer,
+ SourceX,
+ SourceY,
+ DestinationX,
+ DestinationY,
+ Width,
+ Height,
+ Delta
+ );
+ break;
+
case EfiBltVideoToVideo:
- Status = BltLibGopBlt (
- BltBuffer,
- BltOperation,
- SourceX,
- SourceY,
- DestinationX,
- DestinationY,
- Width,
- Height,
- Delta
- );
+ Status = BltVideoToVideo (
+ SourceX,
+ SourceY,
+ DestinationX,
+ DestinationY,
+ Width,
+ Height
+ );
+ break;
+
+ case EfiBltVideoFill:
+ Status = BltVideoFill (
+ BltBuffer,
+ DestinationX,
+ DestinationY,
+ Width,
+ Height
+ );
+ break;
+
+ case EfiBltBufferToVideo:
+ Status = BltBufferToVideo (
+ BltBuffer,
+ SourceX,
+ SourceY,
+ DestinationX,
+ DestinationY,
+ Width,
+ Height,
+ Delta
+ );
break;
default:
Status = EFI_INVALID_PARAMETER;
- ASSERT (FALSE);
+ break;
}
- gBS->RestoreTPL (OriginalTPL);
+ gBS->RestoreTPL (Tpl);
return Status;
}
--
1.9.5.msysgit.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
