ArmVirtPkg/FdtClientDxe: supplement missing EFIAPI calling conv specifiers

[mirror_edk2.git] / ArmVirtPkg / FdtClientDxe / FdtClientDxe.c

diff --git a/ArmVirtPkg/FdtClientDxe/FdtClientDxe.c b/ArmVirtPkg/FdtClientDxe/FdtClientDxe.c
index c336e2410033e2832db06fa98d2517a4948edc10..547a29fce62c9fc06cc525776daf5ba983af708f 100644 (file)
--- a/ArmVirtPkg/FdtClientDxe/FdtClientDxe.c
+++ b/ArmVirtPkg/FdtClientDxe/FdtClientDxe.c
@@ -29,6 +29,7 @@ STATIC VOID  *mDeviceTreeBase;
 \r
 STATIC\r
 EFI_STATUS\r
+EFIAPI\r
 GetNodeProperty (\r
   IN  FDT_CLIENT_PROTOCOL     *This,\r
   IN  INT32                   Node,\r
@@ -55,6 +56,7 @@ GetNodeProperty (
 \r
 STATIC\r
 EFI_STATUS\r
+EFIAPI\r
 SetNodeProperty (\r
   IN  FDT_CLIENT_PROTOCOL     *This,\r
   IN  INT32                   Node,\r
@@ -159,7 +161,8 @@ FindCompatibleNodeReg (
   IN  FDT_CLIENT_PROTOCOL     *This,\r
   IN  CONST CHAR8             *CompatibleString,\r
   OUT CONST VOID              **Reg,\r
-  OUT UINT32                  *RegElemSize,\r
+  OUT UINTN                   *AddressCells,\r
+  OUT UINTN                   *SizeCells,\r
   OUT UINT32                  *RegSize\r
   )\r
 {\r
@@ -178,20 +181,95 @@ FindCompatibleNodeReg (
     return Status;\r
   }\r
 \r
-  if ((*RegSize % 8) != 0) {\r
+  if ((*RegSize % 16) != 0) {\r
     DEBUG ((EFI_D_ERROR,\r
       "%a: '%a' compatible node has invalid 'reg' property (size == 0x%x)\n",\r
       __FUNCTION__, CompatibleString, *RegSize));\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  *RegElemSize = 8;\r
+  *AddressCells = 2;\r
+  *SizeCells = 2;\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
 STATIC\r
 EFI_STATUS\r
+EFIAPI\r
+FindNextMemoryNodeReg (\r
+  IN  FDT_CLIENT_PROTOCOL     *This,\r
+  IN  INT32                   PrevNode,\r
+  OUT INT32                   *Node,\r
+  OUT CONST VOID              **Reg,\r
+  OUT UINTN                   *AddressCells,\r
+  OUT UINTN                   *SizeCells,\r
+  OUT UINT32                  *RegSize\r
+  )\r
+{\r
+  INT32          Prev, Next;\r
+  CONST CHAR8    *DeviceType;\r
+  INT32          Len;\r
+  EFI_STATUS     Status;\r
+\r
+  ASSERT (mDeviceTreeBase != NULL);\r
+  ASSERT (Node != NULL);\r
+\r
+  for (Prev = PrevNode;; Prev = Next) {\r
+    Next = fdt_next_node (mDeviceTreeBase, Prev, NULL);\r
+    if (Next < 0) {\r
+      break;\r
+    }\r
+\r
+    DeviceType = fdt_getprop (mDeviceTreeBase, Next, "device_type", &Len);\r
+    if (DeviceType != NULL && AsciiStrCmp (DeviceType, "memory") == 0) {\r
+      //\r
+      // Get the 'reg' property of this memory node. For now, we will assume\r
+      // 8 byte quantities for base and size, respectively.\r
+      // TODO use #cells root properties instead\r
+      //\r
+      Status = GetNodeProperty (This, Next, "reg", Reg, RegSize);\r
+      if (EFI_ERROR (Status)) {\r
+        DEBUG ((EFI_D_WARN,\r
+          "%a: ignoring memory node with no 'reg' property\n",\r
+          __FUNCTION__));\r
+        continue;\r
+      }\r
+      if ((*RegSize % 16) != 0) {\r
+        DEBUG ((EFI_D_WARN,\r
+          "%a: ignoring memory node with invalid 'reg' property (size == 0x%x)\n",\r
+          __FUNCTION__, *RegSize));\r
+        continue;\r
+      }\r
+\r
+      *Node = Next;\r
+      *AddressCells = 2;\r
+      *SizeCells = 2;\r
+      return EFI_SUCCESS;\r
+    }\r
+  }\r
+  return EFI_NOT_FOUND;\r
+}\r
+\r
+STATIC\r
+EFI_STATUS\r
+EFIAPI\r
+FindMemoryNodeReg (\r
+  IN  FDT_CLIENT_PROTOCOL     *This,\r
+  OUT INT32                   *Node,\r
+  OUT CONST VOID              **Reg,\r
+  OUT UINTN                   *AddressCells,\r
+  OUT UINTN                   *SizeCells,\r
+  OUT UINT32                  *RegSize\r
+  )\r
+{\r
+  return FindNextMemoryNodeReg (This, 0, Node, Reg, AddressCells, SizeCells,\r
+           RegSize);\r
+}\r
+\r
+STATIC\r
+EFI_STATUS\r
+EFIAPI\r
 GetOrInsertChosenNode (\r
   IN  FDT_CLIENT_PROTOCOL     *This,\r
   OUT INT32                   *Node\r
@@ -223,6 +301,8 @@ STATIC FDT_CLIENT_PROTOCOL mFdtClientProtocol = {
   FindNextCompatibleNode,\r
   FindCompatibleNodeProperty,\r
   FindCompatibleNodeReg,\r
+  FindMemoryNodeReg,\r
+  FindNextMemoryNodeReg,\r
   GetOrInsertChosenNode,\r
 };\r
 \r