Replace EFI_GUID by a class EFI_GUID.

CloverHackyColor · Apr 25, 2022 · 1ea4700 · 1ea4700
1 parent 037c3e7
commit 1ea4700
Show file tree

Hide file tree

Showing 123 changed files with 2,257 additions and 1,286 deletions.
diff --git a/IntelFrameworkPkg/Include/Protocol/DataHub.h b/IntelFrameworkPkg/Include/Protocol/DataHub.h
@@ -87,8 +87,8 @@ typedef
 EFI_STATUS
 (EFIAPI *EFI_DATA_HUB_LOG_DATA)(
   IN  EFI_DATA_HUB_PROTOCOL   *This,
-  IN  EFI_GUID                *DataRecordGuid,
-  IN  EFI_GUID                *ProducerName,
+  CONST_EFI_GUID_PTR_T        DataRecordGuid,
+  CONST_EFI_GUID_PTR_T        ProducerName,
   IN  UINT64                  DataRecordClass,
   IN  VOID                    *RawData,
   IN  UINT32                  RawDataSize

diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVolDriver.h b/MdeModulePkg/Core/Dxe/FwVol/FwVolDriver.h
@@ -184,7 +184,7 @@ EFI_STATUS
 EFIAPI
 FvReadFile (
   IN CONST EFI_FIRMWARE_VOLUME2_PROTOCOL *This,
-  IN CONST EFI_GUID                      *NameGuid,
+  CONST_EFI_GUID_PTR_T                   NameGuid,
   IN OUT   VOID                          **Buffer,
   IN OUT   UINTN                         *BufferSize,
   OUT      EFI_FV_FILETYPE               *FoundType,
@@ -225,7 +225,7 @@ EFI_STATUS
 EFIAPI
 FvReadFileSection (
   IN CONST  EFI_FIRMWARE_VOLUME2_PROTOCOL  *This,
-  IN CONST  EFI_GUID                       *NameGuid,
+  CONST_EFI_GUID_PTR_T                     NameGuid,
   IN        EFI_SECTION_TYPE               SectionType,
   IN        UINTN                          SectionInstance,
   IN OUT    VOID                           **Buffer,
@@ -282,7 +282,7 @@ EFI_STATUS
 EFIAPI
 FvGetVolumeInfo (
   IN  CONST EFI_FIRMWARE_VOLUME2_PROTOCOL       *This,
-  IN  CONST EFI_GUID                            *InformationType,
+  CONST_EFI_GUID_PTR_T                          InformationType,
   IN OUT UINTN                                  *BufferSize,
   OUT VOID                                      *Buffer
   );
@@ -306,7 +306,7 @@ EFI_STATUS
 EFIAPI
 FvSetVolumeInfo (
   IN  CONST EFI_FIRMWARE_VOLUME2_PROTOCOL       *This,
-  IN  CONST EFI_GUID                            *InformationType,
+  CONST_EFI_GUID_PTR_T                          InformationType,
   IN  UINTN                                     BufferSize,
   IN CONST  VOID                                *Buffer
   );

diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.h b/MdeModulePkg/Core/Pei/FwVol/FwVol.h
@@ -120,7 +120,7 @@ EFI_STATUS
 EFIAPI
 PeiFfsFvPpiFindFileByName (
   IN  CONST  EFI_PEI_FIRMWARE_VOLUME_PPI *This,
-  IN  CONST  EFI_GUID                    *FileName,
+  CONST_EFI_GUID_PTR_T                   FileName,
   IN  EFI_PEI_FV_HANDLE                  *FvHandle,
   OUT EFI_PEI_FILE_HANDLE                *FileHandle
   );

diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h
@@ -539,7 +539,7 @@ EFI_STATUS
 EFIAPI
 PeiLocatePpi (
   IN CONST EFI_PEI_SERVICES      **PeiServices,
-  IN CONST EFI_GUID              *Guid,
+  CONST_EFI_GUID_PTR_T           Guid,
   IN UINTN                       Instance,
   IN OUT EFI_PEI_PPI_DESCRIPTOR  **PpiDescriptor,
   IN OUT VOID                    **Ppi
@@ -1065,7 +1065,7 @@ PeiReportStatusCode (
   IN EFI_STATUS_CODE_TYPE     CodeType,
   IN EFI_STATUS_CODE_VALUE    Value,
   IN UINT32                   Instance,
-  IN CONST EFI_GUID                 *CallerId,
+  CONST_EFI_GUID_PTR_T              CallerId,
   IN CONST EFI_STATUS_CODE_DATA     *Data OPTIONAL
   );
 
@@ -1158,7 +1158,7 @@ FirmwareVolmeInfoPpiNotifyCallback (
 EFI_STATUS
 EFIAPI
 PeiFfsFindFileByName (
-  IN  CONST EFI_GUID        *FileName,
+  CONST_EFI_GUID_PTR_T      FileName,
   IN  EFI_PEI_FV_HANDLE     VolumeHandle,
   OUT EFI_PEI_FILE_HANDLE   *FileHandle
   );

diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h
@@ -253,7 +253,7 @@ EFI_STATUS
 EFIAPI
 SmmInstallConfigurationTable (
   IN  CONST EFI_SMM_SYSTEM_TABLE2  *SystemTable,
-  IN  CONST EFI_GUID              *Guid,
+  CONST_EFI_GUID_PTR_T            Guid,
   IN  VOID                        *Table,
   IN  UINTN                       TableSize
   );
@@ -526,7 +526,7 @@ SmmHandleProtocol (
 EFI_STATUS
 EFIAPI
 SmmRegisterProtocolNotify (
-  IN  CONST EFI_GUID              *Protocol,
+  CONST_EFI_GUID_PTR_T            Protocol,
   IN  EFI_SMM_NOTIFY_FN           Function,
   OUT VOID                        **Registration
   );
@@ -632,7 +632,7 @@ SmmLocateHandleBuffer (
 EFI_STATUS
 EFIAPI
 SmiManage (
-  IN     CONST EFI_GUID           *HandlerType,
+  CONST_EFI_GUID_PTR_T            HandlerType,
   IN     CONST VOID               *Context         OPTIONAL,
   IN OUT VOID                     *CommBuffer      OPTIONAL,
   IN OUT UINTN                    *CommBufferSize  OPTIONAL

diff --git a/MdeModulePkg/Include/Library/HiiLib.h b/MdeModulePkg/Include/Library/HiiLib.h
@@ -52,7 +52,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 EFI_HII_HANDLE
 EFIAPI
 HiiAddPackages (
-  IN CONST EFI_GUID    *PackageListGuid,
+  CONST_EFI_GUID_PTR_T PackageListGuid,
   IN       EFI_HANDLE  DeviceHandle  OPTIONAL,
   ...
   )
@@ -185,7 +185,7 @@ HiiGetString (
 EFI_STRING
 EFIAPI
 HiiGetPackageString (
-  IN CONST EFI_GUID  *PackageListGuid,
+  CONST_EFI_GUID_PTR_T PackageListGuid,
   IN EFI_STRING_ID   StringId,
   IN CONST CHAR8     *Language  OPTIONAL
   )
@@ -607,7 +607,7 @@ UINT8 *
 EFIAPI
 HiiCreateGuidOpCode (
   IN VOID            *OpCodeHandle,
-  IN CONST EFI_GUID  *Guid,
+  CONST_EFI_GUID_PTR_T Guid,
   IN CONST VOID      *GuidOpCode,    OPTIONAL
   IN UINTN           OpCodeSize
   );

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
@@ -1619,7 +1619,7 @@ EFIAPI
 HiiListPackageLists (
   IN  CONST EFI_HII_DATABASE_PROTOCOL   *This,
   IN  UINT8                             PackageType,
-  IN  CONST EFI_GUID                    *PackageGuid,
+  CONST_EFI_GUID_PTR_T                  PackageGuid,
   IN  OUT UINTN                         *HandleBufferLength,
   OUT EFI_HII_HANDLE                    *Handle
   );
@@ -1705,7 +1705,7 @@ EFIAPI
 HiiRegisterPackageNotify (
   IN  CONST EFI_HII_DATABASE_PROTOCOL   *This,
   IN  UINT8                             PackageType,
-  IN  CONST EFI_GUID                    *PackageGuid,
+  CONST_EFI_GUID_PTR_T                  PackageGuid,
   IN  CONST EFI_HII_DATABASE_NOTIFY     PackageNotifyFn,
   IN  EFI_HII_DATABASE_NOTIFY_TYPE      NotifyType,
   OUT EFI_HANDLE                        *NotifyHandle
@@ -1791,7 +1791,7 @@ EFI_STATUS
 EFIAPI
 HiiGetKeyboardLayout (
   IN  CONST EFI_HII_DATABASE_PROTOCOL   *This,
-  IN  CONST EFI_GUID                          *KeyGuid,
+  CONST_EFI_GUID_PTR_T                   KeyGuid,
   IN OUT UINT16                         *KeyboardLayoutLength,
   OUT EFI_HII_KEYBOARD_LAYOUT           *KeyboardLayout
   );
@@ -1818,7 +1818,7 @@ EFI_STATUS
 EFIAPI
 HiiSetKeyboardLayout (
   IN CONST EFI_HII_DATABASE_PROTOCOL          *This,
-  IN CONST EFI_GUID                           *KeyGuid
+  CONST_EFI_GUID_PTR_T                        KeyGuid
   );
 
 
@@ -2120,7 +2120,7 @@ EFIAPI
 HiiGetAltCfg (
   IN  CONST EFI_HII_CONFIG_ROUTING_PROTOCOL    *This,
   IN  CONST EFI_STRING                         Configuration,
-  IN  CONST EFI_GUID                           *Guid,
+  CONST_EFI_GUID_PTR_T                         Guid,
   IN  CONST EFI_STRING                         Name,
   IN  CONST EFI_DEVICE_PATH_PROTOCOL           *DevicePath,
   IN  CONST UINT16                             *AltCfgId,

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.h b/MdeModulePkg/Universal/PCD/Dxe/Service.h
@@ -81,7 +81,7 @@ DxeGetPcdInfoGetInfo (
 EFI_STATUS
 EFIAPI
 DxeGetPcdInfoGetInfoEx (
-  IN CONST  EFI_GUID        *Guid,
+  CONST_EFI_GUID_PTR_T      Guid,
   IN        UINTN           TokenNumber,
   OUT       EFI_PCD_INFO    *PcdInfo
   );
@@ -269,7 +269,7 @@ DxePcdGetSize (
 UINT8
 EFIAPI
 DxePcdGet8Ex (
-  IN CONST EFI_GUID        *Guid,
+  CONST_EFI_GUID_PTR_T Guid,
   IN UINTN             TokenNumber
   );
 
@@ -290,7 +290,7 @@ DxePcdGet8Ex (
 UINT16
 EFIAPI
 DxePcdGet16Ex (
-  IN CONST EFI_GUID        *Guid,
+  CONST_EFI_GUID_PTR_T Guid,
   IN UINTN             TokenNumber
   );
 
@@ -311,7 +311,7 @@ DxePcdGet16Ex (
 UINT32
 EFIAPI
 DxePcdGet32Ex (
-  IN CONST EFI_GUID        *Guid,
+  CONST_EFI_GUID_PTR_T Guid,
   IN UINTN             TokenNumber
   );
 
@@ -332,7 +332,7 @@ DxePcdGet32Ex (
 UINT64
 EFIAPI
 DxePcdGet64Ex (
-  IN CONST EFI_GUID        *Guid,
+  CONST_EFI_GUID_PTR_T Guid,
   IN UINTN             TokenNumber
   );
 
@@ -353,7 +353,7 @@ DxePcdGet64Ex (
 VOID *
 EFIAPI
 DxePcdGetPtrEx (
-  IN CONST EFI_GUID        *Guid,
+  CONST_EFI_GUID_PTR_T Guid,
   IN UINTN             TokenNumber
   );
 
@@ -374,7 +374,7 @@ DxePcdGetPtrEx (
 BOOLEAN
 EFIAPI
 DxePcdGetBoolEx (
-  IN CONST EFI_GUID        *Guid,
+  CONST_EFI_GUID_PTR_T Guid,
   IN UINTN             TokenNumber
   );
 
@@ -393,7 +393,7 @@ DxePcdGetBoolEx (
 UINTN
 EFIAPI
 DxePcdGetSizeEx (
-  IN CONST EFI_GUID        *Guid,
+  CONST_EFI_GUID_PTR_T Guid,
   IN UINTN             TokenNumber
   );
 
@@ -569,7 +569,7 @@ DxePcdSetBool (
 EFI_STATUS
 EFIAPI
 DxePcdSet8Ex (
-  IN CONST EFI_GUID        *Guid,
+  CONST_EFI_GUID_PTR_T Guid,
   IN UINTN             TokenNumber,
   IN UINT8             Value
   );
@@ -595,7 +595,7 @@ DxePcdSet8Ex (
 EFI_STATUS
 EFIAPI
 DxePcdSet16Ex (
-  IN CONST EFI_GUID        *Guid,
+  CONST_EFI_GUID_PTR_T Guid,
   IN UINTN             TokenNumber,
   IN UINT16            Value
   );
@@ -621,7 +621,7 @@ DxePcdSet16Ex (
 EFI_STATUS
 EFIAPI
 DxePcdSet32Ex (
-  IN CONST EFI_GUID        *Guid,
+  CONST_EFI_GUID_PTR_T Guid,
   IN UINTN             TokenNumber,
   IN UINT32             Value
   );
@@ -647,7 +647,7 @@ DxePcdSet32Ex (
 EFI_STATUS
 EFIAPI
 DxePcdSet64Ex (
-  IN CONST EFI_GUID        *Guid,
+  CONST_EFI_GUID_PTR_T Guid,
   IN UINTN             TokenNumber,
   IN UINT64            Value
   );
@@ -677,7 +677,7 @@ DxePcdSet64Ex (
 EFI_STATUS
 EFIAPI
 DxePcdSetPtrEx (
-  IN        CONST EFI_GUID    *Guid,
+  CONST_EFI_GUID_PTR_T        Guid,
   IN        UINTN             TokenNumber,
   IN OUT    UINTN             *SizeOfBuffer,
   IN        VOID              *Buffer
@@ -704,7 +704,7 @@ DxePcdSetPtrEx (
 EFI_STATUS
 EFIAPI
 DxePcdSetBoolEx (
-  IN CONST EFI_GUID    *Guid,
+  CONST_EFI_GUID_PTR_T Guid,
   IN UINTN             TokenNumber,
   IN BOOLEAN           Value
   );
@@ -828,7 +828,7 @@ typedef struct {
 **/
 EFI_STATUS
 DxeGetPcdInfo (
-  IN CONST  EFI_GUID        *Guid,
+  CONST_EFI_GUID_PTR_T      Guid,
   IN        UINTN           TokenNumber,
   OUT       EFI_PCD_INFO    *PcdInfo
   );
@@ -888,7 +888,7 @@ SetWorker (
 EFI_STATUS
 ExSetValueWorker (
   IN          UINTN                ExTokenNumber,
-  IN          CONST EFI_GUID       *Guid,
+  CONST_EFI_GUID_PTR_T             Guid,
   IN          VOID                 *Data,
   IN          UINTN                SetSize
   );
@@ -914,7 +914,7 @@ ExSetValueWorker (
 EFI_STATUS
 ExSetWorker (
   IN      UINTN                ExTokenNumber,
-  IN      CONST EFI_GUID       *Guid,
+  CONST_EFI_GUID_PTR_T         Guid,
   IN      VOID                 *Data,
   IN OUT  UINTN                *Size,
   IN      BOOLEAN              PtrType
@@ -952,7 +952,7 @@ GetWorker (
 **/
 VOID *
 ExGetWorker (
-  IN CONST EFI_GUID         *Guid,
+  CONST_EFI_GUID_PTR_T      Guid,
   IN UINTN                  ExTokenNumber,
   IN UINTN                  GetSize
   );
@@ -1070,7 +1070,7 @@ BuildPcdDxeDataBase (
 **/
 UINTN
 GetExPcdTokenNumber (
-  IN CONST EFI_GUID             *Guid,
+  CONST_EFI_GUID_PTR_T          Guid,
   IN UINT32                     ExTokenNumber
   );
 
@@ -1101,7 +1101,7 @@ GetExPcdTokenNumber (
 **/
 EFI_STATUS
 ExGetNextTokeNumber (
-  IN      CONST EFI_GUID    *Guid,
+  CONST_EFI_GUID_PTR_T       Guid,
   IN OUT  UINTN             *TokenNumber,
   IN      EFI_GUID          *GuidTable,
   IN      UINTN             SizeOfGuidTable,