[edk2] [PATCH] Vlv2DeviceRefCodePkg: don't redefine struct typedefs

[Bruce Cran]

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Bruce Cran <***@cran.org.uk>
---
.../ValleyView2Soc/CPU/Include/Protocol/PpmPlatformPolicy.h | 4 ++--
.../ValleyView2Soc/SouthCluster/Include/Ppi/SmbusPolicy.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Include/Protocol/PpmPlatformPolicy.h b/Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Include/Protocol/PpmPlatformPolicy.h
index 4b9f992..6029d14 100644
--- a/Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Include/Protocol/PpmPlatformPolicy.h
+++ b/Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Include/Protocol/PpmPlatformPolicy.h
@@ -110,7 +110,7 @@ typedef struct _PPM_TURBO_SETTINGS {
//
// Platform Policy
//
-typedef struct _PPM_PLATFORM_POLICY_PROTOCOL {
+struct _PPM_PLATFORM_POLICY_PROTOCOL {
UINT8 Revision;
PPM_FUNCTION_ENABLES FunctionEnables;
PPM_CUSTOM_VID_TABLE CustomVidTable;
@@ -133,6 +133,6 @@ typedef struct _PPM_PLATFORM_POLICY_PROTOCOL {
//
UINT16 Reserve10;
UINT8 Reserve11;
-} PPM_PLATFORM_POLICY_PROTOCOL;
+};

#endif
diff --git a/Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Ppi/SmbusPolicy.h b/Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Ppi/SmbusPolicy.h
index c4eba99..bd9164a 100644
--- a/Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Ppi/SmbusPolicy.h
+++ b/Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Ppi/SmbusPolicy.h
@@ -34,12 +34,12 @@ Abstract:

typedef struct _PEI_SMBUS_POLICY_PPI PEI_SMBUS_POLICY_PPI;

-typedef struct _PEI_SMBUS_POLICY_PPI {
+struct _PEI_SMBUS_POLICY_PPI {
UINTN BaseAddress;
UINT32 PciAddress;
UINT8 NumRsvdAddress;
UINT8 *RsvdAddress;
-} PEI_SMBUS_POLICY_PPI;
+};

extern EFI_GUID gPeiSmbusPolicyPpiGuid;

[He, Tim]

I still couldn't apply the patch, could you please send me the patch again as attached file? I suspect the email content ignored some character.

Best Regards,
Tim

-----Original Message-----
From: Bruce Cran [mailto:***@cran.org.uk]
Sent: Wednesday, July 08, 2015 12:41 AM
To: Wei, David; He, Tim; edk2-***@lists.sourceforge.net
Cc: Bruce Cran
Subject: [PATCH] Vlv2DeviceRefCodePkg: don't redefine struct typedefs

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Bruce Cran <***@cran.org.uk>
---
.../ValleyView2Soc/CPU/Include/Protocol/PpmPlatformPolicy.h | 4 ++--
.../ValleyView2Soc/SouthCluster/Include/Ppi/SmbusPolicy.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Include/Protocol/PpmPlatformPolicy.h b/Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Include/Protocol/PpmPlatformPolicy.h
index 4b9f992..6029d14 100644
--- a/Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Include/Protocol/PpmPlatformPolicy.h
+++ b/Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Include/Protocol/PpmPlatfo
+++ rmPolicy.h
@@ -110,7 +110,7 @@ typedef struct _PPM_TURBO_SETTINGS { // // Platform Policy // -typedef struct _PPM_PLATFORM_POLICY_PROTOCOL {
+struct _PPM_PLATFORM_POLICY_PROTOCOL {
UINT8 Revision;
PPM_FUNCTION_ENABLES FunctionEnables;
PPM_CUSTOM_VID_TABLE CustomVidTable;
@@ -133,6 +133,6 @@ typedef struct _PPM_PLATFORM_POLICY_PROTOCOL {
//
UINT16 Reserve10;
UINT8 Reserve11;
-} PPM_PLATFORM_POLICY_PROTOCOL;
+};

#endif
diff --git a/Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Ppi/SmbusPolicy.h b/Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Ppi/SmbusPolicy.h
index c4eba99..bd9164a 100644
--- a/Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Ppi/SmbusPolicy.h
+++ b/Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Ppi/Smbus
+++ Policy.h
@@ -34,12 +34,12 @@ Abstract:

typedef struct _PEI_SMBUS_POLICY_PPI PEI_SMBUS_POLICY_PPI;

-typedef struct _PEI_SMBUS_POLICY_PPI {
+struct _PEI_SMBUS_POLICY_PPI {
UINTN BaseAddress;
UINT32 PciAddress;
UINT8 NumRsvdAddress;
UINT8 *RsvdAddress;
-} PEI_SMBUS_POLICY_PPI;
+};

extern EFI_GUID gPeiSmbusPolicyPpiGuid;

--
2.4.5

[Bruce Cran]

Post by He, Tim
I still couldn't apply the patch, could you please send me the patch again as attached file? I suspect the email content ignored some character.

I've attached the two patch files (type redefinitions and change of UEFI version string).

I've also pushed the changesets to https://github.com/bcran/edk2/commits/svn/branches/UDK2014.SP1 .

[Bruce Cran]

I am using the "TortoiseGit" tool, which version is 1.8.14.0. the parameters I am using is "git.exe am --3way --ignore-space-change --keep-cr ".

Thanks. I've tried using the same tool and I'm seeing errors like:

0 [main] mv 5252 open_stackdumpfile: Dumping stack trace to
mv.exe.stackdump
Fail

I'm guessing this is because TortoiseGit uses MinGW, which from my
experience has quite a few bugs like this.

At least on my system running the same command in the "Git Bash" shell
from https://git-scm.com/downloads works. Could you try that please?