VirtualBox

Ignore:
Timestamp:
Sep 27, 2023 1:34:02 PM (17 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
159276
Message:

EFI/FirmwareNew: Make edk2-stable202308 build on all supported platforms (using gcc at least, msvc not tested yet), bugref:4643

Location:
trunk/src/VBox/Devices/EFI/FirmwareNew
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/EFI/FirmwareNew

  • trunk/src/VBox/Devices/EFI/FirmwareNew/PrmPkg/Application/PrmInfo/PrmInfo.c

    r99404 r101291  
    494494        "%a - %a: An error occurred creating a context buffer for handler %g\n",
    495495        gEfiCallerBaseName,
    496         __FUNCTION__,
     496        __func__,
    497497        HandlerContext->Guid
    498498        ));
    … …  
    629629      "%a - %a: An error occurred during PRM module discovery (%r)\n",
    630630      gEfiCallerBaseName,
    631       __FUNCTION__,
     631      __func__,
    632632      Status
    633633      ));
    … …  
    720720      "%a - %a: An error occurred parsing user-provided arguments (%r)\n",
    721721      gEfiCallerBaseName,
    722       __FUNCTION__,
     722      __func__,
    723723      Status
    724724      ));

  • trunk/src/VBox/Devices/EFI/FirmwareNew/PrmPkg/Library/DxePrmContextBufferLib/DxePrmContextBufferLib.c

    r99404 r101291  
    4141  UINTN  Index;
    4242
    43   DEBUG ((DEBUG_INFO, "    %a %a - Entry.\n", _DBGMSGID_, __FUNCTION__));
     43  DEBUG ((DEBUG_INFO, "    %a %a - Entry.\n", _DBGMSGID_, __func__));
    4444
    4545  if ((HandlerGuid == NULL) || (ModuleContextBuffers == NULL) || (ContextBuffer == NULL)) {
    … …  
    9090  CONST PRM_CONTEXT_BUFFER  *PrmContextBuffer;
    9191
    92   DEBUG ((DEBUG_INFO, "    %a %a - Entry.\n", _DBGMSGID_, __FUNCTION__));
     92  DEBUG ((DEBUG_INFO, "    %a %a - Entry.\n", _DBGMSGID_, __func__));
    9393
    9494  if ((Guid == NULL) || (PrmModuleContextBuffers == NULL)) {
    … …  
    123123            "      %a %a: Found a PRM configuration protocol for PRM module %g.\n",
    124124            _DBGMSGID_,
    125             __FUNCTION__,
     125            __func__,
    126126            Guid
    127127            ));
    … …  
    144144    "      %a %a: Could not locate a PRM configuration protocol for PRM handler %g.\n",
    145145    _DBGMSGID_,
    146     __FUNCTION__,
     146    __func__,
    147147    Guid
    148148    ));
    … …  
    177177  CONST PRM_MODULE_CONTEXT_BUFFERS  *ContextBuffers;
    178178
    179   DEBUG ((DEBUG_INFO, "    %a %a - Entry.\n", _DBGMSGID_, __FUNCTION__));
     179  DEBUG ((DEBUG_INFO, "    %a %a - Entry.\n", _DBGMSGID_, __func__));
    180180
    181181  if ((PrmHandlerGuid == NULL) || (PrmContextBuffer == NULL)) {

  • trunk/src/VBox/Devices/EFI/FirmwareNew/PrmPkg/Library/DxePrmContextBufferLib/UnitTest/DxePrmContextBufferLibUnitTest.c

    r99404 r101291  
    385385    UT_LOG_INFO (
    386386      "%a: Searching by %a GUID ({%g}) returned ContextBuffers at 0x%x\n",
    387       __FUNCTION__,
     387      __func__,
    388388      ((TestContext->GuidSearchType == ByModuleGuid) ? "module" : "handler"),
    389389      TestContext->Guid,

  • trunk/src/VBox/Devices/EFI/FirmwareNew/PrmPkg/Library/DxePrmContextBufferLib/UnitTest/DxePrmContextBufferLibUnitTestHost.inf

    r99404 r101291  
    1818# The following information is for reference only and not required by the build tools.
    1919#
    20 #  VALID_ARCHITECTURES           = IA32 X64 ARM AARCH64
     20#  VALID_ARCHITECTURES           = IA32 X64
    2121#
    2222

  • trunk/src/VBox/Devices/EFI/FirmwareNew/PrmPkg/Library/DxePrmModuleDiscoveryLib/DxePrmModuleDiscoveryLib.c

    r99404 r101291  
    4949  PRM_MODULE_IMAGE_CONTEXT_LIST_ENTRY  *ForwardListEntry;
    5050
    51   DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __FUNCTION__));
     51  DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __func__));
    5252
    5353  if (ModuleImageContext == NULL) {
    … …  
    9595  PRM_MODULE_IMAGE_CONTEXT_LIST_ENTRY  *PrmModuleImageContextListEntry;
    9696
    97   DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __FUNCTION__));
     97  DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __func__));
    9898
    9999  PrmModuleImageContextListEntry = AllocateZeroPool (sizeof (*PrmModuleImageContextListEntry));
    … …  
    106106    "  %a %a: Allocated PrmModuleImageContextListEntry at 0x%x of size 0x%x bytes.\n",
    107107    _DBGMSGID_,
    108     __FUNCTION__,
     108    __func__,
    109109    (UINTN)PrmModuleImageContextListEntry,
    110110    sizeof (*PrmModuleImageContextListEntry)
    … …  
    187187  UINTN                                MmramRangeCount;
    188188
    189   DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __FUNCTION__));
     189  DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __func__));
    190190
    191191  PrmHandlerCount = 0;
    … …  
    204204                  );
    205205  if (EFI_ERROR (Status) && (HandleCount == 0)) {
    206     DEBUG ((DEBUG_ERROR, "%a %a: No LoadedImageProtocol instances found!\n", _DBGMSGID_, __FUNCTION__));
     206    DEBUG ((DEBUG_ERROR, "%a %a: No LoadedImageProtocol instances found!\n", _DBGMSGID_, __func__));
    207207    return EFI_NOT_FOUND;
    208208  }
    … …  
    256256        "%a %a: ImageHandle 0x%016lx is not a valid PE/COFF image. It cannot be considered a PRM module.\n",
    257257        _DBGMSGID_,
    258         __FUNCTION__,
     258        __func__,
    259259        (EFI_PHYSICAL_ADDRESS)(UINTN)LoadedImageProtocol->ImageBase
    260260        ));
    … …  
    305305    PrmHandlerCount += TempPrmModuleImageContext.ExportDescriptor->Header.NumberPrmHandlers;
    306306    PrmModuleCount++;
    307     DEBUG ((DEBUG_INFO, "%a %a: New PRM Module inserted into list to be processed.\n", _DBGMSGID_, __FUNCTION__));
     307    DEBUG ((DEBUG_INFO, "%a %a: New PRM Module inserted into list to be processed.\n", _DBGMSGID_, __func__));
    308308  }
    309309

  • trunk/src/VBox/Devices/EFI/FirmwareNew/PrmPkg/Library/DxePrmModuleDiscoveryLib/UnitTest/DxePrmModuleDiscoveryLibUnitTestHost.inf

    r99404 r101291  
    1818# The following information is for reference only and not required by the build tools.
    1919#
    20 #  VALID_ARCHITECTURES           = IA32 X64 ARM AARCH64
     20#  VALID_ARCHITECTURES           = IA32 X64
    2121#
    2222

  • trunk/src/VBox/Devices/EFI/FirmwareNew/PrmPkg/Library/DxePrmPeCoffLib/DxePrmPeCoffLib.c

    r99404 r101291  
    5252  PRM_MODULE_EXPORT_DESCRIPTOR_STRUCT  *TempExportDescriptor;
    5353
    54   DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __FUNCTION__));
     54  DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __func__));
    5555
    5656  if ((ImageExportDirectory == NULL) ||
    … …  
    6868    "  %a %a: %d exported names found in this image.\n",
    6969    _DBGMSGID_,
    70     __FUNCTION__,
     70    __func__,
    7171    ImageExportDirectory->NumberOfNames
    7272    ));
    … …  
    8686      "  %a %a: Export Name[0x%x] - %a.\n",
    8787      _DBGMSGID_,
    88       __FUNCTION__,
     88      __func__,
    8989      Index,
    9090      CurrentExportName
    … …  
    102102        "  %a %a: PRM Module Export Descriptor found. Ordinal = %d.\n",
    103103        _DBGMSGID_,
    104         __FUNCTION__,
     104        __func__,
    105105        PrmModuleExportDescriptorOrdinal
    106106        ));
    107107      if (PrmModuleExportDescriptorOrdinal >= ImageExportDirectory->NumberOfFunctions) {
    108         DEBUG ((DEBUG_ERROR, "%a %a: The PRM Module Export Descriptor ordinal value is invalid.\n", _DBGMSGID_, __FUNCTION__));
     108        DEBUG ((DEBUG_ERROR, "%a %a: The PRM Module Export Descriptor ordinal value is invalid.\n", _DBGMSGID_, __func__));
    109109        return EFI_NOT_FOUND;
    110110      }
    … …  
    113113      if (TempExportDescriptor->Header.Signature == PRM_MODULE_EXPORT_DESCRIPTOR_SIGNATURE) {
    114114        *ExportDescriptor = TempExportDescriptor;
    115         DEBUG ((DEBUG_INFO, "  %a %a: PRM Module Export Descriptor found at 0x%x.\n", _DBGMSGID_, __FUNCTION__, (UINTN)ExportDescriptor));
     115        DEBUG ((DEBUG_INFO, "  %a %a: PRM Module Export Descriptor found at 0x%x.\n", _DBGMSGID_, __func__, (UINTN)ExportDescriptor));
    116116      } else {
    117117        DEBUG ((
    … …  
    119119          "  %a %a: PRM Module Export Descriptor found at 0x%x but signature check failed.\n",
    120120          _DBGMSGID_,
    121           __FUNCTION__,
     121          __func__,
    122122          (UINTN)TempExportDescriptor
    123123          ));
    124124      }
    125125
    126       DEBUG ((DEBUG_INFO, "  %a %a: Exiting export iteration since export descriptor found.\n", _DBGMSGID_, __FUNCTION__));
     126      DEBUG ((DEBUG_INFO, "  %a %a: Exiting export iteration since export descriptor found.\n", _DBGMSGID_, __func__));
    127127      return EFI_SUCCESS;
    128128    }
    … …  
    195195        "%a %a: The machine type for this image is not valid for a PRM module.\n",
    196196        _DBGMSGID_,
    197         __FUNCTION__
     197        __func__
    198198        ));
    199199      return EFI_UNSUPPORTED;
    … …  
    209209  //
    210210  if (OptionalHeaderPtrUnion.Pe32->Signature != EFI_IMAGE_NT_SIGNATURE) {
    211     DEBUG ((DEBUG_ERROR, "%a %a: The PE signature is not valid for the current image.\n", _DBGMSGID_, __FUNCTION__));
     211    DEBUG ((DEBUG_ERROR, "%a %a: The PE signature is not valid for the current image.\n", _DBGMSGID_, __func__));
    212212    return EFI_UNSUPPORTED;
    213213  }
    … …  
    238238    // The directory address overflows
    239239    //
    240     DEBUG ((DEBUG_ERROR, "%a %a: The export directory entry in this image results in overflow.\n", _DBGMSGID_, __FUNCTION__));
     240    DEBUG ((DEBUG_ERROR, "%a %a: The export directory entry in this image results in overflow.\n", _DBGMSGID_, __func__));
    241241    return EFI_UNSUPPORTED;
    242242  } else {
    243     DEBUG ((DEBUG_INFO, "%a %a: Export Directory Entry found in the image at 0x%x.\n", _DBGMSGID_, __FUNCTION__, (UINTN)OptionalHeaderPtrUnion.Pe32));
    244     DEBUG ((DEBUG_INFO, "  %a %a: Directory Entry Virtual Address = 0x%x.\n", _DBGMSGID_, __FUNCTION__, DirectoryEntry->VirtualAddress));
     243    DEBUG ((DEBUG_INFO, "%a %a: Export Directory Entry found in the image at 0x%x.\n", _DBGMSGID_, __func__, (UINTN)OptionalHeaderPtrUnion.Pe32));
     244    DEBUG ((DEBUG_INFO, "  %a %a: Directory Entry Virtual Address = 0x%x.\n", _DBGMSGID_, __func__, DirectoryEntry->VirtualAddress));
    245245
    246246    ExportDirectory = (EFI_IMAGE_EXPORT_DIRECTORY *)((UINTN)Image + DirectoryEntry->VirtualAddress);
    … …  
    249249      "  %a %a: Export Directory Table found successfully at 0x%x. Name address = 0x%x. Name = %a.\n",
    250250      _DBGMSGID_,
    251       __FUNCTION__,
     251      __func__,
    252252      (UINTN)ExportDirectory,
    253253      ((UINTN)Image + ExportDirectory->Name),
    … …  
    288288  UINT16                               Magic;
    289289
    290   DEBUG ((DEBUG_INFO, "    %a %a - Entry.\n", _DBGMSGID_, __FUNCTION__));
     290  DEBUG ((DEBUG_INFO, "    %a %a - Entry.\n", _DBGMSGID_, __func__));
    291291
    292292  if ((Image == NULL) || (PeCoffLoaderImageContext == NULL) || (ImageMajorVersion == NULL) || (ImageMinorVersion == NULL)) {
    … …  
    321321        "%a %a: The machine type for this image is not valid for a PRM module.\n",
    322322        _DBGMSGID_,
    323         __FUNCTION__
     323        __func__
    324324        ));
    325325      return EFI_UNSUPPORTED;
    … …  
    334334  //
    335335  if (OptionalHeaderPtrUnion.Pe32->Signature != EFI_IMAGE_NT_SIGNATURE) {
    336     DEBUG ((DEBUG_ERROR, "%a %a: The PE signature is not valid for the current image.\n", _DBGMSGID_, __FUNCTION__));
     336    DEBUG ((DEBUG_ERROR, "%a %a: The PE signature is not valid for the current image.\n", _DBGMSGID_, __func__));
    337337    return EFI_UNSUPPORTED;
    338338  }
    … …  
    352352  }
    353353
    354   DEBUG ((DEBUG_INFO, "      %a %a - Image Major Version: 0x%02x.\n", _DBGMSGID_, __FUNCTION__, *ImageMajorVersion));
    355   DEBUG ((DEBUG_INFO, "      %a %a - Image Minor Version: 0x%02x.\n", _DBGMSGID_, __FUNCTION__, *ImageMinorVersion));
     354  DEBUG ((DEBUG_INFO, "      %a %a - Image Major Version: 0x%02x.\n", _DBGMSGID_, __func__, *ImageMajorVersion));
     355  DEBUG ((DEBUG_INFO, "      %a %a - Image Minor Version: 0x%02x.\n", _DBGMSGID_, __func__, *ImageMinorVersion));
    356356
    357357  return EFI_SUCCESS;
    … …  
    405405      ASSERT (CurrentExportOrdinal < ImageExportDirectory->NumberOfFunctions);
    406406      if (CurrentExportOrdinal >= ImageExportDirectory->NumberOfFunctions) {
    407         DEBUG ((DEBUG_ERROR, "  %a %a: The export ordinal value is invalid.\n", _DBGMSGID_, __FUNCTION__));
     407        DEBUG ((DEBUG_ERROR, "  %a %a: The export ordinal value is invalid.\n", _DBGMSGID_, __func__));
    408408        break;
    409409      }

  • trunk/src/VBox/Devices/EFI/FirmwareNew/PrmPkg/PrmConfigDxe/PrmConfigDxe.c

    r99404 r101291  
    7272  EFI_GCD_MEMORY_SPACE_DESCRIPTOR  Descriptor;
    7373
    74   DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __FUNCTION__));
     74  DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __func__));
    7575
    7676  if ((RuntimeMmioRanges == NULL) || (RuntimeMmioRanges->Count == 0)) {
    … …  
    8383      "      %a %a: Runtime MMIO Range [%d].\n",
    8484      _DBGMSGID_,
    85       __FUNCTION__,
     85      __func__,
    8686      Index
    8787      ));
    … …  
    9090      "      %a %a: Physical address = 0x%016x. Length = 0x%x.\n",
    9191      _DBGMSGID_,
    92       __FUNCTION__,
     92      __func__,
    9393      RuntimeMmioRanges->Range[Index].PhysicalBaseAddress,
    9494      RuntimeMmioRanges->Range[Index].Length
    … …  
    142142        "      %a %a: Error [%r] finding descriptor for runtime memory range 0x%016x.\n",
    143143        _DBGMSGID_,
    144         __FUNCTION__,
     144        __func__,
    145145        Status,
    146146        RuntimeMmioRanges->Range[Index].PhysicalBaseAddress
    … …  
    164164        "      %a %a: Error [%r] setting descriptor for runtime memory range 0x%016x.\n",
    165165        _DBGMSGID_,
    166         __FUNCTION__,
     166        __func__,
    167167        Status,
    168168        RuntimeMmioRanges->Range[Index].PhysicalBaseAddress
    169169        ));
    170170    } else {
    171       DEBUG ((DEBUG_INFO, "      %a %a: Successfully set runtime attribute for the MMIO range.\n", _DBGMSGID_, __FUNCTION__));
     171      DEBUG ((DEBUG_INFO, "      %a %a: Successfully set runtime attribute for the MMIO range.\n", _DBGMSGID_, __func__));
    172172    }
    173173  }
    … …  
    190190  PRM_CONFIG_PROTOCOL  *PrmConfigProtocol;
    191191
    192   DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __FUNCTION__));
     192  DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __func__));
    193193
    194194  RangeIndex = 0;
    … …  
    200200      "  %a %a: Memory allocation for runtime MMIO pointer array failed.\n",
    201201      _DBGMSGID_,
    202       __FUNCTION__
     202      __func__
    203203      ));
    204204    ASSERT (FALSE);
    … …  
    233233            "  %a %a: Index out of bounds - Actual count (%d) of runtime MMIO ranges exceeds maximum count (%d).\n",
    234234            _DBGMSGID_,
    235             __FUNCTION__,
     235            __func__,
    236236            RangeIndex + 1,
    237237            mMaxRuntimeMmioRangeCount
    … …  
    249249      "  %a %a: %d MMIO ranges buffers saved for future virtual memory conversion.\n",
    250250      _DBGMSGID_,
    251       __FUNCTION__,
     251      __func__,
    252252      RangeIndex
    253253      ));
    … …  
    278278
    279279  if (PrmDataBuffer->Header.Signature != PRM_DATA_BUFFER_HEADER_SIGNATURE) {
    280     DEBUG ((DEBUG_ERROR, "  %a %a: The PRM data buffer signature is invalid. PRM module.\n", _DBGMSGID_, __FUNCTION__));
     280    DEBUG ((DEBUG_ERROR, "  %a %a: The PRM data buffer signature is invalid. PRM module.\n", _DBGMSGID_, __func__));
    281281    return EFI_NOT_FOUND;
    282282  }
    283283
    284284  if (PrmDataBuffer->Header.Length < sizeof (PRM_DATA_BUFFER_HEADER)) {
    285     DEBUG ((DEBUG_ERROR, "  %a %a: The PRM data buffer length is invalid.\n", _DBGMSGID_, __FUNCTION__));
     285    DEBUG ((DEBUG_ERROR, "  %a %a: The PRM data buffer length is invalid.\n", _DBGMSGID_, __func__));
    286286    return EFI_BUFFER_TOO_SMALL;
    287287  }
    … …  
    312312
    313313  if (PrmContextBuffer->Signature != PRM_CONTEXT_BUFFER_SIGNATURE) {
    314     DEBUG ((DEBUG_ERROR, "  %a %a: The PRM context buffer signature is invalid.\n", _DBGMSGID_, __FUNCTION__));
     314    DEBUG ((DEBUG_ERROR, "  %a %a: The PRM context buffer signature is invalid.\n", _DBGMSGID_, __func__));
    315315    return EFI_NOT_FOUND;
    316316  }
    317317
    318318  if (IsZeroGuid (&PrmContextBuffer->HandlerGuid)) {
    319     DEBUG ((DEBUG_ERROR, "  %a %a: The PRM context buffer GUID is zero.\n", _DBGMSGID_, __FUNCTION__));
     319    DEBUG ((DEBUG_ERROR, "  %a %a: The PRM context buffer GUID is zero.\n", _DBGMSGID_, __func__));
    320320    return EFI_NOT_FOUND;
    321321  }
    … …  
    326326      "    %a %a: Error in static buffer for PRM handler %g.\n",
    327327      _DBGMSGID_,
    328       __FUNCTION__,
     328      __func__,
    329329      &PrmContextBuffer->HandlerGuid
    330330      ));
    … …  
    388388  PRM_CONFIG_PROTOCOL  *PrmConfigProtocol;
    389389
    390   DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __FUNCTION__));
     390  DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __func__));
    391391
    392392  HandleBuffer = NULL;
    … …  
    414414        "  %a %a: Found PRM configuration protocol for PRM module %g.\n",
    415415        _DBGMSGID_,
    416         __FUNCTION__,
     416        __func__,
    417417        &PrmConfigProtocol->ModuleContextBuffers.ModuleGuid
    418418        ));
    419419
    420       DEBUG ((DEBUG_INFO, "      %a %a: Validating module context buffers...\n", _DBGMSGID_, __FUNCTION__));
     420      DEBUG ((DEBUG_INFO, "      %a %a: Validating module context buffers...\n", _DBGMSGID_, __func__));
    421421      for (BufferIndex = 0; BufferIndex < PrmConfigProtocol->ModuleContextBuffers.BufferCount; BufferIndex++) {
    422422        CurrentContextBuffer = &(PrmConfigProtocol->ModuleContextBuffers.Buffer[BufferIndex]);
    … …  
    428428            "        %a %a: Context buffer validation failed for PRM handler %g.\n",
    429429            _DBGMSGID_,
    430             __FUNCTION__,
     430            __func__,
    431431            CurrentContextBuffer->HandlerGuid
    432432            ));
    … …  
    434434      }
    435435
    436       DEBUG ((DEBUG_INFO, "      %a %a: Module context buffer validation complete.\n", _DBGMSGID_, __FUNCTION__));
     436      DEBUG ((DEBUG_INFO, "      %a %a: Module context buffer validation complete.\n", _DBGMSGID_, __func__));
    437437
    438438      if (PrmConfigProtocol->ModuleContextBuffers.RuntimeMmioRanges != NULL) {
    … …  
    441441          "    %a %a: Found %d PRM runtime MMIO ranges.\n",
    442442          _DBGMSGID_,
    443           __FUNCTION__,
     443          __func__,
    444444          PrmConfigProtocol->ModuleContextBuffers.RuntimeMmioRanges->Count
    445445          ));
    … …  
    479479  EFI_EVENT   Event;
    480480
    481   DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __FUNCTION__));
     481  DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __func__));
    482482
    483483  //

  • trunk/src/VBox/Devices/EFI/FirmwareNew/PrmPkg/PrmLoaderDxe/PrmLoaderDxe.c

    r99404 r101291  
    7474  UINT64  HandlerPhysicalAddress;
    7575
    76   DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __FUNCTION__));
     76  DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __func__));
    7777
    7878  if (PrmAcpiDescriptionTable == NULL) {
    … …  
    9090      "  %a %a: The Platform GUID in the DSC file must be set to a unique non-zero value.\n",
    9191      _DBGMSGID_,
    92       __FUNCTION__
     92      __func__
    9393      ));
    9494    ASSERT (!CompareGuid (&gEdkiiDscPlatformGuid, &gZeroGuid));
    9595  }
    9696
    97   DEBUG ((DEBUG_INFO, "  %a %a: %d total PRM modules to process.\n", _DBGMSGID_, __FUNCTION__, mPrmModuleCount));
    98   DEBUG ((DEBUG_INFO, "  %a %a: %d total PRM handlers to process.\n", _DBGMSGID_, __FUNCTION__, mPrmHandlerCount));
     97  DEBUG ((DEBUG_INFO, "  %a %a: %d total PRM modules to process.\n", _DBGMSGID_, __func__, mPrmModuleCount));
     98  DEBUG ((DEBUG_INFO, "  %a %a: %d total PRM handlers to process.\n", _DBGMSGID_, __func__, mPrmHandlerCount));
    9999
    100100  PrmAcpiDescriptionTableBufferSize = (UINT32)(OFFSET_OF (PRM_ACPI_DESCRIPTION_TABLE, PrmModuleInfoStructure) +
    … …  
    102102                                               (sizeof (PRM_HANDLER_INFORMATION_STRUCT) * mPrmHandlerCount)
    103103                                               );
    104   DEBUG ((DEBUG_INFO, "  %a %a: Total PRM ACPI table size: 0x%x.\n", _DBGMSGID_, __FUNCTION__, PrmAcpiDescriptionTableBufferSize));
     104  DEBUG ((DEBUG_INFO, "  %a %a: Total PRM ACPI table size: 0x%x.\n", _DBGMSGID_, __func__, PrmAcpiDescriptionTableBufferSize));
    105105
    106106  PrmAcpiTable = AllocateZeroPool ((UINTN)PrmAcpiDescriptionTableBufferSize);
    … …  
    140140      "  %a %a: PRM Module - %a with %d handlers.\n",
    141141      _DBGMSGID_,
    142       __FUNCTION__,
     142      __func__,
    143143      (CHAR8 *)((UINTN)CurrentImageAddress + CurrentImageExportDirectory->Name),
    144144      CurrentExportDescriptorStruct->Header.NumberPrmHandlers
    … …  
    213213          "    %a %a: Found %a handler physical address at 0x%016x.\n",
    214214          _DBGMSGID_,
    215           __FUNCTION__,
     215          __func__,
    216216          CurrentExportDescriptorHandlerName,
    217217          CurrentHandlerInfoStruct->PhysicalAddress
    … …  
    280280                                  );
    281281    if (!EFI_ERROR (Status)) {
    282       DEBUG ((DEBUG_INFO, "%a %a: The PRMT ACPI table was installed successfully.\n", _DBGMSGID_, __FUNCTION__));
     282      DEBUG ((DEBUG_INFO, "%a %a: The PRMT ACPI table was installed successfully.\n", _DBGMSGID_, __func__));
    283283    }
    284284  }
    … …  
    317317  PRM_ACPI_DESCRIPTION_TABLE  *PrmAcpiDescriptionTable;
    318318
    319   DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __FUNCTION__));
     319  DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __func__));
    320320
    321321  Status = DiscoverPrmModules (&mPrmModuleCount, &mPrmHandlerCount);
    … …  
    355355  EFI_EVENT   EndOfDxeEvent;
    356356
    357   DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __FUNCTION__));
     357  DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __func__));
    358358
    359359  //
    … …  
    370370                  );
    371371  if (EFI_ERROR (Status)) {
    372     DEBUG ((DEBUG_ERROR, "%a %a: EndOfDxe callback registration failed! %r.\n", _DBGMSGID_, __FUNCTION__, Status));
     372    DEBUG ((DEBUG_ERROR, "%a %a: EndOfDxe callback registration failed! %r.\n", _DBGMSGID_, __func__, Status));
    373373    ASSERT_EFI_ERROR (Status);
    374374  }

  • trunk/src/VBox/Devices/EFI/FirmwareNew/PrmPkg/PrmSsdtInstallDxe/PrmSsdtInstallDxe.c

    r99404 r101291  
    4343  EFI_ACPI_DESCRIPTION_HEADER  *Ssdt;
    4444
    45   DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __FUNCTION__));
     45  DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __func__));
    4646
    4747  if (OemId == NULL) {
    … …  
    6262                );
    6363    ASSERT_EFI_ERROR (Status);
    64     DEBUG ((DEBUG_INFO, "%a %a: SSDT loaded...\n", _DBGMSGID_, __FUNCTION__));
     64    DEBUG ((DEBUG_INFO, "%a %a: SSDT loaded...\n", _DBGMSGID_, __func__));
    6565
    6666    //
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette