Re: [edk2-devel] [edk2-platforms] [PATCH V1] KabylakeOpenBoardPkg/AspireVn7Dash572G: Fix Visual Studio Build
Pushed: https://github.com/tianocore/edk2-platforms/commit/be67e47 -Original Message- From: devel@edk2.groups.io On Behalf Of Nate DeSimone Sent: Tuesday, September 28, 2021 6:03 PM To: devel@edk2.groups.io Cc: Chiu, Chasel ; Benjamin Doron Subject: [edk2-devel] [edk2-platforms] [PATCH V1] KabylakeOpenBoardPkg/AspireVn7Dash572G: Fix Visual Studio Build AspireVn7Dash572G currently does not build with Visual Studio. This is due to the Visual C++ compiler generating warnings with the GCC compiler does not. The two classes of issues are unused local variables and implicit integer casts that could result in truncation. Visual C++ requires an explicit cast in cases where integer truncation is possible. Cc: Chasel Chiu Cc: Benjamin Doron Signed-off-by: Nate DeSimone --- .../AspireVn7Dash572G/Library/BoardEcLib/EcCommands.c| 9 + .../Library/BoardInitLib/DxeBoardInitLib.c | 3 ++- .../Library/BoardInitLib/PeiAspireVn7Dash572GDetect.c| 3 +-- .../BoardInitLib/PeiAspireVn7Dash572GInitPostMemLib.c| 7 +++ .../PeiSiliconPolicyUpdateLib.inf| 2 ++ 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardEcLib/EcCommands.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardEcLib/EcCommands.c index ea8a8ae11e..6e752b4e22 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardEcLib/EcCommands.c +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/Boar +++ dEcLib/EcCommands.c @@ -2,6 +2,7 @@ Board-specific EC commands. Copyright (c) 2021, Baruch Binyamin Doron + Copyright (c) 2021, Intel Corporation. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -167,8 +168,8 @@ EcIdxRead ( return; } - IoWrite8 (EC_INDEX_IO_HIGH_ADDR_PORT, Address >> 8); - IoWrite8 (EC_INDEX_IO_LOW_ADDR_PORT, Address); + IoWrite8 (EC_INDEX_IO_HIGH_ADDR_PORT, (UINT8) (Address >> 8)); + IoWrite8 (EC_INDEX_IO_LOW_ADDR_PORT, (UINT8) Address); *Data = IoRead8 (EC_INDEX_IO_DATA_PORT); } @@ -184,8 +185,8 @@ EcIdxWrite ( IN UINT8 Data ) { - IoWrite8 (EC_INDEX_IO_HIGH_ADDR_PORT, Address >> 8); - IoWrite8 (EC_INDEX_IO_LOW_ADDR_PORT, Address); + IoWrite8 (EC_INDEX_IO_HIGH_ADDR_PORT, (UINT8) (Address >> 8)); + IoWrite8 (EC_INDEX_IO_LOW_ADDR_PORT, (UINT8) Address); IoWrite8 (EC_INDEX_IO_DATA_PORT, Data); } diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/DxeBoardInitLib.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/DxeBoardInitLib.c index 4bce51886e..5c5c26d85c 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/DxeBoardInitLib.c +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/Boar +++ dInitLib/DxeBoardInitLib.c @@ -2,6 +2,7 @@ Aspire VN7-572G Board Initialization DXE library Copyright (c) 2021, Baruch Binyamin Doron + Copyright (c) 2021, Intel Corporation. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -46,7 +47,7 @@ EcSendTime ( SendEcCommand (0xE0); for (Index = 0; Index < 4; Index++) { // Shift bytes -EcTimeByte = EcTime >> Index*8; +EcTimeByte = (UINT8) (EcTime >> (Index * 8)); DEBUG ((DEBUG_INFO, "EC: Sending 0x%x (iteration %d)\n", EcTimeByte, Index)); SendEcData (EcTimeByte); } diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GDetect.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GDetect.c index d379fdb0d4..344e06859e 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GDetect.c +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/Boar +++ dInitLib/PeiAspireVn7Dash572GDetect.c @@ -1,6 +1,6 @@ /** @file -Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved. +Copyright (c) 2017 - 2021, Intel Corporation. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -29,7 +29,6 @@ GetAspireVn7Dash572GBoardId ( OUT UINT8*BoardId ) { - EFI_STATUSStatus; UINT16DataBuffer; ReadEcAdcConverter (MODEL_ID_AD, &DataBuffer); diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GInitPostMemLib.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GInitPostMemLib.c index 2946e174ca..77722f5d60 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GInitPostMemLib.c +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/Boar +++ dInitLib/PeiAspireVn7Dash572GInitPostMemLib.c @@ -1,6 +1,6 @@ /** @file
Re: [edk2-devel] [edk2-platforms] [PATCH V1] KabylakeOpenBoardPkg/AspireVn7Dash572G: Fix Visual Studio Build
Reviewed-by: Chasel Chiu > -Original Message- > From: Desimone, Nathaniel L > Sent: Wednesday, September 29, 2021 9:03 AM > To: devel@edk2.groups.io > Cc: Chiu, Chasel ; Benjamin Doron > > Subject: [edk2-platforms] [PATCH V1] > KabylakeOpenBoardPkg/AspireVn7Dash572G: Fix Visual Studio Build > > AspireVn7Dash572G currently does not build with Visual Studio. > This is due to the Visual C++ compiler generating warnings with the GCC > compiler does not. The two classes of issues are unused local variables and > implicit integer casts that could result in truncation. Visual C++ requires an > explicit cast in cases where integer truncation is possible. > > Cc: Chasel Chiu > Cc: Benjamin Doron > Signed-off-by: Nate DeSimone > --- > .../AspireVn7Dash572G/Library/BoardEcLib/EcCommands.c| 9 + > .../Library/BoardInitLib/DxeBoardInitLib.c | 3 ++- > .../Library/BoardInitLib/PeiAspireVn7Dash572GDetect.c| 3 +-- > .../BoardInitLib/PeiAspireVn7Dash572GInitPostMemLib.c| 7 +++ > .../PeiSiliconPolicyUpdateLib.inf| 2 ++ > 5 files changed, 13 insertions(+), 11 deletions(-) > > diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardEcL > ib/EcCommands.c > b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardEcL > ib/EcCommands.c > index ea8a8ae11e..6e752b4e22 100644 > --- > a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardEcL > ib/EcCommands.c > +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/Boar > +++ dEcLib/EcCommands.c > @@ -2,6 +2,7 @@ >Board-specific EC commands. > >Copyright (c) 2021, Baruch Binyamin Doron > + Copyright (c) 2021, Intel Corporation. All rights reserved. >SPDX-License-Identifier: BSD-2-Clause-Patent > > **/ > @@ -167,8 +168,8 @@ EcIdxRead ( > return; >} > > - IoWrite8 (EC_INDEX_IO_HIGH_ADDR_PORT, Address >> 8); > - IoWrite8 (EC_INDEX_IO_LOW_ADDR_PORT, Address); > + IoWrite8 (EC_INDEX_IO_HIGH_ADDR_PORT, (UINT8) (Address >> 8)); > + IoWrite8 (EC_INDEX_IO_LOW_ADDR_PORT, (UINT8) Address); >*Data = IoRead8 (EC_INDEX_IO_DATA_PORT); } > > @@ -184,8 +185,8 @@ EcIdxWrite ( >IN UINT8 Data >) > { > - IoWrite8 (EC_INDEX_IO_HIGH_ADDR_PORT, Address >> 8); > - IoWrite8 (EC_INDEX_IO_LOW_ADDR_PORT, Address); > + IoWrite8 (EC_INDEX_IO_HIGH_ADDR_PORT, (UINT8) (Address >> 8)); > + IoWrite8 (EC_INDEX_IO_LOW_ADDR_PORT, (UINT8) Address); >IoWrite8 (EC_INDEX_IO_DATA_PORT, Data); } > > diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInit > Lib/DxeBoardInitLib.c > b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInit > Lib/DxeBoardInitLib.c > index 4bce51886e..5c5c26d85c 100644 > --- > a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInit > Lib/DxeBoardInitLib.c > +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/Boar > +++ dInitLib/DxeBoardInitLib.c > @@ -2,6 +2,7 @@ >Aspire VN7-572G Board Initialization DXE library > >Copyright (c) 2021, Baruch Binyamin Doron > + Copyright (c) 2021, Intel Corporation. All rights reserved. >SPDX-License-Identifier: BSD-2-Clause-Patent > > **/ > @@ -46,7 +47,7 @@ EcSendTime ( >SendEcCommand (0xE0); >for (Index = 0; Index < 4; Index++) { > // Shift bytes > -EcTimeByte = EcTime >> Index*8; > +EcTimeByte = (UINT8) (EcTime >> (Index * 8)); > DEBUG ((DEBUG_INFO, "EC: Sending 0x%x (iteration %d)\n", EcTimeByte, > Index)); > SendEcData (EcTimeByte); >} > diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInit > Lib/PeiAspireVn7Dash572GDetect.c > b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInit > Lib/PeiAspireVn7Dash572GDetect.c > index d379fdb0d4..344e06859e 100644 > --- > a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInit > Lib/PeiAspireVn7Dash572GDetect.c > +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/Boar > +++ dInitLib/PeiAspireVn7Dash572GDetect.c > @@ -1,6 +1,6 @@ > /** @file > > -Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved. > +Copyright (c) 2017 - 2021, Intel Corporation. All rights reserved. > SPDX-License-Identifier: BSD-2-Clause-Patent > > **/ > @@ -29,7 +29,6 @@ GetAspireVn7Dash572GBoardId ( >OUT UINT8*BoardId >) > { > - EFI_STATUSStatus; >UINT16DataBuffer; > >ReadEcAdcConverter (MODEL_ID_AD, &DataBuffer); diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInit > Lib/PeiAspireVn7Dash572GInitPostMemLib.c > b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInit > Lib/PeiAspireVn7Dash572GInitPostMemLib.c > index 2946e174ca..77722f5d60 100644 > --- > a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInit > Lib/PeiAspireVn7Dash572GInitPostMemLib.c > +++ b/Platform/Intel/KabylakeOpenBoardPkg/A
[edk2-devel] [edk2-platforms] [PATCH V1] KabylakeOpenBoardPkg/AspireVn7Dash572G: Fix Visual Studio Build
AspireVn7Dash572G currently does not build with Visual Studio. This is due to the Visual C++ compiler generating warnings with the GCC compiler does not. The two classes of issues are unused local variables and implicit integer casts that could result in truncation. Visual C++ requires an explicit cast in cases where integer truncation is possible. Cc: Chasel Chiu Cc: Benjamin Doron Signed-off-by: Nate DeSimone --- .../AspireVn7Dash572G/Library/BoardEcLib/EcCommands.c| 9 + .../Library/BoardInitLib/DxeBoardInitLib.c | 3 ++- .../Library/BoardInitLib/PeiAspireVn7Dash572GDetect.c| 3 +-- .../BoardInitLib/PeiAspireVn7Dash572GInitPostMemLib.c| 7 +++ .../PeiSiliconPolicyUpdateLib.inf| 2 ++ 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardEcLib/EcCommands.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardEcLib/EcCommands.c index ea8a8ae11e..6e752b4e22 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardEcLib/EcCommands.c +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardEcLib/EcCommands.c @@ -2,6 +2,7 @@ Board-specific EC commands. Copyright (c) 2021, Baruch Binyamin Doron + Copyright (c) 2021, Intel Corporation. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -167,8 +168,8 @@ EcIdxRead ( return; } - IoWrite8 (EC_INDEX_IO_HIGH_ADDR_PORT, Address >> 8); - IoWrite8 (EC_INDEX_IO_LOW_ADDR_PORT, Address); + IoWrite8 (EC_INDEX_IO_HIGH_ADDR_PORT, (UINT8) (Address >> 8)); + IoWrite8 (EC_INDEX_IO_LOW_ADDR_PORT, (UINT8) Address); *Data = IoRead8 (EC_INDEX_IO_DATA_PORT); } @@ -184,8 +185,8 @@ EcIdxWrite ( IN UINT8 Data ) { - IoWrite8 (EC_INDEX_IO_HIGH_ADDR_PORT, Address >> 8); - IoWrite8 (EC_INDEX_IO_LOW_ADDR_PORT, Address); + IoWrite8 (EC_INDEX_IO_HIGH_ADDR_PORT, (UINT8) (Address >> 8)); + IoWrite8 (EC_INDEX_IO_LOW_ADDR_PORT, (UINT8) Address); IoWrite8 (EC_INDEX_IO_DATA_PORT, Data); } diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/DxeBoardInitLib.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/DxeBoardInitLib.c index 4bce51886e..5c5c26d85c 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/DxeBoardInitLib.c +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/DxeBoardInitLib.c @@ -2,6 +2,7 @@ Aspire VN7-572G Board Initialization DXE library Copyright (c) 2021, Baruch Binyamin Doron + Copyright (c) 2021, Intel Corporation. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -46,7 +47,7 @@ EcSendTime ( SendEcCommand (0xE0); for (Index = 0; Index < 4; Index++) { // Shift bytes -EcTimeByte = EcTime >> Index*8; +EcTimeByte = (UINT8) (EcTime >> (Index * 8)); DEBUG ((DEBUG_INFO, "EC: Sending 0x%x (iteration %d)\n", EcTimeByte, Index)); SendEcData (EcTimeByte); } diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GDetect.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GDetect.c index d379fdb0d4..344e06859e 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GDetect.c +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GDetect.c @@ -1,6 +1,6 @@ /** @file -Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved. +Copyright (c) 2017 - 2021, Intel Corporation. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -29,7 +29,6 @@ GetAspireVn7Dash572GBoardId ( OUT UINT8*BoardId ) { - EFI_STATUSStatus; UINT16DataBuffer; ReadEcAdcConverter (MODEL_ID_AD, &DataBuffer); diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GInitPostMemLib.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GInitPostMemLib.c index 2946e174ca..77722f5d60 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GInitPostMemLib.c +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GInitPostMemLib.c @@ -1,6 +1,6 @@ /** @file -Copyright (c) 2017, Intel Corporation. All rights reserved. +Copyright (c) 2017 - 2021, Intel Corporation. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -40,7 +40,6 @@ EcInit ( UINT16 ABase; UINT16 Pm1Sts; UINT32 GpeSts; - UINT16 XhciPmCs; /* This is called via a "$FNC" in a PeiOemModule pointer table, with "$DPX" on SiInit */ IoWrite8 (0x6C, 0x5A); // 6Ch i