diff options
Diffstat (limited to 'MdePkg')
| -rw-r--r-- | MdePkg/Include/Library/UefiLib.h | 17 | ||||
| -rw-r--r-- | MdePkg/Include/Library/UefiScsiLib.h | 11 | ||||
| -rw-r--r-- | MdePkg/Library/UefiLib/UefiLibPrint.c | 46 | ||||
| -rw-r--r-- | MdePkg/Library/UefiRuntimeLib/RuntimeLib.c | 6 | ||||
| -rw-r--r-- | MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h | 2 | ||||
| -rw-r--r-- | MdePkg/Library/UefiRuntimeLib/RuntimeService.c | 26 | ||||
| -rw-r--r-- | MdePkg/Library/UefiScsiLib/UefiScsiLib.c | 19 |
7 files changed, 63 insertions, 64 deletions
diff --git a/MdePkg/Include/Library/UefiLib.h b/MdePkg/Include/Library/UefiLib.h index 340a030030..401695293a 100644 --- a/MdePkg/Include/Library/UefiLib.h +++ b/MdePkg/Include/Library/UefiLib.h @@ -1067,6 +1067,7 @@ AsciiErrorPrint ( ...
);
+
/**
Prints a formatted Unicode string to a graphics console device specified by
ConsoleOutputHandle defined in the EFI_SYSTEM_TABLE at the given (X,Y) coordinates.
@@ -1087,8 +1088,8 @@ AsciiErrorPrint ( If Format is NULL, then ASSERT().
If Format is not aligned on a 16-bit boundary, then ASSERT().
- @param X X coordinate to print the string.
- @param Y Y coordinate to print the string.
+ @param PointX X coordinate to print the string.
+ @param PointY Y coordinate to print the string.
@param ForeGround The foreground color of the string being printed. This is
an optional parameter that may be NULL. If it is NULL,
then the foreground color of the current ConOut device
@@ -1108,8 +1109,8 @@ AsciiErrorPrint ( UINTN
EFIAPI
PrintXY (
- IN UINTN X,
- IN UINTN Y,
+ IN UINTN PointX,
+ IN UINTN PointY,
IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *ForeGround, OPTIONAL
IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BackGround, OPTIONAL
IN CONST CHAR16 *Format,
@@ -1135,8 +1136,8 @@ PrintXY ( string is printed, and 0 is returned.
If Format is NULL, then ASSERT().
- @param X X coordinate to print the string.
- @param Y Y coordinate to print the string.
+ @param PointX X coordinate to print the string.
+ @param PointY Y coordinate to print the string.
@param ForeGround The foreground color of the string being printed. This is
an optional parameter that may be NULL. If it is NULL,
then the foreground color of the current ConOut device
@@ -1156,8 +1157,8 @@ PrintXY ( UINTN
EFIAPI
AsciiPrintXY (
- IN UINTN X,
- IN UINTN Y,
+ IN UINTN PointX,
+ IN UINTN PointY,
IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *ForeGround, OPTIONAL
IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BackGround, OPTIONAL
IN CONST CHAR8 *Format,
diff --git a/MdePkg/Include/Library/UefiScsiLib.h b/MdePkg/Include/Library/UefiScsiLib.h index 7d27a2a0b0..a1e7163846 100644 --- a/MdePkg/Include/Library/UefiScsiLib.h +++ b/MdePkg/Include/Library/UefiScsiLib.h @@ -333,7 +333,7 @@ ScsiRequestSenseCommand ( Executes the SCSI Read Capacity command on the SCSI target specified by ScsiIo.
If Timeout is zero, then this function waits indefinitely for the command to complete.
If Timeout is greater than zero, then the command is executed and will timeout after
- Timeout 100 ns units. The PMI parameter is used to construct the CDB for this SCSI command.
+ Timeout 100 ns units. The Pmi parameter is used to construct the CDB for this SCSI command.
If ScsiIo is NULL, then ASSERT().
If SenseDataLength is NULL, then ASSERT().
If HostAdapterStatus is NULL, then ASSERT().
@@ -348,7 +348,7 @@ ScsiRequestSenseCommand ( @param[out] TargetStatus The status of the target.
@param[in, out] DataBuffer A pointer to a data buffer.
@param[in, out] DataLength The length of data buffer.
- @param[in] PMI Partial medium indicator.
+ @param[in] Pmi Partial medium indicator.
@retval EFI_SUCCESS Command is executed successfully.
@retval EFI_BAD_BUFFER_SIZE The SCSI Request Packet was executed, but the entire
@@ -373,7 +373,7 @@ ScsiReadCapacityCommand ( OUT UINT8 *TargetStatus,
IN OUT VOID *DataBuffer, OPTIONAL
IN OUT UINT32 *DataLength,
- IN BOOLEAN PMI
+ IN BOOLEAN Pmi
);
@@ -388,7 +388,7 @@ ScsiReadCapacityCommand ( @param TargetStatus The status of the target.
@param DataBuffer A pointer to a data buffer.
@param DataLength The length of data buffer.
- @param PMI Partial medium indicator.
+ @param Pmi Partial medium indicator.
@retval EFI_SUCCESS The status of the unit is tested successfully.
@retval EFI_BAD_BUFFER_SIZE The SCSI Request Packet was executed,
@@ -408,7 +408,6 @@ ScsiReadCapacityCommand ( Request Packet to execute.
**/
-
EFI_STATUS
EFIAPI
ScsiReadCapacity16Command (
@@ -420,7 +419,7 @@ ScsiReadCapacity16Command ( OUT UINT8 *TargetStatus,
OUT VOID *DataBuffer,
IN OUT UINT32 *DataLength,
- IN BOOLEAN PMI
+ IN BOOLEAN Pmi
);
diff --git a/MdePkg/Library/UefiLib/UefiLibPrint.c b/MdePkg/Library/UefiLib/UefiLibPrint.c index 66fabdc923..d9268ef52d 100644 --- a/MdePkg/Library/UefiLib/UefiLibPrint.c +++ b/MdePkg/Library/UefiLib/UefiLibPrint.c @@ -306,9 +306,9 @@ AsciiErrorPrint ( If the EFI_HII_FONT_PROTOCOL is not present in the handle database, then no
string is printed, and 0 is returned.
- @param X X coordinate to print the string.
- @param Y Y coordinate to print the string.
- @param Foreground The forground color of the string being printed. This is
+ @param PointX X coordinate to print the string.
+ @param PointY Y coordinate to print the string.
+ @param Foreground The foreground color of the string being printed. This is
an optional parameter that may be NULL. If it is NULL,
then the foreground color of the current ConOut device
in the EFI_SYSTEM_TABLE is used.
@@ -325,8 +325,8 @@ AsciiErrorPrint ( **/
UINTN
InternalPrintGraphic (
- IN UINTN X,
- IN UINTN Y,
+ IN UINTN PointX,
+ IN UINTN PointY,
IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Foreground,
IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Background,
IN CHAR16 *Buffer,
@@ -459,8 +459,8 @@ InternalPrintGraphic ( Buffer,
&FontInfo,
&Blt,
- X,
- Y,
+ PointX,
+ PointY,
NULL,
NULL,
NULL
@@ -483,8 +483,8 @@ InternalPrintGraphic ( Buffer,
&FontInfo,
&Blt,
- X,
- Y,
+ PointX,
+ PointY,
&RowInfoArray,
&RowInfoArraySize,
NULL
@@ -502,10 +502,10 @@ InternalPrintGraphic ( UgaDraw,
(EFI_UGA_PIXEL *) Blt->Image.Bitmap,
EfiUgaBltBufferToVideo,
- X,
- Y,
- X,
- Y,
+ PointX,
+ PointY,
+ PointX,
+ PointY,
RowInfoArray[0].LineWidth,
RowInfoArray[0].LineHeight,
Blt->Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)
@@ -549,8 +549,8 @@ Error: If Format is NULL, then ASSERT().
If Format is not aligned on a 16-bit boundary, then ASSERT().
- @param X X coordinate to print the string.
- @param Y Y coordinate to print the string.
+ @param PointX X coordinate to print the string.
+ @param PointY Y coordinate to print the string.
@param ForeGround The foreground color of the string being printed. This is
an optional parameter that may be NULL. If it is NULL,
then the foreground color of the current ConOut device
@@ -570,8 +570,8 @@ Error: UINTN
EFIAPI
PrintXY (
- IN UINTN X,
- IN UINTN Y,
+ IN UINTN PointX,
+ IN UINTN PointY,
IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *ForeGround, OPTIONAL
IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BackGround, OPTIONAL
IN CONST CHAR16 *Format,
@@ -596,7 +596,7 @@ PrintXY ( PrintNum = UnicodeVSPrint (Buffer, BufferSize, Format, Marker);
- ReturnNum = InternalPrintGraphic (X, Y, ForeGround, BackGround, Buffer, PrintNum);
+ ReturnNum = InternalPrintGraphic (PointX, PointY, ForeGround, BackGround, Buffer, PrintNum);
FreePool (Buffer);
@@ -622,8 +622,8 @@ PrintXY ( string is printed, and 0 is returned.
If Format is NULL, then ASSERT().
- @param X X coordinate to print the string.
- @param Y Y coordinate to print the string.
+ @param PointX X coordinate to print the string.
+ @param PointY Y coordinate to print the string.
@param ForeGround The foreground color of the string being printed. This is
an optional parameter that may be NULL. If it is NULL,
then the foreground color of the current ConOut device
@@ -643,8 +643,8 @@ PrintXY ( UINTN
EFIAPI
AsciiPrintXY (
- IN UINTN X,
- IN UINTN Y,
+ IN UINTN PointX,
+ IN UINTN PointY,
IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *ForeGround, OPTIONAL
IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BackGround, OPTIONAL
IN CONST CHAR8 *Format,
@@ -668,7 +668,7 @@ AsciiPrintXY ( PrintNum = UnicodeSPrintAsciiFormat (Buffer, BufferSize, Format, Marker);
- ReturnNum = InternalPrintGraphic (X, Y, ForeGround, BackGround, Buffer, PrintNum);
+ ReturnNum = InternalPrintGraphic (PointX, PointY, ForeGround, BackGround, Buffer, PrintNum);
FreePool (Buffer);
diff --git a/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c b/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c index 592663a865..2a6ab39ba4 100644 --- a/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c +++ b/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c @@ -22,7 +22,7 @@ EFI_EVENT mEfiVirtualNotifyEvent; EFI_EVENT mEfiExitBootServicesEvent;
BOOLEAN mEfiGoneVirtual = FALSE;
BOOLEAN mEfiAtRuntime = FALSE;
-EFI_RUNTIME_SERVICES *mRT;
+EFI_RUNTIME_SERVICES *gInternalRT;
/**
Set AtRuntime flag as TRUE after ExitBootServices.
@@ -63,7 +63,7 @@ RuntimeLibVirtualNotifyEvent ( //
// Update global for Runtime Services Table and IO
//
- EfiConvertPointer (0, (VOID **) &mRT);
+ EfiConvertPointer (0, (VOID **) &gInternalRT);
mEfiGoneVirtual = TRUE;
}
@@ -90,7 +90,7 @@ RuntimeDriverLibConstruct ( ASSERT (gRT != NULL);
ASSERT (gBS != NULL);
- mRT = gRT;
+ gInternalRT = gRT;
//
// Register SetVirtualAddressMap () notify function
//
diff --git a/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h b/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h index 3d62dd81b8..040932c138 100644 --- a/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h +++ b/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h @@ -21,6 +21,6 @@ #include <Library/UefiBootServicesTableLib.h>
#include <Library/UefiRuntimeServicesTableLib.h>
#include <Guid/EventGroup.h>
-extern EFI_RUNTIME_SERVICES *mRT;
+extern EFI_RUNTIME_SERVICES *gInternalRT;
#endif
diff --git a/MdePkg/Library/UefiRuntimeLib/RuntimeService.c b/MdePkg/Library/UefiRuntimeLib/RuntimeService.c index 0502257768..43bb95645a 100644 --- a/MdePkg/Library/UefiRuntimeLib/RuntimeService.c +++ b/MdePkg/Library/UefiRuntimeLib/RuntimeService.c @@ -58,7 +58,7 @@ EfiResetSystem ( IN VOID *ResetData OPTIONAL
)
{
- mRT->ResetSystem (ResetType, ResetStatus, DataSize, ResetData);
+ gInternalRT->ResetSystem (ResetType, ResetStatus, DataSize, ResetData);
}
@@ -90,7 +90,7 @@ EfiGetTime ( OUT EFI_TIME_CAPABILITIES *Capabilities OPTIONAL
)
{
- return mRT->GetTime (Time, Capabilities);
+ return gInternalRT->GetTime (Time, Capabilities);
}
@@ -122,7 +122,7 @@ EfiSetTime ( IN EFI_TIME *Time
)
{
- return mRT->SetTime (Time);
+ return gInternalRT->SetTime (Time);
}
@@ -155,7 +155,7 @@ EfiGetWakeupTime ( OUT EFI_TIME *Time
)
{
- return mRT->GetWakeupTime (Enabled, Pending, Time);
+ return gInternalRT->GetWakeupTime (Enabled, Pending, Time);
}
@@ -189,7 +189,7 @@ EfiSetWakeupTime ( IN EFI_TIME *Time OPTIONAL
)
{
- return mRT->SetWakeupTime (Enable, Time);
+ return gInternalRT->SetWakeupTime (Enable, Time);
}
@@ -233,7 +233,7 @@ EfiGetVariable ( OUT VOID *Data
)
{
- return mRT->GetVariable (VariableName, VendorGuid, Attributes, DataSize, Data);
+ return gInternalRT->GetVariable (VariableName, VendorGuid, Attributes, DataSize, Data);
}
@@ -275,7 +275,7 @@ EfiGetNextVariableName ( IN OUT EFI_GUID *VendorGuid
)
{
- return mRT->GetNextVariableName (VariableNameSize, VariableName, VendorGuid);
+ return gInternalRT->GetNextVariableName (VariableNameSize, VariableName, VendorGuid);
}
@@ -318,7 +318,7 @@ EfiSetVariable ( IN VOID *Data
)
{
- return mRT->SetVariable (VariableName, VendorGuid, Attributes, DataSize, Data);
+ return gInternalRT->SetVariable (VariableName, VendorGuid, Attributes, DataSize, Data);
}
@@ -344,7 +344,7 @@ EfiGetNextHighMonotonicCount ( OUT UINT32 *HighCount
)
{
- return mRT->GetNextHighMonotonicCount (HighCount);
+ return gInternalRT->GetNextHighMonotonicCount (HighCount);
}
@@ -499,7 +499,7 @@ EfiSetVirtualAddressMap ( IN CONST EFI_MEMORY_DESCRIPTOR *VirtualMap
)
{
- return mRT->SetVirtualAddressMap (
+ return gInternalRT->SetVirtualAddressMap (
MemoryMapSize,
DescriptorSize,
DescriptorVersion,
@@ -550,7 +550,7 @@ EfiUpdateCapsule ( IN EFI_PHYSICAL_ADDRESS ScatterGatherList OPTIONAL
)
{
- return mRT->UpdateCapsule (
+ return gInternalRT->UpdateCapsule (
CapsuleHeaderArray,
CapsuleCount,
ScatterGatherList
@@ -601,7 +601,7 @@ EfiQueryCapsuleCapabilities ( OUT EFI_RESET_TYPE *ResetType
)
{
- return mRT->QueryCapsuleCapabilities (
+ return gInternalRT->QueryCapsuleCapabilities (
CapsuleHeaderArray,
CapsuleCount,
MaximumCapsuleSize,
@@ -653,7 +653,7 @@ EfiQueryVariableInfo ( OUT UINT64 *MaximumVariableSize
)
{
- return mRT->QueryVariableInfo (
+ return gInternalRT->QueryVariableInfo (
Attributes,
MaximumVariableStorageSize,
RemainingVariableStorageSize,
diff --git a/MdePkg/Library/UefiScsiLib/UefiScsiLib.c b/MdePkg/Library/UefiScsiLib/UefiScsiLib.c index 1458efd2f9..2b770b58e3 100644 --- a/MdePkg/Library/UefiScsiLib/UefiScsiLib.c +++ b/MdePkg/Library/UefiScsiLib/UefiScsiLib.c @@ -539,7 +539,7 @@ ScsiRequestSenseCommand ( Executes the SCSI Read Capacity command on the SCSI target specified by ScsiIo.
If Timeout is zero, then this function waits indefinitely for the command to complete.
If Timeout is greater than zero, then the command is executed and will timeout after
- Timeout 100 ns units. The PMI parameter is used to construct the CDB for this SCSI command.
+ Timeout 100 ns units. The Pmi parameter is used to construct the CDB for this SCSI command.
If ScsiIo is NULL, then ASSERT().
If SenseDataLength is NULL, then ASSERT().
If HostAdapterStatus is NULL, then ASSERT().
@@ -554,7 +554,7 @@ ScsiRequestSenseCommand ( @param[out] TargetStatus The status of the target.
@param[in, out] DataBuffer A pointer to a data buffer.
@param[in, out] DataLength The length of data buffer.
- @param[in] PMI Partial medium indicator.
+ @param[in] Pmi Partial medium indicator.
@retval EFI_SUCCESS Command is executed successfully.
@retval EFI_BAD_BUFFER_SIZE The SCSI Request Packet was executed, but the entire
@@ -579,7 +579,7 @@ ScsiReadCapacityCommand ( OUT UINT8 *TargetStatus,
IN OUT VOID *DataBuffer, OPTIONAL
IN OUT UINT32 *DataLength,
- IN BOOLEAN PMI
+ IN BOOLEAN Pmi
)
{
EFI_SCSI_IO_SCSI_REQUEST_PACKET CommandPacket;
@@ -611,9 +611,9 @@ ScsiReadCapacityCommand ( Cdb[0] = EFI_SCSI_OP_READ_CAPACITY;
Cdb[1] = (UINT8) (Lun & EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK);
- if (!PMI) {
+ if (!Pmi) {
//
- // Partial medium indicator,if PMI is FALSE, the Cdb.2 ~ Cdb.5 MUST BE ZERO.
+ // Partial medium indicator,if Pmi is FALSE, the Cdb.2 ~ Cdb.5 MUST BE ZERO.
//
ZeroMem ((Cdb + 2), 4);
} else {
@@ -646,7 +646,7 @@ ScsiReadCapacityCommand ( @param TargetStatus The status of the target.
@param DataBuffer A pointer to a data buffer.
@param DataLength The length of data buffer.
- @param PMI Partial medium indicator.
+ @param Pmi Partial medium indicator.
@retval EFI_SUCCESS The status of the unit is tested successfully.
@retval EFI_BAD_BUFFER_SIZE The SCSI Request Packet was executed,
@@ -666,7 +666,6 @@ ScsiReadCapacityCommand ( Request Packet to execute.
**/
-
EFI_STATUS
EFIAPI
ScsiReadCapacity16Command (
@@ -678,7 +677,7 @@ ScsiReadCapacity16Command ( OUT UINT8 *TargetStatus,
OUT VOID *DataBuffer,
IN OUT UINT32 *DataLength,
- IN BOOLEAN PMI
+ IN BOOLEAN Pmi
)
{
EFI_SCSI_IO_SCSI_REQUEST_PACKET CommandPacket;
@@ -704,9 +703,9 @@ ScsiReadCapacity16Command ( Cdb[0] = EFI_SCSI_OP_READ_CAPACITY16;
Cdb[1] = 0x10;
- if (!PMI) {
+ if (!Pmi) {
//
- // Partial medium indicator,if PMI is FALSE, the Cdb.2 ~ Cdb.9 MUST BE ZERO.
+ // Partial medium indicator,if Pmi is FALSE, the Cdb.2 ~ Cdb.9 MUST BE ZERO.
//
ZeroMem ((Cdb + 2), 8);
} else {
|