Merge GetSizeTableIndexA to GetSizeTableIndex function because it only be invoked...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7675 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.c b/MdeModulePkg/Universal/PCD/Dxe/Service.c
index 64bbe4c799fe2e110297ddc921184854366d5efb..9c497e960631f2d1885c555db1f9a276ba5afccc 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.c
@@ -1128,33 +1128,36 @@ GetSkuIdArray (
   \r
 }\r
 \r
-\r
 /**\r
-  Get index of PCD entry in size table.\r
-\r
+  Wrapper function of getting index of PCD entry in size table.\r
+  \r
   @param LocalTokenNumberTableIdx Index of this PCD in local token number table.\r
-  @param LocalTokenNumberTable    Pointer to local token number table in PCD database.\r
   @param IsPeiDb                  If TRUE, the pcd entry is initialized in PEI phase,\r
                                   If FALSE, the pcd entry is initialized in DXE phase.\r
 \r
   @return index of PCD entry in size table.\r
-\r
 **/\r
 UINTN\r
-GetSizeTableIndexA (\r
-  IN UINTN        LocalTokenNumberTableIdx,\r
-  IN UINT32       *LocalTokenNumberTable,\r
-  IN BOOLEAN      IsPeiDb\r
+GetSizeTableIndex (\r
+  IN    UINTN             LocalTokenNumberTableIdx,\r
+  IN    BOOLEAN           IsPeiDb\r
   )\r
 {\r
-  UINTN       Index;\r
-  UINTN       SizeTableIdx;\r
-  UINTN       LocalTokenNumber;\r
-  SKU_ID      *SkuIdTable;\r
+  UINT32 *LocalTokenNumberTable;\r
+  UINTN  LocalTokenNumber;\r
+  UINTN  Index;\r
+  UINTN  SizeTableIdx;\r
+  SKU_ID *SkuIdTable;\r
   \r
+  if (IsPeiDb) {\r
+    LocalTokenNumberTable = mPcdDatabase->PeiDb.Init.LocalTokenNumberTable;\r
+  } else {\r
+    LocalTokenNumberTable = mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r
+  }\r
+\r
   SizeTableIdx = 0;\r
 \r
-  for (Index=0; Index<LocalTokenNumberTableIdx; Index++) {\r
+  for (Index = 0; Index < LocalTokenNumberTableIdx; Index ++) {\r
     LocalTokenNumber = LocalTokenNumberTable[Index];\r
 \r
     if ((LocalTokenNumber & PCD_DATUM_TYPE_ALL_SET) == PCD_DATUM_TYPE_POINTER) {\r
@@ -1191,36 +1194,7 @@ GetSizeTableIndexA (
 \r
   }\r
 \r
-  return SizeTableIdx;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Wrapper function of getting index of PCD entry in size table.\r
-  \r
-  @param LocalTokenNumberTableIdx Index of this PCD in local token number table.\r
-  @param IsPeiDb                  If TRUE, the pcd entry is initialized in PEI phase,\r
-                                  If FALSE, the pcd entry is initialized in DXE phase.\r
-\r
-  @return index of PCD entry in size table.\r
-**/\r
-UINTN\r
-GetSizeTableIndex (\r
-  IN    UINTN             LocalTokenNumberTableIdx,\r
-  IN    BOOLEAN           IsPeiDb\r
-  )\r
-{\r
-  UINT32 *LocalTokenNumberTable;\r
-  \r
-  if (IsPeiDb) {\r
-    LocalTokenNumberTable = mPcdDatabase->PeiDb.Init.LocalTokenNumberTable;\r
-  } else {\r
-    LocalTokenNumberTable = mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r
-  }\r
-  return GetSizeTableIndexA (LocalTokenNumberTableIdx, \r
-                             LocalTokenNumberTable,\r
-                             IsPeiDb);\r
+  return SizeTableIdx;  \r
 }\r
 \r
 /**\r