Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Bruce Cran <br...@cran.org.uk>
---
Vlv2TbltDevicePkg/Include/Ppi/MfgMemoryTest.h | 4 ++--
Vlv2TbltDevicePkg/Include/Ppi/Speaker.h | 4 ++--
Vlv2TbltDevicePkg/Include/Protocol/LpcWpc83627Policy.h | 4 ++--
Vlv2TbltDevicePkg/Include/Protocol/TcoReset.h | 4 ++--
Vlv2TbltDevicePkg/Include/Protocol/TpmMp.h | 4 ++--
Vlv2TbltDevicePkg/Include/Protocol/UsbPolicy.h | 4 ++--
Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c | 6 +++---
Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c | 2 +-
Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c | 2 +-
Vlv2TbltDevicePkg/PlatformDxe/Platform.c | 10 +++++-----
Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.h | 6 ------
Vlv2TbltDevicePkg/PlatformInitPei/PchInitPeim.c | 2 +-
Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.c | 2 +-
Vlv2TbltDevicePkg/Wpce791/LpcDriver.c | 4 ++--
Vlv2TbltDevicePkg/Wpce791/LpcSio.c | 2 +-
15 files changed, 27 insertions(+), 33 deletions(-)
diff --git a/Vlv2TbltDevicePkg/Include/Ppi/MfgMemoryTest.h
b/Vlv2TbltDevicePkg/Include/Ppi/MfgMemoryTest.h
index fc47448..fb8cd59 100644
--- a/Vlv2TbltDevicePkg/Include/Ppi/MfgMemoryTest.h
+++ b/Vlv2TbltDevicePkg/Include/Ppi/MfgMemoryTest.h
@@ -37,9 +37,9 @@ EFI_STATUS
IN UINT32 MemoryLength
);
-typedef struct _PEI_MFG_MEMORY_TEST_PPI {
+struct _PEI_MFG_MEMORY_TEST_PPI {
PEI_MFG_MEMORY_TEST MfgMemoryTest;
-}PEI_MFG_MEMORY_TEST_PPI;
+};
extern EFI_GUID gPeiMfgMemoryTestPpiGuid;
diff --git a/Vlv2TbltDevicePkg/Include/Ppi/Speaker.h
b/Vlv2TbltDevicePkg/Include/Ppi/Speaker.h
index 2dfdafb..a898f1e 100644
--- a/Vlv2TbltDevicePkg/Include/Ppi/Speaker.h
+++ b/Vlv2TbltDevicePkg/Include/Ppi/Speaker.h
@@ -61,10 +61,10 @@ EFI_STATUS
//
// Protocol definition
//
-typedef struct _PEI_SPEAKER_IF_PPI {
+struct _PEI_SPEAKER_IF_PPI {
EFI_SPEAKER_SET_FREQUENCY SetSpeakerToneFrequency;
EFI_SPEAKER_GENERATE_BEEP GenerateBeep;
-} PEI_SPEAKER_IF_PPI;
+};
extern EFI_GUID gPeiSpeakerInterfacePpiGuid;
#endif
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/LpcWpc83627Policy.h
b/Vlv2TbltDevicePkg/Include/Protocol/LpcWpc83627Policy.h
index d7b54be..37e72cd 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/LpcWpc83627Policy.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/LpcWpc83627Policy.h
@@ -87,10 +87,10 @@ typedef enum {
LptModeEcp
} EFI_LPT_MODE;
-typedef struct _EFI_WPC83627_POLICY_PROTOCOL {
+struct _EFI_WPC83627_POLICY_PROTOCOL {
EFI_WPC83627_DEVICE_ENABLES DeviceEnables;
EFI_LPT_MODE LptMode;
-} EFI_WPC83627_POLICY_PROTOCOL;
+};
extern EFI_GUID gEfiLpcWpc83627PolicyProtocolGuid;
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/TcoReset.h
b/Vlv2TbltDevicePkg/Include/Protocol/TcoReset.h
index d8047d4..bc9f35e 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/TcoReset.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/TcoReset.h
@@ -62,10 +62,10 @@ EFI_STATUS
OUT UINT32 RcrbGcsRestoreValue
);
-typedef struct _EFI_TCO_RESET_PROTOCOL {
+struct _EFI_TCO_RESET_PROTOCOL {
EFI_TCO_RESET_PROTOCOL_ENABLE_TCO_RESET EnableTcoReset;
EFI_TCO_RESET_PROTOCOL_DISABLE_TCO_RESET DisableTcoReset;
-} EFI_TCO_RESET_PROTOCOL;
+};
extern EFI_GUID gEfiTcoResetProtocolGuid;
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/TpmMp.h
b/Vlv2TbltDevicePkg/Include/Protocol/TpmMp.h
index 8ce0848..d79e917 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/TpmMp.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/TpmMp.h
@@ -129,12 +129,12 @@ EFI_STATUS
-typedef struct _EFI_TPM_MP_DRIVER_PROTOCOL {
+struct _EFI_TPM_MP_DRIVER_PROTOCOL {
EFI_TPM_MP_INIT Init;
EFI_TPM_MP_CLOSE Close;
EFI_TPM_MP_GET_STATUS_INFO GetStatusInfo;
EFI_TPM_MP_TRANSMIT Transmit;
-} EFI_TPM_MP_DRIVER_PROTOCOL;
+};
extern EFI_GUID gEfiTpmMpDriverProtocolGuid;
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/UsbPolicy.h
b/Vlv2TbltDevicePkg/Include/Protocol/UsbPolicy.h
index 31ac22e..c837c31 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/UsbPolicy.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/UsbPolicy.h
@@ -106,7 +106,7 @@ typedef struct {
} USB_CFG;
#pragma pack()
-typedef struct _EFI_USB_POLICY_PROTOCOL{
+struct _EFI_USB_POLICY_PROTOCOL{
UINT8 Version;
UINT8 UsbMassStorageEmulationType; // 1: FDD_Type; 2: HDD_Type;
other:Auto_Type*
UINT8 UsbOperationMode; // 0: High_Speed; 1: Full_Speed;
@@ -124,7 +124,7 @@ typedef struct _EFI_USB_POLICY_PROTOCOL{
UINT16 UsbEmulationSize; // Mbytes.
UINT8 UsbZipEmulationType;
UINT8 Reserved[3]; // Reserved fields for future
expansion w/o protocol change
-} EFI_USB_POLICY_PROTOCOL;
+};
extern EFI_GUID gUsbPolicyGuid;
diff --git a/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c
b/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c
index fa94cc7..df49180 100644
--- a/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c
+++ b/Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.c
@@ -63,7 +63,7 @@ PciWrite (
if (OPCODE_FLAGS (Entry->OpCode) & OPCODE_FLAG_S3SAVE) {
Status = S3BootScriptSavePciCfgWrite (
- (EFI_BOOT_SCRIPT_WIDTH) (OPCODE_EXTRA_DATA (Entry->OpCode)),
+ (S3_BOOT_SCRIPT_LIB_WIDTH) (OPCODE_EXTRA_DATA (Entry->OpCode)),
(UINT64) Entry->PciAddress,
1,
&Entry->Data
@@ -119,7 +119,7 @@ PciReadModifyWrite (
if (OPCODE_FLAGS (Entry->OpCode) & OPCODE_FLAG_S3SAVE) {
Status = S3BootScriptSavePciCfgReadWrite (
- (EFI_BOOT_SCRIPT_WIDTH) (OPCODE_EXTRA_DATA (Entry->OpCode)),
+ (S3_BOOT_SCRIPT_LIB_WIDTH) (OPCODE_EXTRA_DATA (Entry->OpCode)),
(UINT64) Entry->PciAddress,
&Entry->OrMask,
&Entry->AndMask
@@ -175,7 +175,7 @@ MemReadModifyWrite (
if (OPCODE_FLAGS (Entry->OpCode) & OPCODE_FLAG_S3SAVE) {
Status = S3BootScriptSaveMemReadWrite (
- (EFI_BOOT_SCRIPT_WIDTH) (OPCODE_EXTRA_DATA (Entry->OpCode)),
+ (S3_BOOT_SCRIPT_LIB_WIDTH) (OPCODE_EXTRA_DATA (Entry->OpCode)),
Entry->MemAddress,
&Entry->OrMask,
&Entry->AndMask
diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
index 195d734..d35d1a1 100644
--- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
+++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
@@ -132,7 +132,7 @@ DisableAhciCtlr (
PmcDisableAddress = (MmioRead32 ((PCH_PCI_EXPRESS_BASE_ADDRESS + (UINT32)
(31 << 15)) + R_PCH_LPC_PMC_BASE) & B_PCH_LPC_PMC_BASE_BAR) +
R_PCH_PMC_FUNC_DIS;
MmioOr32 (PmcDisableAddress, B_PCH_PMC_FUNC_DIS_SATA);
S3BootScriptSaveMemWrite (
- EfiBootScriptWidthUint32,
+ S3BootScriptWidthUint32,
(UINTN) PmcDisableAddress,
1,
(VOID *) (UINTN) PmcDisableAddress
diff --git a/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c
b/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c
index 08f5df2..6a251d4 100644
--- a/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c
+++ b/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c
@@ -258,7 +258,7 @@ GetPciRom (
//
// Do not run RAID or AHCI Option ROM if IDE
//
- if ( (DeviceClass == ((PCI_CLASS_MASS_STORAGE << 8 ) |
PCI_CLASS_MASS_STORAGE_IDE)) ) {
+ if (DeviceClass == ((PCI_CLASS_MASS_STORAGE << 8 ) |
PCI_CLASS_MASS_STORAGE_IDE)) {
return EFI_NOT_FOUND;
}
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/Platform.c
b/Vlv2TbltDevicePkg/PlatformDxe/Platform.c
index d278694..683d5bf 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/Platform.c
+++ b/Vlv2TbltDevicePkg/PlatformDxe/Platform.c
@@ -980,25 +980,25 @@ PchInitBeforeBoot()
// Saved SPI Opcode menu to fix EFI variable unable to write after S3 resume.
//
S3BootScriptSaveMemWrite (
- EfiBootScriptWidthUint32,
+ S3BootScriptWidthUint32,
(UINTN)(SPI_BASE_ADDRESS + (R_PCH_SPI_OPMENU0)),
1,
(VOID *)(UINTN)(SPI_BASE_ADDRESS +
(R_PCH_SPI_OPMENU0)));
S3BootScriptSaveMemWrite (
- EfiBootScriptWidthUint32,
+ S3BootScriptWidthUint32,
(UINTN)(SPI_BASE_ADDRESS + (R_PCH_SPI_OPMENU1)),
1,
(VOID *)(UINTN)(SPI_BASE_ADDRESS +
(R_PCH_SPI_OPMENU1)));
S3BootScriptSaveMemWrite (
- EfiBootScriptWidthUint16,
+ S3BootScriptWidthUint16,
(UINTN)(SPI_BASE_ADDRESS + R_PCH_SPI_OPTYPE),
1,
(VOID *)(UINTN)(SPI_BASE_ADDRESS + R_PCH_SPI_OPTYPE));
S3BootScriptSaveMemWrite (
- EfiBootScriptWidthUint16,
+ S3BootScriptWidthUint16,
(UINTN)(SPI_BASE_ADDRESS + R_PCH_SPI_PREOP),
1,
(VOID *)(UINTN)(SPI_BASE_ADDRESS + R_PCH_SPI_PREOP));
@@ -1007,7 +1007,7 @@ PchInitBeforeBoot()
// Saved MTPMC_1 for S3 resume.
//
S3BootScriptSaveMemWrite (
- EfiBootScriptWidthUint32,
+ S3BootScriptWidthUint32,
(UINTN)(PMC_BASE_ADDRESS + R_PCH_PMC_MTPMC1),
1,
(VOID *)(UINTN)(PMC_BASE_ADDRESS + R_PCH_PMC_MTPMC1));
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.h
b/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.h
index ec69e61..be1cdc4 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.h
+++ b/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.h
@@ -132,13 +132,7 @@ Abstract:
#pragma pack(1)
-typedef UINT64 EFI_BOARD_FEATURES;
-//
-//BUGBUG: should remove these EDK hii definition once Hii transtion is done
-//
-typedef UINT16 STRING_REF;
-typedef UINT16 EFI_FORM_LABEL;
typedef enum {
EfiUserPassword,
diff --git a/Vlv2TbltDevicePkg/PlatformInitPei/PchInitPeim.c
b/Vlv2TbltDevicePkg/PlatformInitPei/PchInitPeim.c
index 30f87c1..dc0af86 100644
--- a/Vlv2TbltDevicePkg/PlatformInitPei/PchInitPeim.c
+++ b/Vlv2TbltDevicePkg/PlatformInitPei/PchInitPeim.c
@@ -532,7 +532,7 @@ IchRcrbInit (
//
LpcRevisionID = PchLpcPciCfg8 (R_PCH_LPC_RID_CC);
- if ((BootMode == BOOT_ON_S3_RESUME)) {
+ if (BootMode == BOOT_ON_S3_RESUME) {
//
// We are resuming from S3
// Enable HPET if enabled in Setup
diff --git a/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.c
b/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.c
index 2200e6c..83b11fd 100644
--- a/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.c
+++ b/Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.c
@@ -590,7 +590,7 @@ GetVBiosVbtCallback (
return EFI_SUCCESS;
}
}
- if ((VBiosPtr == NULL) ) {
+ if (VBiosPtr == NULL) {
//
// Intel video BIOS not found.
//
diff --git a/Vlv2TbltDevicePkg/Wpce791/LpcDriver.c
b/Vlv2TbltDevicePkg/Wpce791/LpcDriver.c
index be99b4c..2542d8a 100644
--- a/Vlv2TbltDevicePkg/Wpce791/LpcDriver.c
+++ b/Vlv2TbltDevicePkg/Wpce791/LpcDriver.c
@@ -323,7 +323,7 @@ LpcIoRead8 (
{
mLpc.PciIo->Io.Read(
mLpc.PciIo,
- EfiPciWidthUint8,
+ EfiPciIoWidthUint8,
EFI_PCI_IO_PASS_THROUGH_BAR,
Port,
1,
@@ -339,7 +339,7 @@ LpcIoWrite8 (
{
mLpc.PciIo->Io.Write(
mLpc.PciIo,
- EfiPciWidthUint8,
+ EfiPciIoWidthUint8,
EFI_PCI_IO_PASS_THROUGH_BAR,
Port,
1,
diff --git a/Vlv2TbltDevicePkg/Wpce791/LpcSio.c
b/Vlv2TbltDevicePkg/Wpce791/LpcSio.c
index 8446d38..aa182bf 100644
--- a/Vlv2TbltDevicePkg/Wpce791/LpcSio.c
+++ b/Vlv2TbltDevicePkg/Wpce791/LpcSio.c
@@ -120,7 +120,7 @@ WriteRegisterAndSaveToScript (
Buffer[0] = Index;
Buffer[1] = Data;
S3BootScriptSaveIoWrite (
- EfiBootScriptWidthUint8,
+ S3BootScriptWidthUint8,
INDEX_PORT,
2,
Buffer
--
2.4.5
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-devel
