MdePkg: consistently use "Property" in BaseFdtLib

There is currently a mix on functions named as Prop or Property.
The latter is in majority, and the better fit for tianocore coding style,
so rename FdtNodeOffsetByPropValue () and FdtSetProp () for consistency.

To avoid breaking bisect, change existing users in UefiPayloadPkg.

Continuous-integration-options: PatchCheck.ignore-multi-package
Signed-off-by: Leif Lindholm <quic_llindhol@quicinc.com>

1 files changed, 52 insertions, 52 deletions

diff --git a/UefiPayloadPkg/Library/BuildFdtLib/X86_BuildFdtLib.c b/UefiPayloadPkg/Library/BuildFdtLib/X86_BuildFdtLib.c
index 8df78a0afc..d7d44df78a 100644
--- a/UefiPayloadPkg/Library/BuildFdtLib/X86_BuildFdtLib.c
+++ b/UefiPayloadPkg/Library/BuildFdtLib/X86_BuildFdtLib.c
@@ -119,10 +119,10 @@ BuildFdtForMemory (
 

         RegTmp[0] = CpuToFdt64 (ResourceHob->PhysicalStart);

         RegTmp[1] = CpuToFdt64 (ResourceHob->ResourceLength);

-        Status    = FdtSetProp (Fdt, TempNode, "reg", &RegTmp, sizeof (RegTmp));

+        Status    = FdtSetProperty (Fdt, TempNode, "reg", &RegTmp, sizeof (RegTmp));

         ASSERT_EFI_ERROR (Status);

 

-        Status = FdtSetProp (Fdt, TempNode, "device_type", "memory", (UINT32)(AsciiStrLen ("memory")+1));

+        Status = FdtSetProperty (Fdt, TempNode, "device_type", "memory", (UINT32)(AsciiStrLen ("memory")+1));

         ASSERT_EFI_ERROR (Status);

       }

     }

@@ -162,8 +162,8 @@ BuildFdtForMemAlloc (
   ASSERT (ParentNode > 0);

 

   Data32 = CpuToFdt32 (2);

-  Status = FdtSetProp (Fdt, ParentNode, "#address-cells", &Data32, sizeof (UINT32));

-  Status = FdtSetProp (Fdt, ParentNode, "#size-cells", &Data32, sizeof (UINT32));

+  Status = FdtSetProperty (Fdt, ParentNode, "#address-cells", &Data32, sizeof (UINT32));

+  Status = FdtSetProperty (Fdt, ParentNode, "#size-cells", &Data32, sizeof (UINT32));

 

   HobStart = GetFirstHob (EFI_HOB_TYPE_MEMORY_ALLOCATION);

   //

@@ -239,11 +239,11 @@ BuildFdtForMemAlloc (
 

       RegTmp[0] = CpuToFdt64 (Hob.MemoryAllocation->AllocDescriptor.MemoryBaseAddress);

       RegTmp[1] = CpuToFdt64 (Hob.MemoryAllocation->AllocDescriptor.MemoryLength);

-      Status    = FdtSetProp (Fdt, TempNode, "reg", &RegTmp, sizeof (RegTmp));

+      Status    = FdtSetProperty (Fdt, TempNode, "reg", &RegTmp, sizeof (RegTmp));

       ASSERT_EFI_ERROR (Status);

 

       if (!(AsciiStrCmp (mMemoryAllocType[AllocMemType], "mmio") == 0)) {

-        Status = FdtSetProp (Fdt, TempNode, "compatible", mMemoryAllocType[AllocMemType], (UINT32)(AsciiStrLen (mMemoryAllocType[AllocMemType])+1));

+        Status = FdtSetProperty (Fdt, TempNode, "compatible", mMemoryAllocType[AllocMemType], (UINT32)(AsciiStrLen (mMemoryAllocType[AllocMemType])+1));

         ASSERT_EFI_ERROR (Status);

       }

     }

@@ -285,7 +285,7 @@ BuildFdtForSerial (
   ASSERT (TempNode > 0);

 

   Data32 = CpuToFdt32 (PcdGet32 (PcdSerialBaudRate));

-  Status = FdtSetProp (Fdt, TempNode, "current-speed", &Data32, sizeof (Data32));

+  Status = FdtSetProperty (Fdt, TempNode, "current-speed", &Data32, sizeof (Data32));

   ASSERT_EFI_ERROR (Status);

 

   if (PcdGetBool (PcdSerialUseMmio)) {

@@ -300,14 +300,14 @@ BuildFdtForSerial (
   Data32     = (UINT32)((Data64 & 0x0FFFFFFFF));

   RegData[1] = CpuToFdt32 (Data32);

   RegData[2] = CpuToFdt32 (8);

-  Status     = FdtSetProp (Fdt, TempNode, "reg", &RegData, sizeof (RegData));

+  Status     = FdtSetProperty (Fdt, TempNode, "reg", &RegData, sizeof (RegData));

   ASSERT_EFI_ERROR (Status);

 

   Data32 = CpuToFdt32 (1);

-  Status = FdtSetProp (Fdt, TempNode, "reg-io-width", &Data32, sizeof (Data32));

+  Status = FdtSetProperty (Fdt, TempNode, "reg-io-width", &Data32, sizeof (Data32));

   ASSERT_EFI_ERROR (Status);

 

-  Status = FdtSetProp (Fdt, TempNode, "compatible", "isa", (UINT32)(AsciiStrLen ("isa")+1));

+  Status = FdtSetProperty (Fdt, TempNode, "compatible", "isa", (UINT32)(AsciiStrLen ("isa")+1));

   ASSERT_EFI_ERROR (Status);

 

   return Status;

@@ -360,19 +360,19 @@ BuildFdtForSerialLpss (
     ASSERT (TempNode > 0);

 

     Data32 = CpuToFdt32 (SerialPortInfo->BaudRate);

-    Status = FdtSetProp (Fdt, TempNode, "current-speed", &Data32, sizeof (Data32));

+    Status = FdtSetProperty (Fdt, TempNode, "current-speed", &Data32, sizeof (Data32));

     ASSERT_EFI_ERROR (Status);

 

     RegData[0] = CpuToFdt32 ((UINT32)SerialPortInfo->RegisterBase);

     RegData[1] = CpuToFdt32 (0x80);

-    Status     = FdtSetProp (Fdt, TempNode, "reg", &RegData, sizeof (RegData));

+    Status     = FdtSetProperty (Fdt, TempNode, "reg", &RegData, sizeof (RegData));

     ASSERT_EFI_ERROR (Status);

 

     Data32 = CpuToFdt32 (4);

-    Status = FdtSetProp (Fdt, TempNode, "reg-io-width", &Data32, sizeof (Data32));

+    Status = FdtSetProperty (Fdt, TempNode, "reg-io-width", &Data32, sizeof (Data32));

     ASSERT_EFI_ERROR (Status);

 

-    Status = FdtSetProp (Fdt, TempNode, "compatible", "ns16550a", (UINT32)(AsciiStrLen ("ns16550a")+1));

+    Status = FdtSetProperty (Fdt, TempNode, "compatible", "ns16550a", (UINT32)(AsciiStrLen ("ns16550a")+1));

     ASSERT_EFI_ERROR (Status);

 

     GuidHob = GET_NEXT_HOB (GuidHob);

@@ -588,7 +588,7 @@ BuildFdtForPciRootBridge (
       RegData[20] = CpuToFdt32 (Data32);

       DEBUG ((DEBUG_INFO, "PciRootBridge->Io.base size [20] %x, \n", Data32));

 

-      Status = FdtSetProp (Fdt, TempNode, "ranges", &RegData, sizeof (RegData));

+      Status = FdtSetProperty (Fdt, TempNode, "ranges", &RegData, sizeof (RegData));

       ASSERT_EFI_ERROR (Status);

 

       // non-reloc/non-prefetch/memory, child-addr, parent-addr, length

@@ -608,14 +608,14 @@ BuildFdtForPciRootBridge (
       DMARegData[6] = CpuToFdt32 (1);

       DMARegData[7] = CpuToFdt32 (0);

 

-      Status = FdtSetProp (Fdt, TempNode, "dma-ranges", &DMARegData, sizeof (DMARegData));

+      Status = FdtSetProperty (Fdt, TempNode, "dma-ranges", &DMARegData, sizeof (DMARegData));

       ASSERT_EFI_ERROR (Status);

 

       Data32 = CpuToFdt32 (2);

-      Status = FdtSetProp (Fdt, TempNode, "#size-cells", &Data32, sizeof (UINT32));

+      Status = FdtSetProperty (Fdt, TempNode, "#size-cells", &Data32, sizeof (UINT32));

 

       Data32 = CpuToFdt32 (3);

-      Status = FdtSetProp (Fdt, TempNode, "#address-cells", &Data32, sizeof (UINT32));

+      Status = FdtSetProperty (Fdt, TempNode, "#address-cells", &Data32, sizeof (UINT32));

 

       BusNumber = PciRootBridgeInfo->RootBridge[Index].Bus.Base & 0xFF;

       RegTmp[0] = CpuToFdt32 (BusNumber);

@@ -624,10 +624,10 @@ BuildFdtForPciRootBridge (
       DEBUG ((DEBUG_INFO, "PciRootBridge->BusNumber %x, \n", BusNumber));

       DEBUG ((DEBUG_INFO, "PciRootBridge->BusLimit  %x, \n", BusLimit));

 

-      Status = FdtSetProp (Fdt, TempNode, "bus-range", &RegTmp, sizeof (RegTmp));

+      Status = FdtSetProperty (Fdt, TempNode, "bus-range", &RegTmp, sizeof (RegTmp));

       ASSERT_EFI_ERROR (Status);

 

-      Status = FdtSetProp (Fdt, TempNode, "compatible", "pci-rb", (UINT32)(AsciiStrLen ("pci-rb")+1));

+      Status = FdtSetProperty (Fdt, TempNode, "compatible", "pci-rb", (UINT32)(AsciiStrLen ("pci-rb")+1));

       ASSERT_EFI_ERROR (Status);

 

       if (Index == 0) {

@@ -678,19 +678,19 @@ BuildFdtForPciRootBridge (
         }

 

         Data32 = CpuToFdt32 (PciData.Device.SubsystemID);

-        Status = FdtSetProp (Fdt, GmaNode, "subsystem-id", &Data32, sizeof (UINT32));

+        Status = FdtSetProperty (Fdt, GmaNode, "subsystem-id", &Data32, sizeof (UINT32));

 

         Data32 = CpuToFdt32 (PciData.Device.SubsystemVendorID);

-        Status = FdtSetProp (Fdt, GmaNode, "subsystem-vendor-id", &Data32, sizeof (UINT32));

+        Status = FdtSetProperty (Fdt, GmaNode, "subsystem-vendor-id", &Data32, sizeof (UINT32));

 

         Data32 = CpuToFdt32 (PciData.Hdr.RevisionID);

-        Status = FdtSetProp (Fdt, GmaNode, "revision-id", &Data32, sizeof (UINT32));

+        Status = FdtSetProperty (Fdt, GmaNode, "revision-id", &Data32, sizeof (UINT32));

 

         Data32 = CpuToFdt32 (PciData.Hdr.DeviceId);

-        Status = FdtSetProp (Fdt, GmaNode, "device-id", &Data32, sizeof (UINT32));

+        Status = FdtSetProperty (Fdt, GmaNode, "device-id", &Data32, sizeof (UINT32));

 

         Data32 = CpuToFdt32 (PciData.Hdr.VendorId);

-        Status = FdtSetProp (Fdt, GmaNode, "vendor-id", &Data32, sizeof (UINT32));

+        Status = FdtSetProperty (Fdt, GmaNode, "vendor-id", &Data32, sizeof (UINT32));

       }

 

       if (SerialParent != NULL) {

@@ -705,12 +705,12 @@ BuildFdtForPciRootBridge (
             if (SerialParent->IsIsaCompatible) {

               Status   = AsciiSPrint (eSPIStr, sizeof (eSPIStr), "isa@%X,%X", DevBase, FunBase);

               eSPINode = FdtAddSubnode (Fdt, TempNode, eSPIStr);

-              Status   = FdtSetProp (Fdt, eSPINode, "compatible", "isa", (UINT32)(AsciiStrLen ("isa")+1));

+              Status   = FdtSetProperty (Fdt, eSPINode, "compatible", "isa", (UINT32)(AsciiStrLen ("isa")+1));

               ASSERT_EFI_ERROR (Status);

               Data32 = CpuToFdt32 (1);

-              Status = FdtSetProp (Fdt, eSPINode, "#size-cells", &Data32, sizeof (UINT32));

+              Status = FdtSetProperty (Fdt, eSPINode, "#size-cells", &Data32, sizeof (UINT32));

               Data32 = CpuToFdt32 (2);

-              Status = FdtSetProp (Fdt, eSPINode, "#address-cells", &Data32, sizeof (UINT32));

+              Status = FdtSetProperty (Fdt, eSPINode, "#address-cells", &Data32, sizeof (UINT32));

               Status = BuildFdtForSerial (eSPINode, FdtBase);

               ASSERT_EFI_ERROR (Status);

             }

@@ -757,52 +757,52 @@ BuildFdtForFrameBuffer (
     TempNode     = FdtAddSubnode (Fdt, 0, TempStr);

     ASSERT (TempNode > 0);

 

-    Status = FdtSetProp (Fdt, TempNode, "display", "&gma", (UINT32)(AsciiStrLen ("&gma")+1));

+    Status = FdtSetProperty (Fdt, TempNode, "display", "&gma", (UINT32)(AsciiStrLen ("&gma")+1));

     ASSERT_EFI_ERROR (Status);

 

-    Status = FdtSetProp (Fdt, TempNode, "format", "a8r8g8b8", (UINT32)(AsciiStrLen ("a8r8g8b8")+1));

+    Status = FdtSetProperty (Fdt, TempNode, "format", "a8r8g8b8", (UINT32)(AsciiStrLen ("a8r8g8b8")+1));

     ASSERT_EFI_ERROR (Status);

 

     Data32 = CpuToFdt32 (GraphicsInfo->GraphicsMode.VerticalResolution);

-    Status = FdtSetProp (Fdt, TempNode, "height", &Data32, sizeof (UINT32));

+    Status = FdtSetProperty (Fdt, TempNode, "height", &Data32, sizeof (UINT32));

     ASSERT_EFI_ERROR (Status);

 

     Data32 = CpuToFdt32 (GraphicsInfo->GraphicsMode.HorizontalResolution);

-    Status = FdtSetProp (Fdt, TempNode, "width", &Data32, sizeof (UINT32));

+    Status = FdtSetProperty (Fdt, TempNode, "width", &Data32, sizeof (UINT32));

     ASSERT_EFI_ERROR (Status);

 

     RegData[0] = CpuToFdt64 (GraphicsInfo->FrameBufferBase);

     RegData[1] = CpuToFdt64 (GraphicsInfo->FrameBufferSize);

-    Status     = FdtSetProp (Fdt, TempNode, "reg", &RegData, sizeof (RegData));

+    Status     = FdtSetProperty (Fdt, TempNode, "reg", &RegData, sizeof (RegData));

     ASSERT_EFI_ERROR (Status);

 

-    Status = FdtSetProp (Fdt, TempNode, "compatible", "simple-framebuffer", (UINT32)(AsciiStrLen ("simple-framebuffer")+1));

+    Status = FdtSetProperty (Fdt, TempNode, "compatible", "simple-framebuffer", (UINT32)(AsciiStrLen ("simple-framebuffer")+1));

     ASSERT_EFI_ERROR (Status);

   } else {

     Status   = AsciiSPrint (TempStr, sizeof (TempStr), "framebuffer@%lX", 0xB0000000);

     TempNode = FdtAddSubnode (Fdt, 0, TempStr);

     ASSERT (TempNode > 0);

 

-    Status = FdtSetProp (Fdt, TempNode, "display", "&gma", (UINT32)(AsciiStrLen ("&gma")+1));

+    Status = FdtSetProperty (Fdt, TempNode, "display", "&gma", (UINT32)(AsciiStrLen ("&gma")+1));

     ASSERT_EFI_ERROR (Status);

 

-    Status = FdtSetProp (Fdt, TempNode, "format", "a8r8g8b8", (UINT32)(AsciiStrLen ("a8r8g8b8")+1));

+    Status = FdtSetProperty (Fdt, TempNode, "format", "a8r8g8b8", (UINT32)(AsciiStrLen ("a8r8g8b8")+1));

     ASSERT_EFI_ERROR (Status);

 

     Data32 = CpuToFdt32 (1024);

-    Status = FdtSetProp (Fdt, TempNode, "height", &Data32, sizeof (UINT32));

+    Status = FdtSetProperty (Fdt, TempNode, "height", &Data32, sizeof (UINT32));

     ASSERT_EFI_ERROR (Status);

 

     Data32 = CpuToFdt32 (1280);

-    Status = FdtSetProp (Fdt, TempNode, "width", &Data32, sizeof (UINT32));

+    Status = FdtSetProperty (Fdt, TempNode, "width", &Data32, sizeof (UINT32));

     ASSERT_EFI_ERROR (Status);

 

     RegData[0] = CpuToFdt64 (0xB0000000);

     RegData[1] = CpuToFdt64 (0x500000);

-    Status     = FdtSetProp (Fdt, TempNode, "reg", &RegData, sizeof (RegData));

+    Status     = FdtSetProperty (Fdt, TempNode, "reg", &RegData, sizeof (RegData));

     ASSERT_EFI_ERROR (Status);

 

-    Status = FdtSetProp (Fdt, TempNode, "compatible", "simple-framebuffer", (UINT32)(AsciiStrLen ("simple-framebuffer")+1));

+    Status = FdtSetProperty (Fdt, TempNode, "compatible", "simple-framebuffer", (UINT32)(AsciiStrLen ("simple-framebuffer")+1));

     ASSERT_EFI_ERROR (Status);

   }

 

@@ -855,35 +855,35 @@ BuildFdtForUplRequired (
   ASSERT (CpuHob != NULL);

 

   if (mResourceAssigned) {

-    Status = FdtSetProp (Fdt, UPLParaNode, "pci-enum-done", NULL, 0);

+    Status = FdtSetProperty (Fdt, UPLParaNode, "pci-enum-done", NULL, 0);

     ASSERT_EFI_ERROR (Status);

   }

 

   BootMode = GetBootModeHob ();

 

   Data32 = CpuToFdt32 ((UINT32)CpuHob->SizeOfMemorySpace);

-  Status = FdtSetProp (Fdt, UPLParaNode, "addr-width", &Data32, sizeof (Data32));

+  Status = FdtSetProperty (Fdt, UPLParaNode, "addr-width", &Data32, sizeof (Data32));

   ASSERT_EFI_ERROR (Status);

 

   if (BootMode == BOOT_WITH_FULL_CONFIGURATION) {

-    Status = FdtSetProp (Fdt, UPLParaNode, "boot-mode", "normal", (UINT32)(AsciiStrLen ("normal")+1));

+    Status = FdtSetProperty (Fdt, UPLParaNode, "boot-mode", "normal", (UINT32)(AsciiStrLen ("normal")+1));

   } else if (BootMode == BOOT_WITH_MINIMAL_CONFIGURATION) {

-    Status = FdtSetProp (Fdt, UPLParaNode, "boot-mode", "fast", (UINT32)(AsciiStrLen ("fast")+1));

+    Status = FdtSetProperty (Fdt, UPLParaNode, "boot-mode", "fast", (UINT32)(AsciiStrLen ("fast")+1));

   } else if (BootMode == BOOT_WITH_FULL_CONFIGURATION_PLUS_DIAGNOSTICS) {

-    Status = FdtSetProp (Fdt, UPLParaNode, "boot-mode", "full", (UINT32)(AsciiStrLen ("full")+1));

+    Status = FdtSetProperty (Fdt, UPLParaNode, "boot-mode", "full", (UINT32)(AsciiStrLen ("full")+1));

   } else if (BootMode == BOOT_WITH_DEFAULT_SETTINGS) {

-    Status = FdtSetProp (Fdt, UPLParaNode, "boot-mode", "default", (UINT32)(AsciiStrLen ("default")+1));

+    Status = FdtSetProperty (Fdt, UPLParaNode, "boot-mode", "default", (UINT32)(AsciiStrLen ("default")+1));

   } else if (BootMode == BOOT_ON_S4_RESUME) {

-    Status = FdtSetProp (Fdt, UPLParaNode, "boot-mode", "s4", (UINT32)(AsciiStrLen ("s4")+1));

+    Status = FdtSetProperty (Fdt, UPLParaNode, "boot-mode", "s4", (UINT32)(AsciiStrLen ("s4")+1));

   } else if (BootMode == BOOT_ON_S3_RESUME) {

-    Status = FdtSetProp (Fdt, UPLParaNode, "boot-mode", "s3", (UINT32)(AsciiStrLen ("s3")+1));

+    Status = FdtSetProperty (Fdt, UPLParaNode, "boot-mode", "s3", (UINT32)(AsciiStrLen ("s3")+1));

   } else {

-    Status = FdtSetProp (Fdt, UPLParaNode, "boot-mode", "na", (UINT32)(AsciiStrLen ("na")+1));

+    Status = FdtSetProperty (Fdt, UPLParaNode, "boot-mode", "na", (UINT32)(AsciiStrLen ("na")+1));

   }

 

   ASSERT_EFI_ERROR (Status);

 

-  Status = FdtSetProp (Fdt, UPLParaNode, "compatible", "upl", (UINT32)(AsciiStrLen ("upl")+1));

+  Status = FdtSetProperty (Fdt, UPLParaNode, "compatible", "upl", (UINT32)(AsciiStrLen ("upl")+1));

   ASSERT_EFI_ERROR (Status);

 

   GuidHob = GetFirstGuidHob (&gUniversalPayloadBaseGuid);

@@ -896,7 +896,7 @@ BuildFdtForUplRequired (
     UPLImageNode = FdtAddSubnode (Fdt, ParentNode, TempStr);

 

     Data64 = CpuToFdt64 ((UINTN)Fit);

-    Status = FdtSetProp (FdtBase, UPLImageNode, "addr", &Data64, sizeof (Data64));

+    Status = FdtSetProperty (FdtBase, UPLImageNode, "addr", &Data64, sizeof (Data64));

   }

 

   CustomNode = FdtAddSubnode (Fdt, ParentNode, "upl-custom");

@@ -904,7 +904,7 @@ BuildFdtForUplRequired (
 

   HobPtr = GetHobList ();

   Data64 = CpuToFdt64 ((UINT64)(EFI_PHYSICAL_ADDRESS)HobPtr);

-  Status = FdtSetProp (Fdt, CustomNode, "hoblistptr", &Data64, sizeof (Data64));

+  Status = FdtSetProperty (Fdt, CustomNode, "hoblistptr", &Data64, sizeof (Data64));

   ASSERT_EFI_ERROR (Status);

 

   return Status;