mirror of
https://github.com/acidanthera/audk.git
synced 2025-07-23 21:54:27 +02:00
ArmPkg: Update code to be more C11 compliant by using __func__
__FUNCTION__ is a pre-standard extension that gcc and Visual C++ among others support, while __func__ was standardized in C99. Since it's more standard, replace __FUNCTION__ with __func__ throughout ArmPkg. Signed-off-by: Rebecca Cran <rebecca@bsdio.com> Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com> Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
parent
cf4af503fb
commit
f2cc962cd2
@ -137,7 +137,7 @@ CpuArchEventProtocolNotify (
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_ERROR,
|
DEBUG_ERROR,
|
||||||
"%a: Cpu->RegisterInterruptHandler() - %r\n",
|
"%a: Cpu->RegisterInterruptHandler() - %r\n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
Status
|
Status
|
||||||
));
|
));
|
||||||
return;
|
return;
|
||||||
@ -153,7 +153,7 @@ CpuArchEventProtocolNotify (
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_ERROR,
|
DEBUG_ERROR,
|
||||||
"%a: Cpu->RegisterInterruptHandler() - %r\n",
|
"%a: Cpu->RegisterInterruptHandler() - %r\n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
Status
|
Status
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
@ -92,7 +92,7 @@ GetMemoryAttributes (
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_VERBOSE,
|
DEBUG_VERBOSE,
|
||||||
"%a: BaseAddress == 0x%lx, Length == 0x%lx\n",
|
"%a: BaseAddress == 0x%lx, Length == 0x%lx\n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
BaseAddress,
|
BaseAddress,
|
||||||
Length
|
Length
|
||||||
));
|
));
|
||||||
@ -113,7 +113,7 @@ GetMemoryAttributes (
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_VERBOSE,
|
DEBUG_VERBOSE,
|
||||||
"%a: RegionAddress == 0x%lx, RegionLength == 0x%lx, RegionAttributes == 0x%lx\n",
|
"%a: RegionAddress == 0x%lx, RegionLength == 0x%lx, RegionAttributes == 0x%lx\n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
(UINT64)RegionAddress,
|
(UINT64)RegionAddress,
|
||||||
(UINT64)RegionLength,
|
(UINT64)RegionLength,
|
||||||
(UINT64)RegionAttributes
|
(UINT64)RegionAttributes
|
||||||
@ -130,7 +130,7 @@ GetMemoryAttributes (
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_VERBOSE,
|
DEBUG_VERBOSE,
|
||||||
"%a: Union == %lx, Intersection == %lx\n",
|
"%a: Union == %lx, Intersection == %lx\n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
(UINT64)Union,
|
(UINT64)Union,
|
||||||
(UINT64)Intersection
|
(UINT64)Intersection
|
||||||
));
|
));
|
||||||
@ -188,7 +188,7 @@ SetMemoryAttributes (
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_INFO,
|
DEBUG_INFO,
|
||||||
"%a: BaseAddress == 0x%lx, Length == 0x%lx, Attributes == 0x%lx\n",
|
"%a: BaseAddress == 0x%lx, Length == 0x%lx, Attributes == 0x%lx\n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
(UINTN)BaseAddress,
|
(UINTN)BaseAddress,
|
||||||
(UINTN)Length,
|
(UINTN)Length,
|
||||||
(UINTN)Attributes
|
(UINTN)Attributes
|
||||||
@ -272,7 +272,7 @@ ClearMemoryAttributes (
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_INFO,
|
DEBUG_INFO,
|
||||||
"%a: BaseAddress == 0x%lx, Length == 0x%lx, Attributes == 0x%lx\n",
|
"%a: BaseAddress == 0x%lx, Length == 0x%lx, Attributes == 0x%lx\n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
(UINTN)BaseAddress,
|
(UINTN)BaseAddress,
|
||||||
(UINTN)Length,
|
(UINTN)Length,
|
||||||
(UINTN)Attributes
|
(UINTN)Attributes
|
||||||
|
@ -139,7 +139,7 @@ ReplaceTableEntry (
|
|||||||
(((RegionStart ^ (UINTN)Entry) & ~BlockMask) == 0))
|
(((RegionStart ^ (UINTN)Entry) & ~BlockMask) == 0))
|
||||||
{
|
{
|
||||||
DisableMmu = TRUE;
|
DisableMmu = TRUE;
|
||||||
DEBUG ((DEBUG_WARN, "%a: splitting block entry with MMU disabled\n", __FUNCTION__));
|
DEBUG ((DEBUG_WARN, "%a: splitting block entry with MMU disabled\n", __func__));
|
||||||
}
|
}
|
||||||
|
|
||||||
mReplaceLiveEntryFunc (Entry, Value, RegionStart, DisableMmu);
|
mReplaceLiveEntryFunc (Entry, Value, RegionStart, DisableMmu);
|
||||||
@ -233,7 +233,7 @@ UpdateRegionMappingRecursive (
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_VERBOSE,
|
DEBUG_VERBOSE,
|
||||||
"%a(%d): %llx - %llx set %lx clr %lx\n",
|
"%a(%d): %llx - %llx set %lx clr %lx\n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
Level,
|
Level,
|
||||||
RegionStart,
|
RegionStart,
|
||||||
RegionEnd,
|
RegionEnd,
|
||||||
|
@ -65,7 +65,7 @@ LibResetSystem (
|
|||||||
ArmCallSmc (&ArmSmcArgs);
|
ArmCallSmc (&ArmSmcArgs);
|
||||||
|
|
||||||
// We should never be here
|
// We should never be here
|
||||||
DEBUG ((DEBUG_ERROR, "%a: PSCI Reset failed\n", __FUNCTION__));
|
DEBUG ((DEBUG_ERROR, "%a: PSCI Reset failed\n", __func__));
|
||||||
CpuDeadLoop ();
|
CpuDeadLoop ();
|
||||||
return EFI_UNSUPPORTED;
|
return EFI_UNSUPPORTED;
|
||||||
}
|
}
|
||||||
|
@ -151,7 +151,7 @@ PlatformBootManagerAfterConsole (
|
|||||||
LOAD_OPTION_ACTIVE
|
LOAD_OPTION_ACTIVE
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
DEBUG ((DEBUG_ERROR, "%a: PcdLinuxBootFileGuid was not set!\n", __FUNCTION__));
|
DEBUG ((DEBUG_ERROR, "%a: PcdLinuxBootFileGuid was not set!\n", __func__));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -195,7 +195,7 @@ FilterAndProcess (
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_VERBOSE,
|
DEBUG_VERBOSE,
|
||||||
"%a: %g: %r\n",
|
"%a: %g: %r\n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
ProtocolGuid,
|
ProtocolGuid,
|
||||||
Status
|
Status
|
||||||
));
|
));
|
||||||
@ -266,7 +266,7 @@ IsPciDisplay (
|
|||||||
&Pci
|
&Pci
|
||||||
);
|
);
|
||||||
if (EFI_ERROR (Status)) {
|
if (EFI_ERROR (Status)) {
|
||||||
DEBUG ((DEBUG_ERROR, "%a: %s: %r\n", __FUNCTION__, ReportText, Status));
|
DEBUG ((DEBUG_ERROR, "%a: %s: %r\n", __func__, ReportText, Status));
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -330,7 +330,7 @@ Connect (
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
EFI_ERROR (Status) ? DEBUG_ERROR : DEBUG_VERBOSE,
|
EFI_ERROR (Status) ? DEBUG_ERROR : DEBUG_VERBOSE,
|
||||||
"%a: %s: %r\n",
|
"%a: %s: %r\n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
ReportText,
|
ReportText,
|
||||||
Status
|
Status
|
||||||
));
|
));
|
||||||
@ -356,7 +356,7 @@ AddOutput (
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_ERROR,
|
DEBUG_ERROR,
|
||||||
"%a: %s: handle %p: device path not found\n",
|
"%a: %s: handle %p: device path not found\n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
ReportText,
|
ReportText,
|
||||||
Handle
|
Handle
|
||||||
));
|
));
|
||||||
@ -368,7 +368,7 @@ AddOutput (
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_ERROR,
|
DEBUG_ERROR,
|
||||||
"%a: %s: adding to ConOut: %r\n",
|
"%a: %s: adding to ConOut: %r\n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
ReportText,
|
ReportText,
|
||||||
Status
|
Status
|
||||||
));
|
));
|
||||||
@ -380,7 +380,7 @@ AddOutput (
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_ERROR,
|
DEBUG_ERROR,
|
||||||
"%a: %s: adding to ErrOut: %r\n",
|
"%a: %s: adding to ErrOut: %r\n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
ReportText,
|
ReportText,
|
||||||
Status
|
Status
|
||||||
));
|
));
|
||||||
@ -390,7 +390,7 @@ AddOutput (
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_VERBOSE,
|
DEBUG_VERBOSE,
|
||||||
"%a: %s: added to ConOut and ErrOut\n",
|
"%a: %s: added to ConOut and ErrOut\n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
ReportText
|
ReportText
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
@ -547,7 +547,7 @@ GetPlatformOptions (
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_ERROR,
|
DEBUG_ERROR,
|
||||||
"%a: failed to register \"%s\": %r\n",
|
"%a: failed to register \"%s\": %r\n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
BootOptions[Index].Description,
|
BootOptions[Index].Description,
|
||||||
Status
|
Status
|
||||||
));
|
));
|
||||||
@ -575,7 +575,7 @@ GetPlatformOptions (
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_ERROR,
|
DEBUG_ERROR,
|
||||||
"%a: failed to register hotkey for \"%s\": %r\n",
|
"%a: failed to register hotkey for \"%s\": %r\n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
BootOptions[Index].Description,
|
BootOptions[Index].Description,
|
||||||
Status
|
Status
|
||||||
));
|
));
|
||||||
@ -757,7 +757,7 @@ HandleCapsules (
|
|||||||
BOOLEAN NeedReset;
|
BOOLEAN NeedReset;
|
||||||
EFI_STATUS Status;
|
EFI_STATUS Status;
|
||||||
|
|
||||||
DEBUG ((DEBUG_INFO, "%a: processing capsules ...\n", __FUNCTION__));
|
DEBUG ((DEBUG_INFO, "%a: processing capsules ...\n", __func__));
|
||||||
|
|
||||||
Status = gBS->LocateProtocol (
|
Status = gBS->LocateProtocol (
|
||||||
&gEsrtManagementProtocolGuid,
|
&gEsrtManagementProtocolGuid,
|
||||||
@ -785,7 +785,7 @@ HandleCapsules (
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_ERROR,
|
DEBUG_ERROR,
|
||||||
"%a: failed to process capsule %p - %r\n",
|
"%a: failed to process capsule %p - %r\n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
CapsuleHeader,
|
CapsuleHeader,
|
||||||
Status
|
Status
|
||||||
));
|
));
|
||||||
@ -800,7 +800,7 @@ HandleCapsules (
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_WARN,
|
DEBUG_WARN,
|
||||||
"%a: capsule update successful, resetting ...\n",
|
"%a: capsule update successful, resetting ...\n",
|
||||||
__FUNCTION__
|
__func__
|
||||||
));
|
));
|
||||||
|
|
||||||
gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);
|
gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);
|
||||||
@ -868,7 +868,7 @@ BootDiscoveryPolicyHandler (
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_INFO,
|
DEBUG_INFO,
|
||||||
"%a - Unexpected DiscoveryPolicy (0x%x). Run Minimal Discovery Policy\n",
|
"%a - Unexpected DiscoveryPolicy (0x%x). Run Minimal Discovery Policy\n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
DiscoveryPolicy
|
DiscoveryPolicy
|
||||||
));
|
));
|
||||||
return EFI_SUCCESS;
|
return EFI_SUCCESS;
|
||||||
@ -884,14 +884,14 @@ BootDiscoveryPolicyHandler (
|
|||||||
DEBUG_INFO,
|
DEBUG_INFO,
|
||||||
"%a - Failed to locate gEfiBootManagerPolicyProtocolGuid."
|
"%a - Failed to locate gEfiBootManagerPolicyProtocolGuid."
|
||||||
"Driver connect will be skipped.\n",
|
"Driver connect will be skipped.\n",
|
||||||
__FUNCTION__
|
__func__
|
||||||
));
|
));
|
||||||
return Status;
|
return Status;
|
||||||
}
|
}
|
||||||
|
|
||||||
Status = BMPolicy->ConnectDeviceClass (BMPolicy, Class);
|
Status = BMPolicy->ConnectDeviceClass (BMPolicy, Class);
|
||||||
if (EFI_ERROR (Status)) {
|
if (EFI_ERROR (Status)) {
|
||||||
DEBUG ((DEBUG_ERROR, "%a - ConnectDeviceClass returns - %r\n", __FUNCTION__, Status));
|
DEBUG ((DEBUG_ERROR, "%a - ConnectDeviceClass returns - %r\n", __func__, Status));
|
||||||
return Status;
|
return Status;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1096,7 +1096,7 @@ PlatformBootManagerUnableToBoot (
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_WARN,
|
DEBUG_WARN,
|
||||||
"%a: rebooting after refreshing all boot options\n",
|
"%a: rebooting after refreshing all boot options\n",
|
||||||
__FUNCTION__
|
__func__
|
||||||
));
|
));
|
||||||
gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);
|
gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);
|
||||||
}
|
}
|
||||||
|
@ -741,7 +741,7 @@ AddSmbiosProcessorTypeTable (
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_ERROR,
|
DEBUG_ERROR,
|
||||||
"[%a]:[%dL] Smbios Type04 Table Log Failed! %r \n",
|
"[%a]:[%dL] Smbios Type04 Table Log Failed! %r \n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
DEBUG_LINE_NUMBER,
|
DEBUG_LINE_NUMBER,
|
||||||
Status
|
Status
|
||||||
));
|
));
|
||||||
|
@ -287,7 +287,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBiosVendor) {
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_ERROR,
|
DEBUG_ERROR,
|
||||||
"[%a]:[%dL] Smbios Type00 Table Log Failed! %r \n",
|
"[%a]:[%dL] Smbios Type00 Table Log Failed! %r \n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
DEBUG_LINE_NUMBER,
|
DEBUG_LINE_NUMBER,
|
||||||
Status
|
Status
|
||||||
));
|
));
|
||||||
|
@ -184,7 +184,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscSystemManufacturer) {
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_ERROR,
|
DEBUG_ERROR,
|
||||||
"[%a]:[%dL] Smbios Type01 Table Log Failed! %r \n",
|
"[%a]:[%dL] Smbios Type01 Table Log Failed! %r \n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
DEBUG_LINE_NUMBER,
|
DEBUG_LINE_NUMBER,
|
||||||
Status
|
Status
|
||||||
));
|
));
|
||||||
|
@ -214,7 +214,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBaseBoardManufacturer) {
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_ERROR,
|
DEBUG_ERROR,
|
||||||
"[%a]:[%dL] Smbios Type02 Table Log Failed! %r \n",
|
"[%a]:[%dL] Smbios Type02 Table Log Failed! %r \n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
DEBUG_LINE_NUMBER,
|
DEBUG_LINE_NUMBER,
|
||||||
Status
|
Status
|
||||||
));
|
));
|
||||||
|
@ -179,7 +179,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscChassisManufacturer) {
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_ERROR,
|
DEBUG_ERROR,
|
||||||
"[%a]:[%dL] Smbios Type03 Table Log Failed! %r \n",
|
"[%a]:[%dL] Smbios Type03 Table Log Failed! %r \n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
DEBUG_LINE_NUMBER,
|
DEBUG_LINE_NUMBER,
|
||||||
Status
|
Status
|
||||||
));
|
));
|
||||||
|
@ -161,7 +161,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscNumberOfInstallableLanguages) {
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_ERROR,
|
DEBUG_ERROR,
|
||||||
"[%a]:[%dL] Smbios Type13 Table Log Failed! %r \n",
|
"[%a]:[%dL] Smbios Type13 Table Log Failed! %r \n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
DEBUG_LINE_NUMBER,
|
DEBUG_LINE_NUMBER,
|
||||||
Status
|
Status
|
||||||
));
|
));
|
||||||
|
@ -69,7 +69,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBootInformation) {
|
|||||||
DEBUG ((
|
DEBUG ((
|
||||||
DEBUG_ERROR,
|
DEBUG_ERROR,
|
||||||
"[%a]:[%dL] Smbios Type32 Table Log Failed! %r \n",
|
"[%a]:[%dL] Smbios Type32 Table Log Failed! %r \n",
|
||||||
__FUNCTION__,
|
__func__,
|
||||||
DEBUG_LINE_NUMBER,
|
DEBUG_LINE_NUMBER,
|
||||||
Status
|
Status
|
||||||
));
|
));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user