[AMD Official Use Only - General]
Reviewed-by: Abner Chang <abner.ch...@amd.com>
> -----Original Message-----
> From: Rebecca Cran <rebe...@bsdio.com>
> Sent: Friday, April 7, 2023 6:23 AM
> To: devel@edk2.groups.io; Liming Gao <gaolim...@byosoft.com.cn>;
> Michael D Kinney <michael.d.kin...@intel.com>; Guomin Jiang
> <guomin.ji...@intel.com>; Wei6 Xu <wei6...@intel.com>; Guo Dong
> <guo.d...@intel.com>; Ray Ni <ray...@intel.com>; Sean Rhodes
> <sean@starlabs.systems>; James Lu <james...@intel.com>; Gua Guo
> <gua....@intel.com>; Andrew Fish <af...@apple.com>; Hao A Wu
> <hao.a...@intel.com>; Maciej Rabeda <maciej.rab...@linux.intel.com>;
> Siyuan Fu <siyuan...@intel.com>; Jiewen Yao <jiewen....@intel.com>; Jian
> J Wang <jian.j.w...@intel.com>; Xiaoyu Lu <xiaoyu1...@intel.com>; Ard
> Biesheuvel <ardb+tianoc...@kernel.org>; Sami Mujawar
> <sami.muja...@arm.com>; Supreeth Venkatesh
> <supreeth.venkat...@arm.com>; Michael Kubacki
> <mikub...@linux.microsoft.com>; Nate DeSimone
> <nathaniel.l.desim...@intel.com>; Sean Brogan
> <sean.bro...@microsoft.com>
> Cc: Rebecca Cran <rebe...@bsdio.com>; Leif Lindholm
> <quic_llind...@quicinc.com>; Chang, Abner <abner.ch...@amd.com>;
> Nickle Wang <nick...@nvidia.com>; Igor Kulchytskyy <ig...@ami.com>;
> Daniel Schaefer <g...@danielschaefer.me>; Min Xu <min.m...@intel.com>;
> Jordan Justen <jordan.l.jus...@intel.com>; Gerd Hoffmann
> <kra...@redhat.com>; Peter Grehan <gre...@freebsd.org>; Erdem Aktas
> <erdemak...@google.com>; James Bottomley <j...@linux.ibm.com>;
> Lendacky, Thomas <thomas.lenda...@amd.com>; Roth, Michael
> <michael.r...@amd.com>; Sunil V L <suni...@ventanamicro.com>; Andrei
> Warkentin <andrei.warken...@intel.com>
> Subject: [PATCH 07/18] EmbeddedPkg: Update code to be more C11
> compliant by using __func__
>
> Caution: This message originated from an External Source. Use proper
> caution when opening attachments, clicking links, or responding.
>
>
> __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
> EmbeddedPkg.
>
> Visual Studio versions before VS 2015 don't support __func__ and so will fail
> to compile. A workaround is to define __func__ as __FUNCTION__ :
>
> #define __func__ __FUNCTION__
>
> Signed-off-by: Rebecca Cran <rebe...@bsdio.com>
> ---
> EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c | 18
> ++++++++--------
> EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.c | 10 ++++-----
> EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.c | 22 ++++++++++-
> ---------
> EmbeddedPkg/Library/NonCoherentDmaLib/NonCoherentDmaLib.c | 2 +-
> EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClock.c | 2 +-
> EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c | 20
> +++++++++---------
> 6 files changed, 37 insertions(+), 37 deletions(-)
>
> diff --git a/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c
> b/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c
> index 07b82892eb0f..2c2e73e72076 100644
> --- a/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c
> +++ b/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c
> @@ -116,7 +116,7 @@ RemoveDtStdoutPath (
> DEBUG ((
> DEBUG_INFO,
> "%a: could not retrieve DT blob - %r\n",
> - __FUNCTION__,
> + __func__,
> Status
> ));
> return;
> @@ -132,7 +132,7 @@ RemoveDtStdoutPath (
> DEBUG ((
> DEBUG_INFO,
> "%a: Failed to delete 'stdout-path' property: %a\n",
> - __FUNCTION__,
> + __func__,
> fdt_strerror (Error)
> ));
> }
> @@ -190,7 +190,7 @@ RemoveSpcrTable (
> DEBUG ((
> DEBUG_WARN,
> "%a: failed to uninstall SPCR table - %r\n",
> - __FUNCTION__,
> + __func__,
> Status
> ));
> }
> @@ -224,7 +224,7 @@ OnReadyToBoot (
> DEBUG ((
> DEBUG_ERROR,
> "%a: variable '%s' could not be read - bailing!\n",
> - __FUNCTION__,
> + __func__,
> CONSOLE_PREF_VARIABLE_NAME
> ));
> return;
> @@ -234,7 +234,7 @@ OnReadyToBoot (
> DEBUG ((
> DEBUG_INFO,
> "%a: serial console preferred - doing nothing\n",
> - __FUNCTION__
> + __func__
> ));
> return;
> }
> @@ -247,7 +247,7 @@ OnReadyToBoot (
> DEBUG ((
> DEBUG_INFO,
> "%a: no GOP instances found - doing nothing (%r)\n",
> - __FUNCTION__,
> + __func__,
> Status
> ));
> return;
> @@ -296,7 +296,7 @@ ConsolePrefDxeEntryPoint (
> DEBUG ((
> DEBUG_INFO,
> "%a: no console preference found, defaulting to graphical\n",
> - __FUNCTION__
> + __func__
> ));
> ConsolePref.Console = CONSOLE_PREF_GRAPHICAL;
> }
> @@ -308,7 +308,7 @@ ConsolePrefDxeEntryPoint (
> DEBUG ((
> DEBUG_WARN,
> "%a: invalid value for %s, defaulting to graphical\n",
> - __FUNCTION__,
> + __func__,
> CONSOLE_PREF_VARIABLE_NAME
> ));
> ConsolePref.Console = CONSOLE_PREF_GRAPHICAL; @@ -332,7 +332,7
> @@ ConsolePrefDxeEntryPoint (
> DEBUG ((
> DEBUG_ERROR,
> "%a: gRT->SetVariable () failed - %r\n",
> - __FUNCTION__,
> + __func__,
> Status
> ));
> return Status;
> diff --git a/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.c
> b/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.c
> index 7f7e8c446c98..b94cd4da25d1 100644
> --- a/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.c
> +++ b/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.c
> @@ -122,7 +122,7 @@ DtPlatformDxeEntryPoint (
> DEBUG ((
> DEBUG_WARN,
> "%a: no DTB blob could be loaded, defaulting to ACPI (Status == %r)\n",
> - __FUNCTION__,
> + __func__,
> Status
> ));
> DtAcpiPref.Pref = DT_ACPI_SELECT_ACPI; @@ -142,7 +142,7 @@
> DtPlatformDxeEntryPoint (
> DEBUG ((
> DEBUG_WARN,
> "%a: no DT/ACPI preference found, defaulting to %a\n",
> - __FUNCTION__,
> + __func__,
> PcdGetBool (PcdDefaultDtPref) ? "DT" : "ACPI"
> ));
> DtAcpiPref.Pref = PcdGetBool (PcdDefaultDtPref) ? DT_ACPI_SELECT_DT
> @@ -157,7 +157,7 @@ DtPlatformDxeEntryPoint (
> DEBUG ((
> DEBUG_WARN,
> "%a: invalid value for %s, defaulting to %a\n",
> - __FUNCTION__,
> + __func__,
> DT_ACPI_VARIABLE_NAME,
> PcdGetBool (PcdDefaultDtPref) ? "DT" : "ACPI"
> ));
> @@ -197,7 +197,7 @@ DtPlatformDxeEntryPoint (
> DEBUG ((
> DEBUG_ERROR,
> "%a: failed to install gEdkiiPlatformHasAcpiGuid as a protocol\n",
> - __FUNCTION__
> + __func__
> ));
> goto FreeDtb;
> }
> @@ -211,7 +211,7 @@ DtPlatformDxeEntryPoint (
> DEBUG ((
> DEBUG_ERROR,
> "%a: failed to install FDT configuration table\n",
> - __FUNCTION__
> + __func__
> ));
> goto FreeDtb;
> }
> diff --git a/EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.c
> b/EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.c
> index b182c77d19b1..7da505a313d7 100644
> --- a/EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.c
> +++ b/EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.c
> @@ -222,7 +222,7 @@ FindCompatibleNodeReg (
> DEBUG ((
> DEBUG_ERROR,
> "%a: '%a' compatible node has invalid 'reg' property (size == 0x%x)\n",
> - __FUNCTION__,
> + __func__,
> CompatibleString,
> *RegSize
> ));
> @@ -263,7 +263,7 @@ FindNextMemoryNodeReg (
> }
>
> if (!IsNodeEnabled (Next)) {
> - DEBUG ((DEBUG_WARN, "%a: ignoring disabled memory node\n",
> __FUNCTION__));
> + DEBUG ((DEBUG_WARN, "%a: ignoring disabled memory node\n",
> + __func__));
> continue;
> }
>
> @@ -279,7 +279,7 @@ FindNextMemoryNodeReg (
> DEBUG ((
> DEBUG_WARN,
> "%a: ignoring memory node with no 'reg' property\n",
> - __FUNCTION__
> + __func__
> ));
> continue;
> }
> @@ -288,7 +288,7 @@ FindNextMemoryNodeReg (
> DEBUG ((
> DEBUG_WARN,
> "%a: ignoring memory node with invalid 'reg' property (size ==
> 0x%x)\n",
> - __FUNCTION__,
> + __func__,
> *RegSize
> ));
> continue;
> @@ -391,7 +391,7 @@ OnPlatformHasDeviceTree (
> DEBUG ((
> DEBUG_INFO,
> "%a: exposing DTB @ 0x%p to OS\n",
> - __FUNCTION__,
> + __func__,
> DeviceTreeBase
> ));
> Status = gBS->InstallConfigurationTable (&gFdtTableGuid, DeviceTreeBase);
> @@ -424,7 +424,7 @@ InitializeFdtClientDxe (
> DEBUG ((
> DEBUG_ERROR,
> "%a: No DTB found @ 0x%p\n",
> - __FUNCTION__,
> + __func__,
> DeviceTreeBase
> ));
> return EFI_NOT_FOUND;
> @@ -432,7 +432,7 @@ InitializeFdtClientDxe (
>
> mDeviceTreeBase = DeviceTreeBase;
>
> - DEBUG ((DEBUG_INFO, "%a: DTB @ 0x%p\n", __FUNCTION__,
> mDeviceTreeBase));
> + DEBUG ((DEBUG_INFO, "%a: DTB @ 0x%p\n", __func__,
> mDeviceTreeBase));
>
> //
> // Register a protocol notify for the EDKII Platform Has Device Tree @@ -
> 446,7 +446,7 @@ InitializeFdtClientDxe (
> &PlatformHasDeviceTreeEvent
> );
> if (EFI_ERROR (Status)) {
> - DEBUG ((DEBUG_ERROR, "%a: CreateEvent(): %r\n", __FUNCTION__,
> Status));
> + DEBUG ((DEBUG_ERROR, "%a: CreateEvent(): %r\n", __func__, Status));
> return Status;
> }
>
> @@ -459,7 +459,7 @@ InitializeFdtClientDxe (
> DEBUG ((
> DEBUG_ERROR,
> "%a: RegisterProtocolNotify(): %r\n",
> - __FUNCTION__,
> + __func__,
> Status
> ));
> goto CloseEvent;
> @@ -470,7 +470,7 @@ InitializeFdtClientDxe (
> //
> Status = gBS->SignalEvent (PlatformHasDeviceTreeEvent);
> if (EFI_ERROR (Status)) {
> - DEBUG ((DEBUG_ERROR, "%a: SignalEvent(): %r\n", __FUNCTION__,
> Status));
> + DEBUG ((DEBUG_ERROR, "%a: SignalEvent(): %r\n", __func__, Status));
> goto CloseEvent;
> }
>
> @@ -484,7 +484,7 @@ InitializeFdtClientDxe (
> DEBUG ((
> DEBUG_ERROR,
> "%a: InstallProtocolInterface(): %r\n",
> - __FUNCTION__,
> + __func__,
> Status
> ));
> goto CloseEvent;
> diff --git
> a/EmbeddedPkg/Library/NonCoherentDmaLib/NonCoherentDmaLib.c
> b/EmbeddedPkg/Library/NonCoherentDmaLib/NonCoherentDmaLib.c
> index 44a78c947ef4..e193352fbe41 100644
> --- a/EmbeddedPkg/Library/NonCoherentDmaLib/NonCoherentDmaLib.c
> +++ b/EmbeddedPkg/Library/NonCoherentDmaLib/NonCoherentDmaLib.c
> @@ -349,7 +349,7 @@ DmaMap (
> "%a: Operation type 'MapOperationBusMasterCommonBuffer' is only "
> "supported\non memory regions that were allocated using "
> "DmaAllocateBuffer ()\n",
> - __FUNCTION__
> + __func__
> ));
> Status = EFI_UNSUPPORTED;
> FreeMapInfo:
> diff --git a/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClock.c
> b/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClock.c
> index 7adb7324057e..17dde432c4eb 100644
> --- a/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClock.c
> +++ b/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClock.c
> @@ -219,7 +219,7 @@ InitializeRealTimeClock (
> DEBUG ((
> DEBUG_WARN,
> "%a: using default timezone/daylight settings\n",
> - __FUNCTION__
> + __func__
> ));
>
> mTimeSettings.TimeZone = EFI_UNSPECIFIED_TIMEZONE; diff --git
> a/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c
> b/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c
> index 86eb55800e5a..57388d9f461c 100755
> --- a/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c
> +++ b/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c
> @@ -414,13 +414,13 @@ InitializeSdMmcDevice (
>
> Status = MmcHost->SendCommand (MmcHost, MMC_CMD55, CmdArg);
> if (EFI_ERROR (Status)) {
> - DEBUG ((DEBUG_ERROR, "%a (MMC_CMD55): Error and Status = %r\n",
> __FUNCTION__, Status));
> + DEBUG ((DEBUG_ERROR, "%a (MMC_CMD55): Error and Status = %r\n",
> + __func__, Status));
> return Status;
> }
>
> Status = MmcHost->ReceiveResponse (MmcHost,
> MMC_RESPONSE_TYPE_R1, Response);
> if (EFI_ERROR (Status)) {
> - DEBUG ((DEBUG_ERROR, "%a (MMC_CMD55): Error and Status = %r\n",
> __FUNCTION__, Status));
> + DEBUG ((DEBUG_ERROR, "%a (MMC_CMD55): Error and Status = %r\n",
> + __func__, Status));
> return Status;
> }
>
> @@ -473,18 +473,18 @@ InitializeSdMmcDevice (
> CmdArg = CreateSwitchCmdArgument (0, 0, 0);
> Status = MmcHost->SendCommand (MmcHost, MMC_CMD6, CmdArg);
> if (EFI_ERROR (Status)) {
> - DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): Error and Status = %r\n",
> __FUNCTION__, Status));
> + DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): Error and Status = %r\n",
> + __func__, Status));
> return Status;
> } else {
> Status = MmcHost->ReadBlockData (MmcHost, 0,
> SWITCH_CMD_DATA_LENGTH, Buffer);
> if (EFI_ERROR (Status)) {
> - DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): ReadBlockData Error and
> Status = %r\n", __FUNCTION__, Status));
> + DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): ReadBlockData Error and
> + Status = %r\n", __func__, Status));
> return Status;
> }
> }
>
> if (!(Buffer[3] & SD_HIGH_SPEED_SUPPORTED)) {
> - DEBUG ((DEBUG_INFO, "%a : High Speed not supported by Card\n",
> __FUNCTION__));
> + DEBUG ((DEBUG_INFO, "%a : High Speed not supported by Card\n",
> + __func__));
> } else {
> Speed = SD_HIGH_SPEED;
>
> @@ -492,12 +492,12 @@ InitializeSdMmcDevice (
> CmdArg = CreateSwitchCmdArgument (1, 0, 1);
> Status = MmcHost->SendCommand (MmcHost, MMC_CMD6, CmdArg);
> if (EFI_ERROR (Status)) {
> - DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): Error and Status = %r\n",
> __FUNCTION__, Status));
> + DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): Error and Status = %r\n",
> + __func__, Status));
> return Status;
> } else {
> Status = MmcHost->ReadBlockData (MmcHost, 0,
> SWITCH_CMD_DATA_LENGTH, Buffer);
> if (EFI_ERROR (Status)) {
> - DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): ReadBlockData Error and
> Status = %r\n", __FUNCTION__, Status));
> + DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): ReadBlockData Error and
> + Status = %r\n", __func__, Status));
> return Status;
> }
>
> @@ -513,14 +513,14 @@ InitializeSdMmcDevice (
> CmdArg = MmcHostInstance->CardInfo.RCA << 16;
> Status = MmcHost->SendCommand (MmcHost, MMC_CMD55, CmdArg);
> if (EFI_ERROR (Status)) {
> - DEBUG ((DEBUG_ERROR, "%a (MMC_CMD55): Error and Status = %r\n",
> __FUNCTION__, Status));
> + DEBUG ((DEBUG_ERROR, "%a (MMC_CMD55): Error and Status = %r\n",
> + __func__, Status));
> return Status;
> }
>
> /* Width: 4 */
> Status = MmcHost->SendCommand (MmcHost, MMC_CMD6, 2);
> if (EFI_ERROR (Status)) {
> - DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): Error and Status = %r\n",
> __FUNCTION__, Status));
> + DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): Error and Status = %r\n",
> + __func__, Status));
> return Status;
> }
> }
> @@ -528,7 +528,7 @@ InitializeSdMmcDevice (
> if (MMC_HOST_HAS_SETIOS (MmcHost)) {
> Status = MmcHost->SetIos (MmcHost, Speed, BUSWIDTH_4,
> EMMCBACKWARD);
> if (EFI_ERROR (Status)) {
> - DEBUG ((DEBUG_ERROR, "%a (SetIos): Error and Status = %r\n",
> __FUNCTION__, Status));
> + DEBUG ((DEBUG_ERROR, "%a (SetIos): Error and Status = %r\n",
> + __func__, Status));
> return Status;
> }
> }
> --
> 2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#102676): https://edk2.groups.io/g/devel/message/102676
Mute This Topic: https://groups.io/mt/98115243/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
