ArmPkg: Rename some functions and parameters in OemMiscLib

o Rename 'mHiiHandle' parameter in OemUpdateSmbiosInfo to 'HiiHandle'.
o Rename 'Offset' parameter in OemUpdateSmbiosInfo to 'Field'.
o Rename OemGetProcessorMaxSockets to OemGetMaxProcessors.
o Rename OemIsSocketPresent to OemIsProcessorPresent.
o Update Universal/Smbios to follow the changes to OemMiscLib.

Signed-off-by: Rebecca Cran <rebecca@nuviainc.com>
Reviewed-by: Leif Lindholm <leif@nuviainc.com>

diff --git a/ArmPkg/Include/Library/OemMiscLib.h b/ArmPkg/Include/Library/OemMiscLib.h
index ad0e77685dbe6fc252629e4c54e089572377a2a0..d1ac81f73d9f75260c6d333a0ceab96804aacd67 100644 (file)
--- a/ArmPkg/Include/Library/OemMiscLib.h
+++ b/ArmPkg/Include/Library/OemMiscLib.h
@@ -116,13 +116,13 @@ OemGetCacheInformation (
   IN OUT SMBIOS_TABLE_TYPE7 *SmbiosCacheTable\r
   );\r
 \r
-/** Gets the maximum number of sockets supported by the platform.\r
+/** Gets the maximum number of processors supported by the platform.\r
 \r
-  @return The maximum number of sockets.\r
+  @return The maximum number of processors.\r
 **/\r
 UINT8\r
 EFIAPI\r
-OemGetProcessorMaxSockets (\r
+OemGetMaxProcessors (\r
   VOID\r
   );\r
 \r
@@ -146,22 +146,22 @@ OemGetChassisType (
 **/\r
 BOOLEAN\r
 EFIAPI\r
-OemIsSocketPresent (\r
+OemIsProcessorPresent (\r
   IN UINTN ProcessorIndex\r
   );\r
 \r
 /** Updates the HII string for the specified field.\r
 \r
-  @param mHiiHandle    The HII handle.\r
+  @param HiiHandle     The HII handle.\r
   @param TokenToUpdate The string to update.\r
-  @param Offset        The field to get information about.\r
+  @param Field         The field to get information about.\r
 **/\r
 VOID\r
 EFIAPI\r
 OemUpdateSmbiosInfo (\r
   IN EFI_HII_HANDLE    HiiHandle,\r
   IN EFI_STRING_ID     TokenToUpdate,\r
-  IN OEM_MISC_SMBIOS_HII_STRING_FIELD Offset\r
+  IN OEM_MISC_SMBIOS_HII_STRING_FIELD Field\r
   );\r
 \r
 #endif // OEM_MISC_LIB_H_\r

diff --git a/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c b/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c
index 6b179941e4141a91224a963d4c5ff4503c2d96ac..5153c9d7809c7019b27925ce824360e14155bf75 100644 (file)
--- a/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c
+++ b/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c
@@ -13,7 +13,6 @@
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/HiiLib.h>\r
-\r
 #include <Library/OemMiscLib.h>\r
 \r
 \r
@@ -80,13 +79,13 @@ OemGetCacheInformation (
   return TRUE;\r
 }\r
 \r
-/** Gets the maximum number of sockets supported by the platform.\r
+/** Gets the maximum number of processors supported by the platform.\r
 \r
-  @return The maximum number of sockets.\r
+  @return The maximum number of processors.\r
 **/\r
 UINT8\r
 EFIAPI\r
-OemGetProcessorMaxSockets (\r
+OemGetMaxProcessors (\r
   VOID\r
   )\r
 {\r
@@ -119,7 +118,7 @@ OemGetChassisType (
 **/\r
 BOOLEAN\r
 EFIAPI\r
-OemIsSocketPresent (\r
+OemIsProcessorPresent (\r
   IN UINTN ProcessorIndex\r
   )\r
 {\r
@@ -129,16 +128,16 @@ OemIsSocketPresent (
 \r
 /** Updates the HII string for the specified field.\r
 \r
-  @param mHiiHandle    The HII handle.\r
+  @param HiiHandle     The HII handle.\r
   @param TokenToUpdate The string to update.\r
-  @param Offset        The field to get information about.\r
+  @param Field         The field to get information about.\r
 **/\r
 VOID\r
 EFIAPI\r
 OemUpdateSmbiosInfo (\r
-  IN EFI_HII_HANDLE mHiiHandle,\r
+  IN EFI_HII_HANDLE HiiHandle,\r
   IN EFI_STRING_ID TokenToUpdate,\r
-  IN OEM_MISC_SMBIOS_HII_STRING_FIELD Offset\r
+  IN OEM_MISC_SMBIOS_HII_STRING_FIELD Field\r
   )\r
 {\r
   ASSERT (FALSE);\r

diff --git a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
index d03de12a820ec9ae2bb843fc1b0584c8d3f04658..0cb56c53975e9ba4b0a6dc0d8f2add163a0ee1cb 100644 (file)
--- a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
+++ b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
@@ -439,8 +439,8 @@ AddSmbiosCacheTypeTable (
     strings following the data fields.\r
 \r
   @param[out] Type4Record    The Type 4 structure to allocate and initialize\r
-  @param[in]  ProcessorIndex The index of the processor socket\r
-  @param[in]  Populated      Whether the specified processor socket is\r
+  @param[in]  ProcessorIndex The index of the processor\r
+  @param[in]  Populated      Whether the specified processor is\r
                              populated.\r
 \r
   @retval EFI_SUCCESS          The Type 4 structure was successfully\r
@@ -460,7 +460,7 @@ AllocateType4AndSetProcessorInformationStrings (
   EFI_STRING_ID   SerialNumber;\r
   EFI_STRING_ID   AssetTag;\r
   EFI_STRING_ID   PartNumber;\r
-  EFI_STRING      ProcessorSocketStr;\r
+  EFI_STRING      ProcessorStr;\r
   EFI_STRING      ProcessorManuStr;\r
   EFI_STRING      ProcessorVersionStr;\r
   EFI_STRING      SerialNumberStr;\r
@@ -468,7 +468,7 @@ AllocateType4AndSetProcessorInformationStrings (
   EFI_STRING      PartNumberStr;\r
   CHAR8           *OptionalStrStart;\r
   CHAR8           *StrStart;\r
-  UINTN           ProcessorSocketStrLen;\r
+  UINTN           ProcessorStrLen;\r
   UINTN           ProcessorManuStrLen;\r
   UINTN           ProcessorVersionStrLen;\r
   UINTN           SerialNumberStrLen;\r
@@ -497,14 +497,14 @@ AllocateType4AndSetProcessorInformationStrings (
   SET_HII_STRING_IF_PCD_NOT_EMPTY (PcdProcessorAssetTag, AssetTag);\r
   SET_HII_STRING_IF_PCD_NOT_EMPTY (PcdProcessorPartNumber, PartNumber);\r
 \r
-  // Processor Socket Designation\r
+  // Processor Designation\r
   StringBufferSize = sizeof (CHAR16) * SMBIOS_STRING_MAX_LENGTH;\r
-  ProcessorSocketStr = AllocateZeroPool (StringBufferSize);\r
-  if (ProcessorSocketStr == NULL) {\r
+  ProcessorStr = AllocateZeroPool (StringBufferSize);\r
+  if (ProcessorStr == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  ProcessorSocketStrLen = UnicodeSPrint (ProcessorSocketStr, StringBufferSize,\r
+  ProcessorStrLen = UnicodeSPrint (ProcessorStr, StringBufferSize,\r
                                          L"CPU%02d", ProcessorIndex + 1);\r
 \r
   // Processor Manufacture\r
@@ -528,7 +528,7 @@ AllocateType4AndSetProcessorInformationStrings (
   PartNumberStrLen = StrLen (PartNumberStr);\r
 \r
   TotalSize = sizeof (SMBIOS_TABLE_TYPE4) +\r
-              ProcessorSocketStrLen  + 1 +\r
+              ProcessorStrLen        + 1 +\r
               ProcessorManuStrLen    + 1 +\r
               ProcessorVersionStrLen + 1 +\r
               SerialNumberStrLen     + 1 +\r
@@ -545,12 +545,12 @@ AllocateType4AndSetProcessorInformationStrings (
 \r
   OptionalStrStart = (CHAR8 *)(*Type4Record + 1);\r
   UnicodeStrToAsciiStrS (\r
-    ProcessorSocketStr,\r
+    ProcessorStr,\r
     OptionalStrStart,\r
-    ProcessorSocketStrLen + 1\r
+    ProcessorStrLen + 1\r
     );\r
 \r
-  StrStart = OptionalStrStart + ProcessorSocketStrLen + 1;\r
+  StrStart = OptionalStrStart + ProcessorStrLen + 1;\r
   UnicodeStrToAsciiStrS (\r
     ProcessorManuStr,\r
     StrStart,\r
@@ -586,7 +586,7 @@ AllocateType4AndSetProcessorInformationStrings (
     );\r
 \r
 Exit:\r
-  FreePool (ProcessorSocketStr);\r
+  FreePool (ProcessorStr);\r
   FreePool (ProcessorManuStr);\r
   FreePool (ProcessorVersionStr);\r
   FreePool (SerialNumberStr);\r
@@ -618,7 +618,7 @@ AddSmbiosProcessorTypeTable (
   UINT64                      *ProcessorId;\r
   PROCESSOR_CHARACTERISTIC_FLAGS ProcessorCharacteristics;\r
   OEM_MISC_PROCESSOR_DATA     MiscProcessorData;\r
-  BOOLEAN                     SocketPopulated;\r
+  BOOLEAN                     ProcessorPopulated;\r
 \r
   Type4Record         = NULL;\r
 \r
@@ -632,12 +632,12 @@ AddSmbiosProcessorTypeTable (
   L2CacheHandle       = 0xFFFF;\r
   L3CacheHandle       = 0xFFFF;\r
 \r
-  SocketPopulated = OemIsSocketPresent(ProcessorIndex);\r
+  ProcessorPopulated = OemIsProcessorPresent (ProcessorIndex);\r
 \r
   Status = AllocateType4AndSetProcessorInformationStrings (\r
              &Type4Record,\r
              ProcessorIndex,\r
-             SocketPopulated\r
+             ProcessorPopulated\r
              );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -649,7 +649,7 @@ AddSmbiosProcessorTypeTable (
                                 &Type4Record->ProcessorCharacteristics,\r
                               &MiscProcessorData);\r
 \r
-  if (SocketPopulated) {\r
+  if (ProcessorPopulated) {\r
     AddSmbiosCacheTypeTable (ProcessorIndex, &L1CacheHandle,\r
                              &L2CacheHandle, &L3CacheHandle);\r
   }\r
@@ -713,7 +713,7 @@ ProcessorSubClassEntryPoint(
   )\r
 {\r
   EFI_STATUS    Status;\r
-  UINT32        SocketIndex;\r
+  UINT32        ProcessorIndex;\r
 \r
   //\r
   // Locate dependent protocols\r
@@ -740,8 +740,8 @@ ProcessorSubClassEntryPoint(
   //\r
   // Add SMBIOS tables for populated sockets.\r
   //\r
-  for (SocketIndex = 0; SocketIndex < OemGetProcessorMaxSockets(); SocketIndex++) {\r
-    Status = AddSmbiosProcessorTypeTable (SocketIndex);\r
+  for (ProcessorIndex = 0; ProcessorIndex < OemGetMaxProcessors (); ProcessorIndex++) {\r
+    Status = AddSmbiosProcessorTypeTable (ProcessorIndex);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "Add Processor Type Table Failed!  %r.\n", Status));\r
       return Status;\r