From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id 9A76281FC7 for ; Wed, 1 Feb 2017 11:17:55 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 86DF0C14; Wed, 1 Feb 2017 11:17:55 -0800 (PST) Received: from [192.168.150.241] (u201365.usa.arm.com [10.118.28.87]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 46D213F220; Wed, 1 Feb 2017 11:17:55 -0800 (PST) Message-ID: <1485976674.3126.3.camel@arm.com> From: Supreeth Venkatesh To: Michael Kinney , edk2-devel@lists.01.org Cc: Andrew Fish Date: Wed, 01 Feb 2017 13:17:54 -0600 In-Reply-To: <1485942552-47388-7-git-send-email-michael.d.kinney@intel.com> References: <1485942552-47388-1-git-send-email-michael.d.kinney@intel.com> <1485942552-47388-7-git-send-email-michael.d.kinney@intel.com> X-Mailer: Evolution 3.18.5.2-0ubuntu3 Mime-Version: 1.0 Subject: Re: [staging/edk2-test PATCH V2 6/6] TestCasePkg: Fix GCC compatibility issues X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Feb 2017 19:17:55 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit On Wed, 2017-02-01 at 01:49 -0800, Michael Kinney wrote: > Cc: Andrew Fish > Cc: Supreeth Venkatesh > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Michael Kinney This looks fine to me. Reviewed-by: Supreeth Venkatesh > --- >  TestCasePkg/Timer/ArchTimerBBTestConformance.c |  2 ++ >  TestCasePkg/Timer/ArchTimerBBTestFunction.c    |  4 +++ >  TestCasePkg/Timer/ArchTimerBBTestMain.c        |  4 ++- >  TestCasePkg/Timer/Guid.h                       | 41 +++++++++++++--- > ---------- >  4 files changed, 29 insertions(+), 22 deletions(-) > > diff --git a/TestCasePkg/Timer/ArchTimerBBTestConformance.c > b/TestCasePkg/Timer/ArchTimerBBTestConformance.c > index 58c4ade..5ceda59 100644 > --- a/TestCasePkg/Timer/ArchTimerBBTestConformance.c > +++ b/TestCasePkg/Timer/ArchTimerBBTestConformance.c > @@ -28,6 +28,7 @@ >  // TDS 3.1 >  // >  EFI_STATUS > +EFIAPI >  BBTestRegisterHandlerConsistencyTest ( >      IN EFI_BB_TEST_PROTOCOL       *This, >      IN VOID                       *ClientInterface, > @@ -199,6 +200,7 @@ BBTestRegisterHandlerConsistencyTest ( >  // TDS 3.2 >  // >  EFI_STATUS > +EFIAPI >  BBTestGetTimerPeriodConsistencyTest ( >      IN EFI_BB_TEST_PROTOCOL       *This, >      IN VOID                       *ClientInterface, > diff --git a/TestCasePkg/Timer/ArchTimerBBTestFunction.c > b/TestCasePkg/Timer/ArchTimerBBTestFunction.c > index dc76bec..9a78eec 100644 > --- a/TestCasePkg/Timer/ArchTimerBBTestFunction.c > +++ b/TestCasePkg/Timer/ArchTimerBBTestFunction.c > @@ -27,6 +27,7 @@ >  // TDS 4.1 >  // >  EFI_STATUS > +EFIAPI >  BBTestRegisterHandlerInterfaceTest ( >      IN EFI_BB_TEST_PROTOCOL       *This, >      IN VOID                       *ClientInterface, > @@ -259,6 +260,7 @@ BBTestRegisterHandlerInterfaceTest ( >  // TDS 4.2 >  // >  EFI_STATUS > +EFIAPI >  BBTestSetTimerPeriodInterfaceTest ( >      IN EFI_BB_TEST_PROTOCOL       *This, >      IN VOID                       *ClientInterface, > @@ -584,6 +586,7 @@ BBTestSetTimerPeriodInterfaceTest ( >  // TDS 4.3 >  // >  EFI_STATUS > +EFIAPI >  BBTestGetTimerPeriodInterfaceTest ( >      IN EFI_BB_TEST_PROTOCOL       *This, >      IN VOID                       *ClientInterface, > @@ -728,6 +731,7 @@ BBTestGetTimerPeriodInterfaceTest ( >  // TDS 4.4 >  // >  EFI_STATUS > +EFIAPI >  BBTestGenerateSoftInterruptInterfaceTest ( >      IN EFI_BB_TEST_PROTOCOL       *This, >      IN VOID                       *ClientInterface, > diff --git a/TestCasePkg/Timer/ArchTimerBBTestMain.c > b/TestCasePkg/Timer/ArchTimerBBTestMain.c > index fc36c27..f41c8a6 100644 > --- a/TestCasePkg/Timer/ArchTimerBBTestMain.c > +++ b/TestCasePkg/Timer/ArchTimerBBTestMain.c > @@ -88,7 +88,9 @@ EFI_BB_TEST_ENTRY_FIELD gBBTestEntryField[] = { >      EFI_TEST_CASE_AUTO | EFI_TEST_CASE_RESET_REQUIRED, >      BBTestGenerateSoftInterruptInterfaceTest >    }, > -  0 > +  { > +  ZERO_GUID > +  } >  }; >   >   > diff --git a/TestCasePkg/Timer/Guid.h b/TestCasePkg/Timer/Guid.h > index 47bcbc8..7b154fe 100644 > --- a/TestCasePkg/Timer/Guid.h > +++ b/TestCasePkg/Timer/Guid.h > @@ -14,102 +14,101 @@ >   >   >  #define EFI_TEST_ARCHTIMERCONSISTENCYTEST_ASSERTION_001_GUID \ > -{ 0x6c68726e, 0xa1c1, 0x450d, 0x91, 0x54, 0x0d, 0x73, 0x34, 0xa2, > 0xa3, 0x62 } > +{ 0x6c68726e, 0xa1c1, 0x450d, {0x91, 0x54, 0x0d, 0x73, 0x34, 0xa2, > 0xa3, 0x62 }} >   >  extern EFI_GUID gArchTimerConsistencyTestAssertionGuid001; >   >  #define EFI_TEST_ARCHTIMERCONSISTENCYTEST_ASSERTION_002_GUID \ > -{ 0x762d3586, 0x3bad, 0x40a5, 0xa1, 0x16, 0x6f, 0x30, 0xa2, 0xb5, > 0x6b, 0x2a } > +{ 0x762d3586, 0x3bad, 0x40a5, {0xa1, 0x16, 0x6f, 0x30, 0xa2, 0xb5, > 0x6b, 0x2a }} >   >  extern EFI_GUID gArchTimerConsistencyTestAssertionGuid002; >   >  #define EFI_TEST_ARCHTIMERCONSISTENCYTEST_ASSERTION_003_GUID \ > -{ 0xfb0fa1fe, 0xb026, 0x4f7f, 0xb2, 0x94, 0xeb, 0x01, 0x8a, 0x90, > 0xf5, 0xfc } > +{ 0xfb0fa1fe, 0xb026, 0x4f7f, {0xb2, 0x94, 0xeb, 0x01, 0x8a, 0x90, > 0xf5, 0xfc }} >   >  extern EFI_GUID gArchTimerConsistencyTestAssertionGuid003; >   >  #define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_001_GUID \ > -{ 0x23dedf70, 0x457c, 0x4a97, 0x8f, 0x1b, 0xb2, 0xa6, 0xdc, 0xa3, > 0x03, 0x4a } > +{ 0x23dedf70, 0x457c, 0x4a97, {0x8f, 0x1b, 0xb2, 0xa6, 0xdc, 0xa3, > 0x03, 0x4a }} >   >  extern EFI_GUID gArchTimerInterfaceTestAssertionGuid001; >   >  #define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_002_GUID \ > -{ 0xa371de14, 0x690e, 0x4e7a, 0xae, 0x75, 0x5c, 0x5d, 0x6f, 0x2e, > 0x1a, 0xbf } > +{ 0xa371de14, 0x690e, 0x4e7a, {0xae, 0x75, 0x5c, 0x5d, 0x6f, 0x2e, > 0x1a, 0xbf }} >   >  extern EFI_GUID gArchTimerInterfaceTestAssertionGuid002; >   >  #define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_003_GUID \ > -{ 0x0c553adc, 0xc3e7, 0x4bdb, 0xb7, 0x19, 0xe2, 0x25, 0x6f, 0x8b, > 0xb7, 0x6d } > +{ 0x0c553adc, 0xc3e7, 0x4bdb, {0xb7, 0x19, 0xe2, 0x25, 0x6f, 0x8b, > 0xb7, 0x6d }} >   >  extern EFI_GUID gArchTimerInterfaceTestAssertionGuid003; >   >  #define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_004_GUID \ > -{ 0xa37674f4, 0xcac7, 0x426f, 0xbd, 0x42, 0xe6, 0xd4, 0x95, 0xec, > 0xdb, 0x7d } > +{ 0xa37674f4, 0xcac7, 0x426f, {0xbd, 0x42, 0xe6, 0xd4, 0x95, 0xec, > 0xdb, 0x7d }} >   >  extern EFI_GUID gArchTimerInterfaceTestAssertionGuid004; >   >  #define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_005_GUID \ > -{ 0x204d0d9e, 0x9537, 0x4a16, 0x96, 0xea, 0x5a, 0x3d, 0xeb, 0x4b, > 0xf6, 0x3e } > +{ 0x204d0d9e, 0x9537, 0x4a16, {0x96, 0xea, 0x5a, 0x3d, 0xeb, 0x4b, > 0xf6, 0x3e }} >   >  extern EFI_GUID gArchTimerInterfaceTestAssertionGuid005; >   >  #define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_006_GUID \ > -{ 0x67afcccd, 0xce79, 0x43e8, 0xab, 0x7f, 0x91, 0xcd, 0x84, 0x80, > 0xae, 0xfc } > +{ 0x67afcccd, 0xce79, 0x43e8, {0xab, 0x7f, 0x91, 0xcd, 0x84, 0x80, > 0xae, 0xfc }} >   >  extern EFI_GUID gArchTimerInterfaceTestAssertionGuid006; >   >  #define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_007_GUID \ > -{ 0x793a3655, 0x1dec, 0x4bf0, 0x88, 0xea, 0xa7, 0xb6, 0xf5, 0x18, > 0x0a, 0x2a } > +{ 0x793a3655, 0x1dec, 0x4bf0, {0x88, 0xea, 0xa7, 0xb6, 0xf5, 0x18, > 0x0a, 0x2a }} >   >  extern EFI_GUID gArchTimerInterfaceTestAssertionGuid007; >   >  #define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_008_GUID \ > -{ 0xab6bdf70, 0xb727, 0x4731, 0xba, 0x36, 0x78, 0x69, 0x8d, 0x18, > 0xce, 0x49 } > +{ 0xab6bdf70, 0xb727, 0x4731, {0xba, 0x36, 0x78, 0x69, 0x8d, 0x18, > 0xce, 0x49 }} >   >  extern EFI_GUID gArchTimerInterfaceTestAssertionGuid008; >   >  #define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_009_GUID \ > -{ 0x3632e6d6, 0x27e2, 0x46d6, 0xaa, 0xc2, 0x97, 0xc5, 0x1e, 0x83, > 0xaa, 0x5c } > +{ 0x3632e6d6, 0x27e2, 0x46d6, {0xaa, 0xc2, 0x97, 0xc5, 0x1e, 0x83, > 0xaa, 0x5c }} >   >  extern EFI_GUID gArchTimerInterfaceTestAssertionGuid009; >   >  #define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_010_GUID \ > -{ 0x49cf6051, 0x74d0, 0x4ab7, 0x9c, 0xd2, 0x30, 0xb3, 0x69, 0xfe, > 0xaf, 0x76 } > +{ 0x49cf6051, 0x74d0, 0x4ab7, {0x9c, 0xd2, 0x30, 0xb3, 0x69, 0xfe, > 0xaf, 0x76 }} >   >  extern EFI_GUID gArchTimerInterfaceTestAssertionGuid010; >   >  #define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_011_GUID \ > -{ 0x8d9692d1, 0x7772, 0x44b3, 0xad, 0x42, 0xa8, 0xda, 0x7f, 0x9b, > 0x66, 0xc8 } > +{ 0x8d9692d1, 0x7772, 0x44b3, {0xad, 0x42, 0xa8, 0xda, 0x7f, 0x9b, > 0x66, 0xc8 }} >   >  extern EFI_GUID gArchTimerInterfaceTestAssertionGuid011; >   >  #define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_012_GUID \ > -{ 0xb19dd34f, 0x3bae, 0x41eb, 0x92, 0xdf, 0x56, 0x9e, 0x80, 0x95, > 0x21, 0x2f } > +{ 0xb19dd34f, 0x3bae, 0x41eb, {0x92, 0xdf, 0x56, 0x9e, 0x80, 0x95, > 0x21, 0x2f }} >   >  extern EFI_GUID gArchTimerInterfaceTestAssertionGuid012; >   >  #define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_013_GUID \ > -{ 0xe3bb8873, 0xcdf7, 0x4c4c, 0x96, 0x3f, 0xf6, 0xeb, 0x23, 0x2c, > 0xa9, 0x05 } > +{ 0xe3bb8873, 0xcdf7, 0x4c4c, {0x96, 0x3f, 0xf6, 0xeb, 0x23, 0x2c, > 0xa9, 0x05 }} >   >  extern EFI_GUID gArchTimerInterfaceTestAssertionGuid013; >   >  #define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_014_GUID \ > -{ 0x3e2686aa, 0xaa79, 0x4f2a, 0xb8, 0xb2, 0xd4, 0x05, 0x37, 0xf2, > 0x3e, 0xc0 } > +{ 0x3e2686aa, 0xaa79, 0x4f2a, {0xb8, 0xb2, 0xd4, 0x05, 0x37, 0xf2, > 0x3e, 0xc0 }} >   >  extern EFI_GUID gArchTimerInterfaceTestAssertionGuid014; >   >  #define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_015_GUID \ > -{ 0x7d0e2fa0, 0xc40b, 0x47e3, 0x96, 0x70, 0xc8, 0x69, 0xe5, 0x2c, > 0x29, 0x41 } > +{ 0x7d0e2fa0, 0xc40b, 0x47e3, {0x96, 0x70, 0xc8, 0x69, 0xe5, 0x2c, > 0x29, 0x41 }} >   >  extern EFI_GUID gArchTimerInterfaceTestAssertionGuid015; >   >  #define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_016_GUID \ > -{ 0xae2aae66, 0x2510, 0x47a5, 0x83, 0x6f, 0xdc, 0xd8, 0x55, 0xff, > 0x9a, 0x32 } > +{ 0xae2aae66, 0x2510, 0x47a5, {0x83, 0x6f, 0xdc, 0xd8, 0x55, 0xff, > 0x9a, 0x32 }} >   >  extern EFI_GUID gArchTimerInterfaceTestAssertionGuid016; >   >  #define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_017_GUID \ > -{ 0xdc368011, 0x1a7f, 0x4e3a, 0x8f, 0xaf, 0x70, 0x9e, 0x71, 0x85, > 0x94, 0x5d } > +{ 0xdc368011, 0x1a7f, 0x4e3a, {0x8f, 0xaf, 0x70, 0x9e, 0x71, 0x85, > 0x94, 0x5d }} >   >  extern EFI_GUID gArchTimerInterfaceTestAssertionGuid017; > -