From 16f411102715f05480e2413ff673446d5d86fcf7 Mon Sep 17 00:00:00 2001 From: Mikhail Krichanov Date: Thu, 23 Jan 2025 15:59:36 +0300 Subject: [PATCH] SysCall: Fixed paddings, renamed CoreOpenVolume as CoreSimpleFileSystemOpenVolume. --- MdeModulePkg/Core/Dxe/DxeMain.h | 2 +- .../Core/Dxe/DxeRing3/AARCH64/SysCall.S | 2 +- MdeModulePkg/Core/Dxe/DxeRing3/ARM/SysCall.S | 2 +- MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.c | 4 +- .../Core/Dxe/DxeRing3/IA32/SysCall.nasm | 2 +- MdeModulePkg/Core/Dxe/DxeRing3/Ring3.h | 278 +++++++++--------- .../Core/Dxe/DxeRing3/Ring3Protocols.c | 44 +-- .../Core/Dxe/DxeRing3/Ring3UefiBootServices.c | 136 ++++----- .../Dxe/DxeRing3/Ring3UefiRuntimeServices.c | 86 +++--- .../Core/Dxe/DxeRing3/X64/SysCall.nasm | 2 +- .../Dxe/SysCall/AARCH64/CoreBootServices.S | 6 +- .../Dxe/SysCall/AARCH64/InitializeAARCH64.c | 14 +- .../Core/Dxe/SysCall/ARM/CoreBootServices.S | 6 +- .../Core/Dxe/SysCall/ARM/InitializeARM.c | 16 +- MdeModulePkg/Core/Dxe/SysCall/BootServices.c | 10 +- .../Dxe/SysCall/IA32/CoreBootServices.nasm | 8 +- .../Core/Dxe/SysCall/IA32/InitializeIA32.c | 4 +- .../Core/Dxe/SysCall/SupportedProtocols.c | 122 ++++---- .../Core/Dxe/SysCall/SupportedProtocols.h | 50 ++-- .../Dxe/SysCall/X64/CoreBootServices.nasm | 8 +- .../Core/Dxe/SysCall/X64/InitializeX64.c | 4 +- 21 files changed, 403 insertions(+), 403 deletions(-) diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h index 004807296e..688c508a82 100644 --- a/MdeModulePkg/Core/Dxe/DxeMain.h +++ b/MdeModulePkg/Core/Dxe/DxeMain.h @@ -2727,7 +2727,7 @@ SetUefiImageProtectionAttributes ( EFI_STATUS EFIAPI CoreBootServices ( - IN UINT8 Type, + IN UINT8 Type, ... ); diff --git a/MdeModulePkg/Core/Dxe/DxeRing3/AARCH64/SysCall.S b/MdeModulePkg/Core/Dxe/DxeRing3/AARCH64/SysCall.S index 4a63ec87e1..47039d2940 100644 --- a/MdeModulePkg/Core/Dxe/DxeRing3/AARCH64/SysCall.S +++ b/MdeModulePkg/Core/Dxe/DxeRing3/AARCH64/SysCall.S @@ -24,7 +24,7 @@ ASM_FUNC(SysCall) // VOID // EFIAPI // Ring3EntryPoint ( -// IN RING3_CALL_DATA *Data +// IN RING3_CALL_DATA *Data // ); // // (x0) Data diff --git a/MdeModulePkg/Core/Dxe/DxeRing3/ARM/SysCall.S b/MdeModulePkg/Core/Dxe/DxeRing3/ARM/SysCall.S index 2a0a28e32f..dee789fce5 100644 --- a/MdeModulePkg/Core/Dxe/DxeRing3/ARM/SysCall.S +++ b/MdeModulePkg/Core/Dxe/DxeRing3/ARM/SysCall.S @@ -24,7 +24,7 @@ ASM_FUNC(SysCall) // VOID // EFIAPI // Ring3EntryPoint ( -// IN RING3_CALL_DATA *Data +// IN RING3_CALL_DATA *Data // ); // // (r0) Data diff --git a/MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.c b/MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.c index b024fb5aac..0090023f88 100644 --- a/MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.c +++ b/MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.c @@ -94,7 +94,7 @@ EFI_RUNTIME_SERVICES mRuntimeServices = { VOID EFIAPI Ring3EntryPoint ( - IN RING3_CALL_DATA *Data + IN RING3_CALL_DATA *Data ); typedef @@ -182,7 +182,7 @@ EFI_STATUS VOID EFIAPI Ring3Call ( - IN RING3_CALL_DATA *Data + IN RING3_CALL_DATA *Data ) { EFI_STATUS Status; diff --git a/MdeModulePkg/Core/Dxe/DxeRing3/IA32/SysCall.nasm b/MdeModulePkg/Core/Dxe/DxeRing3/IA32/SysCall.nasm index 7b6ff6d1c4..7c12e57736 100644 --- a/MdeModulePkg/Core/Dxe/DxeRing3/IA32/SysCall.nasm +++ b/MdeModulePkg/Core/Dxe/DxeRing3/IA32/SysCall.nasm @@ -50,7 +50,7 @@ userReturnAddress: ; VOID ; EFIAPI ; Ring3EntryPoint ( -; IN RING3_CALL_DATA *Data +; IN RING3_CALL_DATA *Data ; ); ; ; (eax) Data diff --git a/MdeModulePkg/Core/Dxe/DxeRing3/Ring3.h b/MdeModulePkg/Core/Dxe/DxeRing3/Ring3.h index 44c1938344..20d6fa15c3 100644 --- a/MdeModulePkg/Core/Dxe/DxeRing3/Ring3.h +++ b/MdeModulePkg/Core/Dxe/DxeRing3/Ring3.h @@ -68,9 +68,9 @@ Ring3RestoreTpl ( EFI_STATUS EFIAPI Ring3AllocatePages ( - IN EFI_ALLOCATE_TYPE Type, - IN EFI_MEMORY_TYPE MemoryType, - IN UINTN NumberOfPages, + IN EFI_ALLOCATE_TYPE Type, + IN EFI_MEMORY_TYPE MemoryType, + IN UINTN NumberOfPages, IN OUT EFI_PHYSICAL_ADDRESS *Memory ); @@ -127,9 +127,9 @@ EFIAPI Ring3GetMemoryMap ( IN OUT UINTN *MemoryMapSize, IN OUT EFI_MEMORY_DESCRIPTOR *MemoryMap, - OUT UINTN *MapKey, - OUT UINTN *DescriptorSize, - OUT UINT32 *DescriptorVersion + OUT UINTN *MapKey, + OUT UINTN *DescriptorSize, + OUT UINT32 *DescriptorVersion ); /** @@ -153,11 +153,11 @@ Ring3GetMemoryMap ( EFI_STATUS EFIAPI Ring3CreateEvent ( - IN UINT32 Type, - IN EFI_TPL NotifyTpl, - IN EFI_EVENT_NOTIFY NotifyFunction OPTIONAL, - IN VOID *NotifyContext OPTIONAL, - OUT EFI_EVENT *Event + IN UINT32 Type, + IN EFI_TPL NotifyTpl, + IN EFI_EVENT_NOTIFY NotifyFunction OPTIONAL, + IN VOID *NotifyContext OPTIONAL, + OUT EFI_EVENT *Event ); /** @@ -200,9 +200,9 @@ Ring3SetTimer ( EFI_STATUS EFIAPI Ring3WaitForEvent ( - IN UINTN NumberOfEvents, - IN EFI_EVENT *UserEvents, - OUT UINTN *UserIndex + IN UINTN NumberOfEvents, + IN EFI_EVENT *UserEvents, + OUT UINTN *UserIndex ); /** @@ -268,10 +268,10 @@ Ring3CheckEvent ( EFI_STATUS EFIAPI Ring3InstallProtocolInterface ( - IN OUT EFI_HANDLE *UserHandle, - IN EFI_GUID *Protocol, - IN EFI_INTERFACE_TYPE InterfaceType, - IN VOID *Interface + IN OUT EFI_HANDLE *UserHandle, + IN EFI_GUID *Protocol, + IN EFI_INTERFACE_TYPE InterfaceType, + IN VOID *Interface ); /** @@ -332,9 +332,9 @@ Ring3UninstallProtocolInterface ( EFI_STATUS EFIAPI Ring3HandleProtocol ( - IN EFI_HANDLE UserHandle, - IN EFI_GUID *Protocol, - OUT VOID **Interface + IN EFI_HANDLE UserHandle, + IN EFI_GUID *Protocol, + OUT VOID **Interface ); /** @@ -353,9 +353,9 @@ Ring3HandleProtocol ( EFI_STATUS EFIAPI Ring3RegisterProtocolNotify ( - IN EFI_GUID *Protocol, - IN EFI_EVENT Event, - OUT VOID **Registration + IN EFI_GUID *Protocol, + IN EFI_EVENT Event, + OUT VOID **Registration ); /** @@ -379,11 +379,11 @@ Ring3RegisterProtocolNotify ( EFI_STATUS EFIAPI Ring3LocateHandle ( - IN EFI_LOCATE_SEARCH_TYPE SearchType, - IN EFI_GUID *Protocol OPTIONAL, - IN VOID *SearchKey OPTIONAL, - IN OUT UINTN *BufferSize, - OUT EFI_HANDLE *Buffer + IN EFI_LOCATE_SEARCH_TYPE SearchType, + IN EFI_GUID *Protocol OPTIONAL, + IN VOID *SearchKey OPTIONAL, + IN OUT UINTN *BufferSize, + OUT EFI_HANDLE *Buffer ); /** @@ -404,9 +404,9 @@ Ring3LocateHandle ( EFI_STATUS EFIAPI Ring3LocateDevicePath ( - IN EFI_GUID *Protocol, + IN EFI_GUID *Protocol, IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath, - OUT EFI_HANDLE *Device + OUT EFI_HANDLE *Device ); /** @@ -468,12 +468,12 @@ Ring3InstallConfigurationTable ( EFI_STATUS EFIAPI Ring3LoadImage ( - IN BOOLEAN BootPolicy, - IN EFI_HANDLE ParentImageHandle, - IN EFI_DEVICE_PATH_PROTOCOL *FilePath, - IN VOID *SourceBuffer OPTIONAL, - IN UINTN SourceSize, - OUT EFI_HANDLE *ImageHandle + IN BOOLEAN BootPolicy, + IN EFI_HANDLE ParentImageHandle, + IN EFI_DEVICE_PATH_PROTOCOL *FilePath, + IN VOID *SourceBuffer OPTIONAL, + IN UINTN SourceSize, + OUT EFI_HANDLE *ImageHandle ); /** @@ -498,9 +498,9 @@ Ring3LoadImage ( EFI_STATUS EFIAPI Ring3StartImage ( - IN EFI_HANDLE ImageHandle, - OUT UINTN *ExitDataSize, - OUT CHAR16 **ExitData OPTIONAL + IN EFI_HANDLE ImageHandle, + OUT UINTN *ExitDataSize, + OUT CHAR16 **ExitData OPTIONAL ); /** @@ -662,10 +662,10 @@ Ring3SetWatchdogTimer ( EFI_STATUS EFIAPI Ring3ConnectController ( - IN EFI_HANDLE ControllerHandle, - IN EFI_HANDLE *DriverImageHandle OPTIONAL, - IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL, - IN BOOLEAN Recursive + IN EFI_HANDLE ControllerHandle, + IN EFI_HANDLE *DriverImageHandle OPTIONAL, + IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL, + IN BOOLEAN Recursive ); /** @@ -703,9 +703,9 @@ Ring3ConnectController ( EFI_STATUS EFIAPI Ring3DisconnectController ( - IN EFI_HANDLE ControllerHandle, - IN EFI_HANDLE DriverImageHandle OPTIONAL, - IN EFI_HANDLE ChildHandle OPTIONAL + IN EFI_HANDLE ControllerHandle, + IN EFI_HANDLE DriverImageHandle OPTIONAL, + IN EFI_HANDLE ChildHandle OPTIONAL ); /** @@ -767,10 +767,10 @@ Ring3OpenProtocol ( EFI_STATUS EFIAPI Ring3CloseProtocol ( - IN EFI_HANDLE UserHandle, - IN EFI_GUID *Protocol, - IN EFI_HANDLE AgentHandle, - IN EFI_HANDLE ControllerHandle + IN EFI_HANDLE UserHandle, + IN EFI_GUID *Protocol, + IN EFI_HANDLE AgentHandle, + IN EFI_HANDLE ControllerHandle ); /** @@ -819,9 +819,9 @@ Ring3OpenProtocolInformation ( EFI_STATUS EFIAPI Ring3ProtocolsPerHandle ( - IN EFI_HANDLE UserHandle, - OUT EFI_GUID ***ProtocolBuffer, - OUT UINTN *ProtocolBufferCount + IN EFI_HANDLE UserHandle, + OUT EFI_GUID ***ProtocolBuffer, + OUT UINTN *ProtocolBufferCount ); /** @@ -849,11 +849,11 @@ Ring3ProtocolsPerHandle ( EFI_STATUS EFIAPI Ring3LocateHandleBuffer ( - IN EFI_LOCATE_SEARCH_TYPE SearchType, - IN EFI_GUID *Protocol OPTIONAL, - IN VOID *SearchKey OPTIONAL, - IN OUT UINTN *NumberHandles, - OUT EFI_HANDLE **Buffer + IN EFI_LOCATE_SEARCH_TYPE SearchType, + IN EFI_GUID *Protocol OPTIONAL, + IN VOID *SearchKey OPTIONAL, + IN OUT UINTN *NumberHandles, + OUT EFI_HANDLE **Buffer ); /** @@ -947,9 +947,9 @@ Ring3UninstallMultipleProtocolInterfaces ( EFI_STATUS EFIAPI Ring3CalculateCrc32 ( - IN VOID *Data, - IN UINTN DataSize, - OUT UINT32 *Crc32 + IN VOID *Data, + IN UINTN DataSize, + OUT UINT32 *Crc32 ); /** @@ -975,12 +975,12 @@ Ring3CalculateCrc32 ( EFI_STATUS EFIAPI Ring3CreateEventEx ( - IN UINT32 Type, - IN EFI_TPL NotifyTpl, - IN EFI_EVENT_NOTIFY NotifyFunction OPTIONAL, - IN CONST VOID *NotifyContext OPTIONAL, - IN CONST EFI_GUID *EventGroup OPTIONAL, - OUT EFI_EVENT *Event + IN UINT32 Type, + IN EFI_TPL NotifyTpl, + IN EFI_EVENT_NOTIFY NotifyFunction OPTIONAL, + IN CONST VOID *NotifyContext OPTIONAL, + IN CONST EFI_GUID *EventGroup OPTIONAL, + OUT EFI_EVENT *Event ); /** @@ -1023,11 +1023,11 @@ Ring3BlockIoReset ( EFI_STATUS EFIAPI Ring3BlockIoRead ( - IN EFI_BLOCK_IO_PROTOCOL *This, - IN UINT32 MediaId, - IN EFI_LBA Lba, - IN UINTN BufferSize, - OUT VOID *Buffer + IN EFI_BLOCK_IO_PROTOCOL *This, + IN UINT32 MediaId, + IN EFI_LBA Lba, + IN UINTN BufferSize, + OUT VOID *Buffer ); /** @@ -1096,11 +1096,11 @@ Ring3BlockIoFlush ( EFI_STATUS EFIAPI Ring3DiskIoRead ( - IN EFI_DISK_IO_PROTOCOL *This, - IN UINT32 MediaId, - IN UINT64 Offset, - IN UINTN BufferSize, - OUT VOID *Buffer + IN EFI_DISK_IO_PROTOCOL *This, + IN UINT32 MediaId, + IN UINT64 Offset, + IN UINTN BufferSize, + OUT VOID *Buffer ); /** @@ -1147,8 +1147,8 @@ Ring3DiskIoWrite ( EFI_STATUS EFIAPI Ring3GetTime ( - OUT EFI_TIME *Time, - OUT EFI_TIME_CAPABILITIES *Capabilities OPTIONAL + OUT EFI_TIME *Time, + OUT EFI_TIME_CAPABILITIES *Capabilities OPTIONAL ); /** @@ -1164,7 +1164,7 @@ Ring3GetTime ( EFI_STATUS EFIAPI Ring3SetTime ( - IN EFI_TIME *Time + IN EFI_TIME *Time ); /** @@ -1185,9 +1185,9 @@ Ring3SetTime ( EFI_STATUS EFIAPI Ring3GetWakeupTime ( - OUT BOOLEAN *Enabled, - OUT BOOLEAN *Pending, - OUT EFI_TIME *Time + OUT BOOLEAN *Enabled, + OUT BOOLEAN *Pending, + OUT EFI_TIME *Time ); /** @@ -1207,8 +1207,8 @@ Ring3GetWakeupTime ( EFI_STATUS EFIAPI Ring3SetWakeupTime ( - IN BOOLEAN Enable, - IN EFI_TIME *Time OPTIONAL + IN BOOLEAN Enable, + IN EFI_TIME *Time OPTIONAL ); /** @@ -1233,10 +1233,10 @@ Ring3SetWakeupTime ( EFI_STATUS EFIAPI Ring3SetVirtualAddressMap ( - IN UINTN MemoryMapSize, - IN UINTN DescriptorSize, - IN UINT32 DescriptorVersion, - IN EFI_MEMORY_DESCRIPTOR *VirtualMap + IN UINTN MemoryMapSize, + IN UINTN DescriptorSize, + IN UINT32 DescriptorVersion, + IN EFI_MEMORY_DESCRIPTOR *VirtualMap ); /** @@ -1257,8 +1257,8 @@ Ring3SetVirtualAddressMap ( EFI_STATUS EFIAPI Ring3ConvertPointer ( - IN UINTN DebugDisposition, - IN OUT VOID **Address + IN UINTN DebugDisposition, + IN OUT VOID **Address ); /** @@ -1288,11 +1288,11 @@ Ring3ConvertPointer ( EFI_STATUS EFIAPI Ring3GetVariable ( - IN CHAR16 *VariableName, - IN EFI_GUID *VendorGuid, - OUT UINT32 *Attributes OPTIONAL, - IN OUT UINTN *DataSize, - OUT VOID *Data OPTIONAL + IN CHAR16 *VariableName, + IN EFI_GUID *VendorGuid, + OUT UINT32 *Attributes OPTIONAL, + IN OUT UINTN *DataSize, + OUT VOID *Data OPTIONAL ); /** @@ -1324,9 +1324,9 @@ Ring3GetVariable ( EFI_STATUS EFIAPI Ring3GetNextVariableName ( - IN OUT UINTN *VariableNameSize, - IN OUT CHAR16 *VariableName, - IN OUT EFI_GUID *VendorGuid + IN OUT UINTN *VariableNameSize, + IN OUT CHAR16 *VariableName, + IN OUT EFI_GUID *VendorGuid ); /** @@ -1366,11 +1366,11 @@ Ring3GetNextVariableName ( EFI_STATUS EFIAPI Ring3SetVariable ( - IN CHAR16 *VariableName, - IN EFI_GUID *VendorGuid, - IN UINT32 Attributes, - IN UINTN DataSize, - IN VOID *Data + IN CHAR16 *VariableName, + IN EFI_GUID *VendorGuid, + IN UINT32 Attributes, + IN UINTN DataSize, + IN VOID *Data ); /** @@ -1386,7 +1386,7 @@ Ring3SetVariable ( EFI_STATUS EFIAPI Ring3GetNextHighMonotonicCount ( - OUT UINT32 *HighCount + OUT UINT32 *HighCount ); /** @@ -1407,10 +1407,10 @@ Ring3GetNextHighMonotonicCount ( VOID EFIAPI Ring3ResetSystem ( - IN EFI_RESET_TYPE ResetType, - IN EFI_STATUS ResetStatus, - IN UINTN DataSize, - IN VOID *ResetData OPTIONAL + IN EFI_RESET_TYPE ResetType, + IN EFI_STATUS ResetStatus, + IN UINTN DataSize, + IN VOID *ResetData OPTIONAL ); /** @@ -1446,9 +1446,9 @@ Ring3ResetSystem ( EFI_STATUS EFIAPI Ring3UpdateCapsule ( - IN EFI_CAPSULE_HEADER **CapsuleHeaderArray, - IN UINTN CapsuleCount, - IN EFI_PHYSICAL_ADDRESS ScatterGatherList OPTIONAL + IN EFI_CAPSULE_HEADER **CapsuleHeaderArray, + IN UINTN CapsuleCount, + IN EFI_PHYSICAL_ADDRESS ScatterGatherList OPTIONAL ); /** @@ -1477,10 +1477,10 @@ Ring3UpdateCapsule ( EFI_STATUS EFIAPI Ring3QueryCapsuleCapabilities ( - IN EFI_CAPSULE_HEADER **CapsuleHeaderArray, - IN UINTN CapsuleCount, - OUT UINT64 *MaximumCapsuleSize, - OUT EFI_RESET_TYPE *ResetType + IN EFI_CAPSULE_HEADER **CapsuleHeaderArray, + IN UINTN CapsuleCount, + OUT UINT64 *MaximumCapsuleSize, + OUT EFI_RESET_TYPE *ResetType ); /** @@ -1508,10 +1508,10 @@ Ring3QueryCapsuleCapabilities ( EFI_STATUS EFIAPI Ring3QueryVariableInfo ( - IN UINT32 Attributes, - OUT UINT64 *MaximumVariableStorageSize, - OUT UINT64 *RemainingVariableStorageSize, - OUT UINT64 *MaximumVariableSize + IN UINT32 Attributes, + OUT UINT64 *MaximumVariableStorageSize, + OUT UINT64 *RemainingVariableStorageSize, + OUT UINT64 *MaximumVariableSize ); /** @@ -1529,9 +1529,9 @@ Ring3QueryVariableInfo ( INTN EFIAPI Ring3UnicodeStriColl ( - IN EFI_UNICODE_COLLATION_PROTOCOL *This, - IN CHAR16 *Str1, - IN CHAR16 *Str2 + IN EFI_UNICODE_COLLATION_PROTOCOL *This, + IN CHAR16 *Str1, + IN CHAR16 *Str2 ); /** @@ -1549,9 +1549,9 @@ Ring3UnicodeStriColl ( BOOLEAN EFIAPI Ring3UnicodeMetaiMatch ( - IN EFI_UNICODE_COLLATION_PROTOCOL *This, - IN CHAR16 *String, - IN CHAR16 *Pattern + IN EFI_UNICODE_COLLATION_PROTOCOL *This, + IN CHAR16 *String, + IN CHAR16 *Pattern ); /** @@ -1565,8 +1565,8 @@ Ring3UnicodeMetaiMatch ( VOID EFIAPI Ring3UnicodeStrLwr ( - IN EFI_UNICODE_COLLATION_PROTOCOL *This, - IN OUT CHAR16 *Str + IN EFI_UNICODE_COLLATION_PROTOCOL *This, + IN OUT CHAR16 *Str ); /** @@ -1580,8 +1580,8 @@ Ring3UnicodeStrLwr ( VOID EFIAPI Ring3UnicodeStrUpr ( - IN EFI_UNICODE_COLLATION_PROTOCOL *This, - IN OUT CHAR16 *Str + IN EFI_UNICODE_COLLATION_PROTOCOL *This, + IN OUT CHAR16 *Str ); /** @@ -1599,10 +1599,10 @@ Ring3UnicodeStrUpr ( VOID EFIAPI Ring3UnicodeFatToStr ( - IN EFI_UNICODE_COLLATION_PROTOCOL *This, - IN UINTN FatSize, - IN CHAR8 *Fat, - OUT CHAR16 *String + IN EFI_UNICODE_COLLATION_PROTOCOL *This, + IN UINTN FatSize, + IN CHAR8 *Fat, + OUT CHAR16 *String ); /** @@ -1622,8 +1622,8 @@ Ring3UnicodeFatToStr ( BOOLEAN EFIAPI Ring3UnicodeStrToFat ( - IN EFI_UNICODE_COLLATION_PROTOCOL *This, - IN CHAR16 *String, - IN UINTN FatSize, - OUT CHAR8 *Fat + IN EFI_UNICODE_COLLATION_PROTOCOL *This, + IN CHAR16 *String, + IN UINTN FatSize, + OUT CHAR8 *Fat ); diff --git a/MdeModulePkg/Core/Dxe/DxeRing3/Ring3Protocols.c b/MdeModulePkg/Core/Dxe/DxeRing3/Ring3Protocols.c index 7b7efeb12f..4c4c058df3 100644 --- a/MdeModulePkg/Core/Dxe/DxeRing3/Ring3Protocols.c +++ b/MdeModulePkg/Core/Dxe/DxeRing3/Ring3Protocols.c @@ -25,11 +25,11 @@ Ring3BlockIoReset ( EFI_STATUS EFIAPI Ring3BlockIoRead ( - IN EFI_BLOCK_IO_PROTOCOL *This, - IN UINT32 MediaId, - IN EFI_LBA Lba, - IN UINTN BufferSize, - OUT VOID *Buffer + IN EFI_BLOCK_IO_PROTOCOL *This, + IN UINT32 MediaId, + IN EFI_LBA Lba, + IN UINTN BufferSize, + OUT VOID *Buffer ) { return SysCall ( @@ -80,11 +80,11 @@ Ring3BlockIoFlush ( EFI_STATUS EFIAPI Ring3DiskIoRead ( - IN EFI_DISK_IO_PROTOCOL *This, - IN UINT32 MediaId, - IN UINT64 Offset, - IN UINTN BufferSize, - OUT VOID *Buffer + IN EFI_DISK_IO_PROTOCOL *This, + IN UINT32 MediaId, + IN UINT64 Offset, + IN UINTN BufferSize, + OUT VOID *Buffer ) { return SysCall ( @@ -156,8 +156,8 @@ Ring3UnicodeMetaiMatch ( VOID EFIAPI Ring3UnicodeStrLwr ( - IN EFI_UNICODE_COLLATION_PROTOCOL *This, - IN OUT CHAR16 *Str + IN EFI_UNICODE_COLLATION_PROTOCOL *This, + IN OUT CHAR16 *Str ) { SysCall ( @@ -171,8 +171,8 @@ Ring3UnicodeStrLwr ( VOID EFIAPI Ring3UnicodeStrUpr ( - IN EFI_UNICODE_COLLATION_PROTOCOL *This, - IN OUT CHAR16 *Str + IN EFI_UNICODE_COLLATION_PROTOCOL *This, + IN OUT CHAR16 *Str ) { SysCall ( @@ -186,10 +186,10 @@ Ring3UnicodeStrUpr ( VOID EFIAPI Ring3UnicodeFatToStr ( - IN EFI_UNICODE_COLLATION_PROTOCOL *This, - IN UINTN FatSize, - IN CHAR8 *Fat, - OUT CHAR16 *String + IN EFI_UNICODE_COLLATION_PROTOCOL *This, + IN UINTN FatSize, + IN CHAR8 *Fat, + OUT CHAR16 *String ) { SysCall ( @@ -205,10 +205,10 @@ Ring3UnicodeFatToStr ( BOOLEAN EFIAPI Ring3UnicodeStrToFat ( - IN EFI_UNICODE_COLLATION_PROTOCOL *This, - IN CHAR16 *String, - IN UINTN FatSize, - OUT CHAR8 *Fat + IN EFI_UNICODE_COLLATION_PROTOCOL *This, + IN CHAR16 *String, + IN UINTN FatSize, + OUT CHAR8 *Fat ) { return (BOOLEAN)SysCall ( diff --git a/MdeModulePkg/Core/Dxe/DxeRing3/Ring3UefiBootServices.c b/MdeModulePkg/Core/Dxe/DxeRing3/Ring3UefiBootServices.c index 04ccc7b669..bae3b0036b 100644 --- a/MdeModulePkg/Core/Dxe/DxeRing3/Ring3UefiBootServices.c +++ b/MdeModulePkg/Core/Dxe/DxeRing3/Ring3UefiBootServices.c @@ -119,9 +119,9 @@ Ring3RestoreTpl ( EFI_STATUS EFIAPI Ring3AllocatePages ( - IN EFI_ALLOCATE_TYPE Type, - IN EFI_MEMORY_TYPE MemoryType, - IN UINTN NumberOfPages, + IN EFI_ALLOCATE_TYPE Type, + IN EFI_MEMORY_TYPE MemoryType, + IN UINTN NumberOfPages, IN OUT EFI_PHYSICAL_ADDRESS *Memory ) { @@ -169,9 +169,9 @@ EFIAPI Ring3GetMemoryMap ( IN OUT UINTN *MemoryMapSize, IN OUT EFI_MEMORY_DESCRIPTOR *MemoryMap, - OUT UINTN *MapKey, - OUT UINTN *DescriptorSize, - OUT UINT32 *DescriptorVersion + OUT UINTN *MapKey, + OUT UINTN *DescriptorSize, + OUT UINT32 *DescriptorVersion ) { DEBUG ((DEBUG_ERROR, "Ring3: GetMemoryMap is not supported\n")); @@ -182,11 +182,11 @@ Ring3GetMemoryMap ( EFI_STATUS EFIAPI Ring3CreateEvent ( - IN UINT32 Type, - IN EFI_TPL NotifyTpl, - IN EFI_EVENT_NOTIFY NotifyFunction OPTIONAL, - IN VOID *NotifyContext OPTIONAL, - OUT EFI_EVENT *Event + IN UINT32 Type, + IN EFI_TPL NotifyTpl, + IN EFI_EVENT_NOTIFY NotifyFunction OPTIONAL, + IN VOID *NotifyContext OPTIONAL, + OUT EFI_EVENT *Event ) { DEBUG ((DEBUG_ERROR, "Ring3: CreateEvent is not supported\n")); @@ -210,9 +210,9 @@ Ring3SetTimer ( EFI_STATUS EFIAPI Ring3WaitForEvent ( - IN UINTN NumberOfEvents, - IN EFI_EVENT *UserEvents, - OUT UINTN *UserIndex + IN UINTN NumberOfEvents, + IN EFI_EVENT *UserEvents, + OUT UINTN *UserIndex ) { DEBUG ((DEBUG_ERROR, "Ring3: WaitForEvent is not supported\n")); @@ -256,10 +256,10 @@ Ring3CheckEvent ( EFI_STATUS EFIAPI Ring3InstallProtocolInterface ( - IN OUT EFI_HANDLE *UserHandle, - IN EFI_GUID *Protocol, - IN EFI_INTERFACE_TYPE InterfaceType, - IN VOID *Interface + IN OUT EFI_HANDLE *UserHandle, + IN EFI_GUID *Protocol, + IN EFI_INTERFACE_TYPE InterfaceType, + IN VOID *Interface ) { DEBUG ((DEBUG_ERROR, "Ring3: InstallProtocolInterface is not supported\n")); @@ -297,9 +297,9 @@ Ring3UninstallProtocolInterface ( EFI_STATUS EFIAPI Ring3HandleProtocol ( - IN EFI_HANDLE CoreUserHandle, - IN EFI_GUID *Protocol, - OUT VOID **Interface + IN EFI_HANDLE CoreUserHandle, + IN EFI_GUID *Protocol, + OUT VOID **Interface ) { EFI_STATUS Status; @@ -322,9 +322,9 @@ Ring3HandleProtocol ( EFI_STATUS EFIAPI Ring3RegisterProtocolNotify ( - IN EFI_GUID *Protocol, - IN EFI_EVENT Event, - OUT VOID **Registration + IN EFI_GUID *Protocol, + IN EFI_EVENT Event, + OUT VOID **Registration ) { DEBUG ((DEBUG_ERROR, "Ring3: RegisterProtocolNotify is not supported\n")); @@ -335,11 +335,11 @@ Ring3RegisterProtocolNotify ( EFI_STATUS EFIAPI Ring3LocateHandle ( - IN EFI_LOCATE_SEARCH_TYPE SearchType, - IN EFI_GUID *Protocol OPTIONAL, - IN VOID *SearchKey OPTIONAL, - IN OUT UINTN *BufferSize, - OUT EFI_HANDLE *Buffer + IN EFI_LOCATE_SEARCH_TYPE SearchType, + IN EFI_GUID *Protocol OPTIONAL, + IN VOID *SearchKey OPTIONAL, + IN OUT UINTN *BufferSize, + OUT EFI_HANDLE *Buffer ) { DEBUG ((DEBUG_ERROR, "Ring3: LocateHandle is not supported\n")); @@ -350,9 +350,9 @@ Ring3LocateHandle ( EFI_STATUS EFIAPI Ring3LocateDevicePath ( - IN EFI_GUID *Protocol, + IN EFI_GUID *Protocol, IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath, - OUT EFI_HANDLE *Device + OUT EFI_HANDLE *Device ) { DEBUG ((DEBUG_ERROR, "Ring3: LocateDevicePath is not supported\n")); @@ -375,12 +375,12 @@ Ring3InstallConfigurationTable ( EFI_STATUS EFIAPI Ring3LoadImage ( - IN BOOLEAN BootPolicy, - IN EFI_HANDLE ParentImageHandle, - IN EFI_DEVICE_PATH_PROTOCOL *FilePath, - IN VOID *SourceBuffer OPTIONAL, - IN UINTN SourceSize, - OUT EFI_HANDLE *ImageHandle + IN BOOLEAN BootPolicy, + IN EFI_HANDLE ParentImageHandle, + IN EFI_DEVICE_PATH_PROTOCOL *FilePath, + IN VOID *SourceBuffer OPTIONAL, + IN UINTN SourceSize, + OUT EFI_HANDLE *ImageHandle ) { DEBUG ((DEBUG_ERROR, "Ring3: LoadImage is not supported\n")); @@ -391,9 +391,9 @@ Ring3LoadImage ( EFI_STATUS EFIAPI Ring3StartImage ( - IN EFI_HANDLE ImageHandle, - OUT UINTN *ExitDataSize, - OUT CHAR16 **ExitData OPTIONAL + IN EFI_HANDLE ImageHandle, + OUT UINTN *ExitDataSize, + OUT CHAR16 **ExitData OPTIONAL ) { DEBUG ((DEBUG_ERROR, "Ring3: StartImage is not supported\n")); @@ -477,10 +477,10 @@ Ring3SetWatchdogTimer ( EFI_STATUS EFIAPI Ring3ConnectController ( - IN EFI_HANDLE ControllerHandle, - IN EFI_HANDLE *DriverImageHandle OPTIONAL, - IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL, - IN BOOLEAN Recursive + IN EFI_HANDLE ControllerHandle, + IN EFI_HANDLE *DriverImageHandle OPTIONAL, + IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL, + IN BOOLEAN Recursive ) { DEBUG ((DEBUG_ERROR, "Ring3: ConnectController is not supported\n")); @@ -491,9 +491,9 @@ Ring3ConnectController ( EFI_STATUS EFIAPI Ring3DisconnectController ( - IN EFI_HANDLE ControllerHandle, - IN EFI_HANDLE DriverImageHandle OPTIONAL, - IN EFI_HANDLE ChildHandle OPTIONAL + IN EFI_HANDLE ControllerHandle, + IN EFI_HANDLE DriverImageHandle OPTIONAL, + IN EFI_HANDLE ChildHandle OPTIONAL ) { DEBUG ((DEBUG_ERROR, "Ring3: DisconnectController is not supported\n")); @@ -534,10 +534,10 @@ Ring3OpenProtocol ( EFI_STATUS EFIAPI Ring3CloseProtocol ( - IN EFI_HANDLE UserHandle, - IN EFI_GUID *Protocol, - IN EFI_HANDLE AgentHandle, - IN EFI_HANDLE ControllerHandle + IN EFI_HANDLE UserHandle, + IN EFI_GUID *Protocol, + IN EFI_HANDLE AgentHandle, + IN EFI_HANDLE ControllerHandle ) { return SysCall ( @@ -567,9 +567,9 @@ Ring3OpenProtocolInformation ( EFI_STATUS EFIAPI Ring3ProtocolsPerHandle ( - IN EFI_HANDLE UserHandle, - OUT EFI_GUID ***ProtocolBuffer, - OUT UINTN *ProtocolBufferCount + IN EFI_HANDLE UserHandle, + OUT EFI_GUID ***ProtocolBuffer, + OUT UINTN *ProtocolBufferCount ) { DEBUG ((DEBUG_ERROR, "Ring3: ProtocolsPerHandle is not supported\n")); @@ -580,11 +580,11 @@ Ring3ProtocolsPerHandle ( EFI_STATUS EFIAPI Ring3LocateHandleBuffer ( - IN EFI_LOCATE_SEARCH_TYPE SearchType, - IN EFI_GUID *Protocol OPTIONAL, - IN VOID *SearchKey OPTIONAL, - IN OUT UINTN *NumberHandles, - OUT EFI_HANDLE **Buffer + IN EFI_LOCATE_SEARCH_TYPE SearchType, + IN EFI_GUID *Protocol OPTIONAL, + IN VOID *SearchKey OPTIONAL, + IN OUT UINTN *NumberHandles, + OUT EFI_HANDLE **Buffer ) { EFI_STATUS Status; @@ -703,9 +703,9 @@ Ring3UninstallMultipleProtocolInterfaces ( EFI_STATUS EFIAPI Ring3CalculateCrc32 ( - IN VOID *Data, - IN UINTN DataSize, - OUT UINT32 *Crc32 + IN VOID *Data, + IN UINTN DataSize, + OUT UINT32 *Crc32 ) { return SysCall ( @@ -720,12 +720,12 @@ Ring3CalculateCrc32 ( EFI_STATUS EFIAPI Ring3CreateEventEx ( - IN UINT32 Type, - IN EFI_TPL NotifyTpl, - IN EFI_EVENT_NOTIFY NotifyFunction OPTIONAL, - IN CONST VOID *NotifyContext OPTIONAL, - IN CONST EFI_GUID *EventGroup OPTIONAL, - OUT EFI_EVENT *Event + IN UINT32 Type, + IN EFI_TPL NotifyTpl, + IN EFI_EVENT_NOTIFY NotifyFunction OPTIONAL, + IN CONST VOID *NotifyContext OPTIONAL, + IN CONST EFI_GUID *EventGroup OPTIONAL, + OUT EFI_EVENT *Event ) { DEBUG ((DEBUG_ERROR, "Ring3: CreateEventEx is not supported\n")); diff --git a/MdeModulePkg/Core/Dxe/DxeRing3/Ring3UefiRuntimeServices.c b/MdeModulePkg/Core/Dxe/DxeRing3/Ring3UefiRuntimeServices.c index ed888b9b37..e3e787a536 100644 --- a/MdeModulePkg/Core/Dxe/DxeRing3/Ring3UefiRuntimeServices.c +++ b/MdeModulePkg/Core/Dxe/DxeRing3/Ring3UefiRuntimeServices.c @@ -8,8 +8,8 @@ EFI_STATUS EFIAPI Ring3GetTime ( - OUT EFI_TIME *Time, - OUT EFI_TIME_CAPABILITIES *Capabilities OPTIONAL + OUT EFI_TIME *Time, + OUT EFI_TIME_CAPABILITIES *Capabilities OPTIONAL ) { DEBUG ((DEBUG_ERROR, "Ring3: GetTime is not supported\n")); @@ -20,7 +20,7 @@ Ring3GetTime ( EFI_STATUS EFIAPI Ring3SetTime ( - IN EFI_TIME *Time + IN EFI_TIME *Time ) { DEBUG ((DEBUG_ERROR, "Ring3: SetTime is not supported\n")); @@ -31,9 +31,9 @@ Ring3SetTime ( EFI_STATUS EFIAPI Ring3GetWakeupTime ( - OUT BOOLEAN *Enabled, - OUT BOOLEAN *Pending, - OUT EFI_TIME *Time + OUT BOOLEAN *Enabled, + OUT BOOLEAN *Pending, + OUT EFI_TIME *Time ) { DEBUG ((DEBUG_ERROR, "Ring3: GetWakeupTime is not supported\n")); @@ -44,8 +44,8 @@ Ring3GetWakeupTime ( EFI_STATUS EFIAPI Ring3SetWakeupTime ( - IN BOOLEAN Enable, - IN EFI_TIME *Time OPTIONAL + IN BOOLEAN Enable, + IN EFI_TIME *Time OPTIONAL ) { DEBUG ((DEBUG_ERROR, "Ring3: SetWakeupTime is not supported\n")); @@ -56,10 +56,10 @@ Ring3SetWakeupTime ( EFI_STATUS EFIAPI Ring3SetVirtualAddressMap ( - IN UINTN MemoryMapSize, - IN UINTN DescriptorSize, - IN UINT32 DescriptorVersion, - IN EFI_MEMORY_DESCRIPTOR *VirtualMap + IN UINTN MemoryMapSize, + IN UINTN DescriptorSize, + IN UINT32 DescriptorVersion, + IN EFI_MEMORY_DESCRIPTOR *VirtualMap ) { DEBUG ((DEBUG_ERROR, "Ring3: SetVirtualAddressMap is not supported\n")); @@ -70,8 +70,8 @@ Ring3SetVirtualAddressMap ( EFI_STATUS EFIAPI Ring3ConvertPointer ( - IN UINTN DebugDisposition, - IN OUT VOID **Address + IN UINTN DebugDisposition, + IN OUT VOID **Address ) { DEBUG ((DEBUG_ERROR, "Ring3: ConvertPointer is not supported\n")); @@ -82,11 +82,11 @@ Ring3ConvertPointer ( EFI_STATUS EFIAPI Ring3GetVariable ( - IN CHAR16 *VariableName, - IN EFI_GUID *VendorGuid, - OUT UINT32 *Attributes OPTIONAL, - IN OUT UINTN *DataSize, - OUT VOID *Data OPTIONAL + IN CHAR16 *VariableName, + IN EFI_GUID *VendorGuid, + OUT UINT32 *Attributes OPTIONAL, + IN OUT UINTN *DataSize, + OUT VOID *Data OPTIONAL ) { return SysCall ( @@ -103,9 +103,9 @@ Ring3GetVariable ( EFI_STATUS EFIAPI Ring3GetNextVariableName ( - IN OUT UINTN *VariableNameSize, - IN OUT CHAR16 *VariableName, - IN OUT EFI_GUID *VendorGuid + IN OUT UINTN *VariableNameSize, + IN OUT CHAR16 *VariableName, + IN OUT EFI_GUID *VendorGuid ) { DEBUG ((DEBUG_ERROR, "Ring3: GetNextVariableName is not supported\n")); @@ -116,11 +116,11 @@ Ring3GetNextVariableName ( EFI_STATUS EFIAPI Ring3SetVariable ( - IN CHAR16 *VariableName, - IN EFI_GUID *VendorGuid, - IN UINT32 Attributes, - IN UINTN DataSize, - IN VOID *Data + IN CHAR16 *VariableName, + IN EFI_GUID *VendorGuid, + IN UINT32 Attributes, + IN UINTN DataSize, + IN VOID *Data ) { DEBUG ((DEBUG_ERROR, "Ring3: SetVariable is not supported\n")); @@ -131,7 +131,7 @@ Ring3SetVariable ( EFI_STATUS EFIAPI Ring3GetNextHighMonotonicCount ( - OUT UINT32 *HighCount + OUT UINT32 *HighCount ) { DEBUG ((DEBUG_ERROR, "Ring3: GetNextHighMonotonicCount is not supported\n")); @@ -142,10 +142,10 @@ Ring3GetNextHighMonotonicCount ( VOID EFIAPI Ring3ResetSystem ( - IN EFI_RESET_TYPE ResetType, - IN EFI_STATUS ResetStatus, - IN UINTN DataSize, - IN VOID *ResetData OPTIONAL + IN EFI_RESET_TYPE ResetType, + IN EFI_STATUS ResetStatus, + IN UINTN DataSize, + IN VOID *ResetData OPTIONAL ) { DEBUG ((DEBUG_ERROR, "Ring3: ResetSystem is not supported\n")); @@ -156,9 +156,9 @@ Ring3ResetSystem ( EFI_STATUS EFIAPI Ring3UpdateCapsule ( - IN EFI_CAPSULE_HEADER **CapsuleHeaderArray, - IN UINTN CapsuleCount, - IN EFI_PHYSICAL_ADDRESS ScatterGatherList OPTIONAL + IN EFI_CAPSULE_HEADER **CapsuleHeaderArray, + IN UINTN CapsuleCount, + IN EFI_PHYSICAL_ADDRESS ScatterGatherList OPTIONAL ) { DEBUG ((DEBUG_ERROR, "Ring3: UpdateCapsule is not supported\n")); @@ -169,10 +169,10 @@ Ring3UpdateCapsule ( EFI_STATUS EFIAPI Ring3QueryCapsuleCapabilities ( - IN EFI_CAPSULE_HEADER **CapsuleHeaderArray, - IN UINTN CapsuleCount, - OUT UINT64 *MaximumCapsuleSize, - OUT EFI_RESET_TYPE *ResetType + IN EFI_CAPSULE_HEADER **CapsuleHeaderArray, + IN UINTN CapsuleCount, + OUT UINT64 *MaximumCapsuleSize, + OUT EFI_RESET_TYPE *ResetType ) { DEBUG ((DEBUG_ERROR, "Ring3: QueryCapsuleCapabilities is not supported\n")); @@ -183,10 +183,10 @@ Ring3QueryCapsuleCapabilities ( EFI_STATUS EFIAPI Ring3QueryVariableInfo ( - IN UINT32 Attributes, - OUT UINT64 *MaximumVariableStorageSize, - OUT UINT64 *RemainingVariableStorageSize, - OUT UINT64 *MaximumVariableSize + IN UINT32 Attributes, + OUT UINT64 *MaximumVariableStorageSize, + OUT UINT64 *RemainingVariableStorageSize, + OUT UINT64 *MaximumVariableSize ) { DEBUG ((DEBUG_ERROR, "Ring3: QueryVariableInfo is not supported\n")); diff --git a/MdeModulePkg/Core/Dxe/DxeRing3/X64/SysCall.nasm b/MdeModulePkg/Core/Dxe/DxeRing3/X64/SysCall.nasm index 3c826d7d8f..b45253cd8f 100644 --- a/MdeModulePkg/Core/Dxe/DxeRing3/X64/SysCall.nasm +++ b/MdeModulePkg/Core/Dxe/DxeRing3/X64/SysCall.nasm @@ -44,7 +44,7 @@ makecall: ; VOID ; EFIAPI ; Ring3EntryPoint ( -; IN RING3_CALL_DATA *Data +; IN RING3_CALL_DATA *Data ; ); ; ; (rcx) RIP of Ring3EntryPoint saved for SYSRET in CallRing3(). diff --git a/MdeModulePkg/Core/Dxe/SysCall/AARCH64/CoreBootServices.S b/MdeModulePkg/Core/Dxe/SysCall/AARCH64/CoreBootServices.S index 0ce4ef3120..341871147c 100644 --- a/MdeModulePkg/Core/Dxe/SysCall/AARCH64/CoreBootServices.S +++ b/MdeModulePkg/Core/Dxe/SysCall/AARCH64/CoreBootServices.S @@ -60,7 +60,7 @@ ASM_FUNC_ALIGN(SysCallBase, 4096) // EFI_STATUS // EFIAPI // CallRing3 ( -// IN RING3_CALL_DATA *Data, +// IN RING3_CALL_DATA *Data, // IN UINTN UserStackTop // ); // @@ -115,8 +115,8 @@ ASM_FUNC_ALIGN(SysCallEnd, 4096) // VOID // EFIAPI // ReturnToCore ( -// IN EFI_STATUS Status, -// IN UINTN ReturnSP +// IN EFI_STATUS Status, +// IN UINTN ReturnSP // ); // // (x0) Status diff --git a/MdeModulePkg/Core/Dxe/SysCall/AARCH64/InitializeAARCH64.c b/MdeModulePkg/Core/Dxe/SysCall/AARCH64/InitializeAARCH64.c index f02ab5bbb3..832a44d73d 100644 --- a/MdeModulePkg/Core/Dxe/SysCall/AARCH64/InitializeAARCH64.c +++ b/MdeModulePkg/Core/Dxe/SysCall/AARCH64/InitializeAARCH64.c @@ -17,10 +17,10 @@ UINTN gUserPageTable; EFI_STATUS EFIAPI ArmCallRing3 ( - IN RING3_CALL_DATA *Data, - IN UINTN UserStackTop, - IN VOID *EntryPoint, - IN UINTN UserPageTable + IN RING3_CALL_DATA *Data, + IN UINTN UserStackTop, + IN VOID *EntryPoint, + IN UINTN UserPageTable ); STATIC @@ -94,8 +94,8 @@ MakeUserPageTableTemplate ( VOID EFIAPI InitializeMsr ( - IN OUT EFI_CONFIGURATION_TABLE *Table, - IN UINTN NumberOfEntries + IN OUT EFI_CONFIGURATION_TABLE *Table, + IN UINTN NumberOfEntries ) { UINTN Tcr; @@ -147,7 +147,7 @@ ForbidSupervisorAccessToUserMemory ( EFI_STATUS EFIAPI CallRing3 ( - IN RING3_CALL_DATA *Data, + IN RING3_CALL_DATA *Data, IN UINTN UserStackTop ) { diff --git a/MdeModulePkg/Core/Dxe/SysCall/ARM/CoreBootServices.S b/MdeModulePkg/Core/Dxe/SysCall/ARM/CoreBootServices.S index d7741277a0..63adc421b7 100644 --- a/MdeModulePkg/Core/Dxe/SysCall/ARM/CoreBootServices.S +++ b/MdeModulePkg/Core/Dxe/SysCall/ARM/CoreBootServices.S @@ -56,7 +56,7 @@ ASM_FUNC_ALIGN(SysCallBase, 4096) // EFI_STATUS // EFIAPI // CallRing3 ( -// IN RING3_CALL_DATA *Data, +// IN RING3_CALL_DATA *Data, // IN UINTN UserStackTop // ); // @@ -109,8 +109,8 @@ ASM_FUNC_ALIGN(SysCallEnd, 4096) // VOID // EFIAPI // ReturnToCore ( -// IN EFI_STATUS Status, -// IN UINTN ReturnSP +// IN EFI_STATUS Status, +// IN UINTN ReturnSP // ); // // (r0) Status diff --git a/MdeModulePkg/Core/Dxe/SysCall/ARM/InitializeARM.c b/MdeModulePkg/Core/Dxe/SysCall/ARM/InitializeARM.c index 55af5fe8cb..7cdd051817 100644 --- a/MdeModulePkg/Core/Dxe/SysCall/ARM/InitializeARM.c +++ b/MdeModulePkg/Core/Dxe/SysCall/ARM/InitializeARM.c @@ -16,10 +16,10 @@ UINTN gUserPageTable; EFI_STATUS EFIAPI ArmCallRing3 ( - IN RING3_CALL_DATA *Data, - IN UINTN UserStackTop, - IN VOID *EntryPoint, - IN UINTN UserPageTable + IN RING3_CALL_DATA *Data, + IN UINTN UserStackTop, + IN VOID *EntryPoint, + IN UINTN UserPageTable ); STATIC @@ -84,7 +84,7 @@ SysCallBootService ( (VOID *)((UINTN)Physical + 3 * sizeof (UINTN)), (VOID *)Context.SystemContextArm->SP, (NumberOfArguments - 2) * sizeof (UINTN) - ); + ); } } ForbidSupervisorAccessToUserMemory (); @@ -136,8 +136,8 @@ MakeUserPageTableTemplate ( VOID EFIAPI InitializeMsr ( - IN OUT EFI_CONFIGURATION_TABLE *Table, - IN UINTN NumberOfEntries + IN OUT EFI_CONFIGURATION_TABLE *Table, + IN UINTN NumberOfEntries ) { if (ArmHasPan ()) { @@ -176,7 +176,7 @@ ForbidSupervisorAccessToUserMemory ( EFI_STATUS EFIAPI CallRing3 ( - IN RING3_CALL_DATA *Data, + IN RING3_CALL_DATA *Data, IN UINTN UserStackTop ) { diff --git a/MdeModulePkg/Core/Dxe/SysCall/BootServices.c b/MdeModulePkg/Core/Dxe/SysCall/BootServices.c index 3483b07997..0b96d43299 100644 --- a/MdeModulePkg/Core/Dxe/SysCall/BootServices.c +++ b/MdeModulePkg/Core/Dxe/SysCall/BootServices.c @@ -68,8 +68,8 @@ CallInstallMultipleProtocolInterfaces ( VOID EFIAPI ReturnToCore ( - IN EFI_STATUS Status, - IN UINTN ReturnSP + IN EFI_STATUS Status, + IN UINTN ReturnSP ); VOID @@ -172,8 +172,8 @@ STATIC VOID * EFIAPI FindInterface ( - IN BOOLEAN FindRing3, - IN VOID *Interface + IN BOOLEAN FindRing3, + IN VOID *Interface ) { LIST_ENTRY *Link; @@ -566,7 +566,7 @@ CallBootService ( } else if (CompareGuid ((EFI_GUID *)CoreArgList[Index], &gEfiSimpleFileSystemProtocolGuid)) { CoreSimpleFileSystem = (EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *)CoreArgList[Index + 1]; - CoreSimpleFileSystem->OpenVolume = CoreOpenVolume; + CoreSimpleFileSystem->OpenVolume = CoreSimpleFileSystemOpenVolume; } else if ((CompareGuid ((EFI_GUID *)CoreArgList[Index], &gEfiUnicodeCollationProtocolGuid)) || (CompareGuid ((EFI_GUID *)CoreArgList[Index], &gEfiUnicodeCollation2ProtocolGuid))) { CoreUnicodeCollation = (EFI_UNICODE_COLLATION_PROTOCOL *)CoreArgList[Index + 1]; diff --git a/MdeModulePkg/Core/Dxe/SysCall/IA32/CoreBootServices.nasm b/MdeModulePkg/Core/Dxe/SysCall/IA32/CoreBootServices.nasm index 0590418c4a..b8ffa3a08b 100644 --- a/MdeModulePkg/Core/Dxe/SysCall/IA32/CoreBootServices.nasm +++ b/MdeModulePkg/Core/Dxe/SysCall/IA32/CoreBootServices.nasm @@ -104,7 +104,7 @@ ASM_PFX(SysCallBase): ; EFI_STATUS ; EFIAPI ; CoreBootServices ( -; IN UINT8 Type, +; IN UINT8 Type, ; ... ; ); ; @@ -168,7 +168,7 @@ ASM_PFX(CoreBootServices): ; EFI_STATUS ; EFIAPI ; CallRing3 ( -; IN RING3_CALL_DATA *Data, +; IN RING3_CALL_DATA *Data, ; IN UINTN UserStackTop ; ); ; @@ -219,8 +219,8 @@ ASM_PFX(SysCallEnd): ; VOID ; EFIAPI ; ReturnToCore ( -; IN EFI_STATUS Status, -; IN UINTN ReturnSP +; IN EFI_STATUS Status, +; IN UINTN ReturnSP ; ); ;------------------------------------------------------------------------------ global ASM_PFX(ReturnToCore) diff --git a/MdeModulePkg/Core/Dxe/SysCall/IA32/InitializeIA32.c b/MdeModulePkg/Core/Dxe/SysCall/IA32/InitializeIA32.c index e3c2ab6f68..b2725303d2 100644 --- a/MdeModulePkg/Core/Dxe/SysCall/IA32/InitializeIA32.c +++ b/MdeModulePkg/Core/Dxe/SysCall/IA32/InitializeIA32.c @@ -90,8 +90,8 @@ MakeUserPageTableTemplate ( VOID EFIAPI InitializeMsr ( - IN OUT EFI_CONFIGURATION_TABLE *Table, - IN UINTN NumberOfEntries + IN OUT EFI_CONFIGURATION_TABLE *Table, + IN UINTN NumberOfEntries ) { UINT64 Msr; diff --git a/MdeModulePkg/Core/Dxe/SysCall/SupportedProtocols.c b/MdeModulePkg/Core/Dxe/SysCall/SupportedProtocols.c index f388755f0e..549d12b626 100644 --- a/MdeModulePkg/Core/Dxe/SysCall/SupportedProtocols.c +++ b/MdeModulePkg/Core/Dxe/SysCall/SupportedProtocols.c @@ -75,7 +75,7 @@ STATIC USER_SPACE_DRIVER * EFIAPI FindUserSpaceDriver ( - IN VOID *CoreWrapper, + IN VOID *CoreWrapper, OUT UINTN *OldPageTable ) { @@ -100,9 +100,9 @@ FindUserSpaceDriver ( EFI_STATUS EFIAPI CoreDriverBindingSupported ( - IN EFI_DRIVER_BINDING_PROTOCOL *This, - IN EFI_HANDLE ControllerHandle, - IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL + IN EFI_DRIVER_BINDING_PROTOCOL *This, + IN EFI_HANDLE ControllerHandle, + IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL ) { EFI_STATUS Status; @@ -136,9 +136,9 @@ CoreDriverBindingSupported ( EFI_STATUS EFIAPI CoreDriverBindingStart ( - IN EFI_DRIVER_BINDING_PROTOCOL *This, - IN EFI_HANDLE ControllerHandle, - IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL + IN EFI_DRIVER_BINDING_PROTOCOL *This, + IN EFI_HANDLE ControllerHandle, + IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL ) { EFI_STATUS Status; @@ -172,10 +172,10 @@ CoreDriverBindingStart ( EFI_STATUS EFIAPI CoreDriverBindingStop ( - IN EFI_DRIVER_BINDING_PROTOCOL *This, - IN EFI_HANDLE ControllerHandle, - IN UINTN NumberOfChildren, - IN EFI_HANDLE *ChildHandleBuffer OPTIONAL + IN EFI_DRIVER_BINDING_PROTOCOL *This, + IN EFI_HANDLE ControllerHandle, + IN UINTN NumberOfChildren, + IN EFI_HANDLE *ChildHandleBuffer OPTIONAL ) { EFI_STATUS Status; @@ -257,9 +257,9 @@ STATIC EFI_STATUS EFIAPI CoreFileRead ( - IN EFI_FILE_PROTOCOL *This, - IN OUT UINTN *BufferSize, - OUT VOID *Buffer + IN EFI_FILE_PROTOCOL *This, + IN OUT UINTN *BufferSize, + OUT VOID *Buffer ) { EFI_STATUS Status; @@ -336,9 +336,9 @@ STATIC EFI_STATUS EFIAPI CoreFileWrite ( - IN EFI_FILE_PROTOCOL *This, - IN OUT UINTN *BufferSize, - IN VOID *Buffer + IN EFI_FILE_PROTOCOL *This, + IN OUT UINTN *BufferSize, + IN VOID *Buffer ) { return EFI_UNSUPPORTED; @@ -348,8 +348,8 @@ STATIC EFI_STATUS EFIAPI CoreFileSetPosition ( - IN EFI_FILE_PROTOCOL *This, - IN UINT64 Position + IN EFI_FILE_PROTOCOL *This, + IN UINT64 Position ) { EFI_STATUS Status; @@ -410,8 +410,8 @@ STATIC EFI_STATUS EFIAPI CoreFileGetPosition ( - IN EFI_FILE_PROTOCOL *This, - OUT UINT64 *Position + IN EFI_FILE_PROTOCOL *This, + OUT UINT64 *Position ) { EFI_STATUS Status; @@ -468,10 +468,10 @@ STATIC EFI_STATUS EFIAPI CoreFileGetInfo ( - IN EFI_FILE_PROTOCOL *This, - IN EFI_GUID *InformationType, - IN OUT UINTN *BufferSize, - OUT VOID *Buffer + IN EFI_FILE_PROTOCOL *This, + IN EFI_GUID *InformationType, + IN OUT UINTN *BufferSize, + OUT VOID *Buffer ) { EFI_STATUS Status; @@ -558,10 +558,10 @@ STATIC EFI_STATUS EFIAPI CoreFileSetInfo ( - IN EFI_FILE_PROTOCOL *This, - IN EFI_GUID *InformationType, - IN UINTN BufferSize, - IN VOID *Buffer + IN EFI_FILE_PROTOCOL *This, + IN EFI_GUID *InformationType, + IN UINTN BufferSize, + IN VOID *Buffer ) { return EFI_UNSUPPORTED; @@ -581,12 +581,12 @@ STATIC EFI_STATUS EFIAPI CoreFileOpenEx ( - IN EFI_FILE_PROTOCOL *This, - OUT EFI_FILE_PROTOCOL **NewHandle, - IN CHAR16 *FileName, - IN UINT64 OpenMode, - IN UINT64 Attributes, - IN OUT EFI_FILE_IO_TOKEN *Token + IN EFI_FILE_PROTOCOL *This, + OUT EFI_FILE_PROTOCOL **NewHandle, + IN CHAR16 *FileName, + IN UINT64 OpenMode, + IN UINT64 Attributes, + IN OUT EFI_FILE_IO_TOKEN *Token ) { return EFI_UNSUPPORTED; @@ -596,8 +596,8 @@ STATIC EFI_STATUS EFIAPI CoreFileReadEx ( - IN EFI_FILE_PROTOCOL *This, - IN OUT EFI_FILE_IO_TOKEN *Token + IN EFI_FILE_PROTOCOL *This, + IN OUT EFI_FILE_IO_TOKEN *Token ) { return EFI_UNSUPPORTED; @@ -607,8 +607,8 @@ STATIC EFI_STATUS EFIAPI CoreFileWriteEx ( - IN EFI_FILE_PROTOCOL *This, - IN OUT EFI_FILE_IO_TOKEN *Token + IN EFI_FILE_PROTOCOL *This, + IN OUT EFI_FILE_IO_TOKEN *Token ) { return EFI_UNSUPPORTED; @@ -618,8 +618,8 @@ STATIC EFI_STATUS EFIAPI CoreFileFlushEx ( - IN EFI_FILE_PROTOCOL *This, - IN OUT EFI_FILE_IO_TOKEN *Token + IN EFI_FILE_PROTOCOL *This, + IN OUT EFI_FILE_IO_TOKEN *Token ) { return EFI_UNSUPPORTED; @@ -629,11 +629,11 @@ STATIC EFI_STATUS EFIAPI CoreFileOpen ( - IN EFI_FILE_PROTOCOL *This, - OUT EFI_FILE_PROTOCOL **NewHandle, - IN CHAR16 *FileName, - IN UINT64 OpenMode, - IN UINT64 Attributes + IN EFI_FILE_PROTOCOL *This, + OUT EFI_FILE_PROTOCOL **NewHandle, + IN CHAR16 *FileName, + IN UINT64 OpenMode, + IN UINT64 Attributes ) { EFI_STATUS Status; @@ -787,9 +787,9 @@ CoreFileOpen ( EFI_STATUS EFIAPI -CoreOpenVolume ( - IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This, - OUT EFI_FILE_PROTOCOL **Root +CoreSimpleFileSystemOpenVolume ( + IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This, + OUT EFI_FILE_PROTOCOL **Root ) { EFI_STATUS Status; @@ -1003,8 +1003,8 @@ CoreUnicodeCollationMetaiMatch ( VOID EFIAPI CoreUnicodeCollationStrLwr ( - IN EFI_UNICODE_COLLATION_PROTOCOL *This, - IN OUT CHAR16 *Str + IN EFI_UNICODE_COLLATION_PROTOCOL *This, + IN OUT CHAR16 *Str ) { EFI_STATUS Status; @@ -1057,8 +1057,8 @@ CoreUnicodeCollationStrLwr ( VOID EFIAPI CoreUnicodeCollationStrUpr ( - IN EFI_UNICODE_COLLATION_PROTOCOL *This, - IN OUT CHAR16 *Str + IN EFI_UNICODE_COLLATION_PROTOCOL *This, + IN OUT CHAR16 *Str ) { EFI_STATUS Status; @@ -1111,10 +1111,10 @@ CoreUnicodeCollationStrUpr ( VOID EFIAPI CoreUnicodeCollationFatToStr ( - IN EFI_UNICODE_COLLATION_PROTOCOL *This, - IN UINTN FatSize, - IN CHAR8 *Fat, - OUT CHAR16 *String + IN EFI_UNICODE_COLLATION_PROTOCOL *This, + IN UINTN FatSize, + IN CHAR8 *Fat, + OUT CHAR16 *String ) { EFI_STATUS Status; @@ -1166,10 +1166,10 @@ CoreUnicodeCollationFatToStr ( BOOLEAN EFIAPI CoreUnicodeCollationStrToFat ( - IN EFI_UNICODE_COLLATION_PROTOCOL *This, - IN CHAR16 *String, - IN UINTN FatSize, - OUT CHAR8 *Fat + IN EFI_UNICODE_COLLATION_PROTOCOL *This, + IN CHAR16 *String, + IN UINTN FatSize, + OUT CHAR8 *Fat ) { EFI_STATUS Status; diff --git a/MdeModulePkg/Core/Dxe/SysCall/SupportedProtocols.h b/MdeModulePkg/Core/Dxe/SysCall/SupportedProtocols.h index a6195035f2..478cef992d 100644 --- a/MdeModulePkg/Core/Dxe/SysCall/SupportedProtocols.h +++ b/MdeModulePkg/Core/Dxe/SysCall/SupportedProtocols.h @@ -14,33 +14,33 @@ EFI_STATUS EFIAPI CoreDriverBindingSupported ( - IN EFI_DRIVER_BINDING_PROTOCOL *This, - IN EFI_HANDLE ControllerHandle, - IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL + IN EFI_DRIVER_BINDING_PROTOCOL *This, + IN EFI_HANDLE ControllerHandle, + IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL ); EFI_STATUS EFIAPI CoreDriverBindingStart ( - IN EFI_DRIVER_BINDING_PROTOCOL *This, - IN EFI_HANDLE ControllerHandle, - IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL + IN EFI_DRIVER_BINDING_PROTOCOL *This, + IN EFI_HANDLE ControllerHandle, + IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL ); EFI_STATUS EFIAPI CoreDriverBindingStop ( - IN EFI_DRIVER_BINDING_PROTOCOL *This, - IN EFI_HANDLE ControllerHandle, - IN UINTN NumberOfChildren, - IN EFI_HANDLE *ChildHandleBuffer OPTIONAL + IN EFI_DRIVER_BINDING_PROTOCOL *This, + IN EFI_HANDLE ControllerHandle, + IN UINTN NumberOfChildren, + IN EFI_HANDLE *ChildHandleBuffer OPTIONAL ); EFI_STATUS EFIAPI -CoreOpenVolume ( - IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This, - OUT EFI_FILE_PROTOCOL **Root +CoreSimpleFileSystemOpenVolume ( + IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This, + OUT EFI_FILE_PROTOCOL **Root ); INTN @@ -62,31 +62,31 @@ CoreUnicodeCollationMetaiMatch ( VOID EFIAPI CoreUnicodeCollationStrLwr ( - IN EFI_UNICODE_COLLATION_PROTOCOL *This, - IN OUT CHAR16 *Str + IN EFI_UNICODE_COLLATION_PROTOCOL *This, + IN OUT CHAR16 *Str ); VOID EFIAPI CoreUnicodeCollationStrUpr ( - IN EFI_UNICODE_COLLATION_PROTOCOL *This, - IN OUT CHAR16 *Str + IN EFI_UNICODE_COLLATION_PROTOCOL *This, + IN OUT CHAR16 *Str ); VOID EFIAPI CoreUnicodeCollationFatToStr ( - IN EFI_UNICODE_COLLATION_PROTOCOL *This, - IN UINTN FatSize, - IN CHAR8 *Fat, - OUT CHAR16 *String + IN EFI_UNICODE_COLLATION_PROTOCOL *This, + IN UINTN FatSize, + IN CHAR8 *Fat, + OUT CHAR16 *String ); BOOLEAN EFIAPI CoreUnicodeCollationStrToFat ( - IN EFI_UNICODE_COLLATION_PROTOCOL *This, - IN CHAR16 *String, - IN UINTN FatSize, - OUT CHAR8 *Fat + IN EFI_UNICODE_COLLATION_PROTOCOL *This, + IN CHAR16 *String, + IN UINTN FatSize, + OUT CHAR8 *Fat ); diff --git a/MdeModulePkg/Core/Dxe/SysCall/X64/CoreBootServices.nasm b/MdeModulePkg/Core/Dxe/SysCall/X64/CoreBootServices.nasm index 3c70630591..22faab68bd 100644 --- a/MdeModulePkg/Core/Dxe/SysCall/X64/CoreBootServices.nasm +++ b/MdeModulePkg/Core/Dxe/SysCall/X64/CoreBootServices.nasm @@ -112,7 +112,7 @@ ASM_PFX(SysCallBase): ; EFI_STATUS ; EFIAPI ; CoreBootServices ( -; IN UINT8 Type, +; IN UINT8 Type, ; ... ; ); ; @@ -182,7 +182,7 @@ o64 sysret ; EFI_STATUS ; EFIAPI ; CallRing3 ( -; IN RING3_CALL_DATA *Data, +; IN RING3_CALL_DATA *Data, ; IN UINTN UserStackTop ; ); ; @@ -234,8 +234,8 @@ ASM_PFX(SysCallEnd): ; VOID ; EFIAPI ; ReturnToCore ( -; IN EFI_STATUS Status, -; IN UINTN ReturnSP +; IN EFI_STATUS Status, +; IN UINTN ReturnSP ; ); ; ; (rcx) Status diff --git a/MdeModulePkg/Core/Dxe/SysCall/X64/InitializeX64.c b/MdeModulePkg/Core/Dxe/SysCall/X64/InitializeX64.c index 662e96b8b9..04325c5b47 100644 --- a/MdeModulePkg/Core/Dxe/SysCall/X64/InitializeX64.c +++ b/MdeModulePkg/Core/Dxe/SysCall/X64/InitializeX64.c @@ -287,8 +287,8 @@ MakeUserPageTableTemplate ( VOID EFIAPI InitializeMsr ( - IN OUT EFI_CONFIGURATION_TABLE *Table, - IN UINTN NumberOfEntries + IN OUT EFI_CONFIGURATION_TABLE *Table, + IN UINTN NumberOfEntries ) { UINT64 Msr;