tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add type cast on variable before operation. 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
Reviewed-by: Eric Dong <Eric.Dong@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15778 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Jeff Fan 2014-08-08 05:52:01 +00:00 committed by vanjeff
parent 31fc7b4d6a
commit 1a45b15eae
10 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c
View File

@ -3,7 +3,7 @@
Child device(Disk, CDROM, etc) enumeration and child handler installation, and Child device(Disk, CDROM, etc) enumeration and child handler installation, and
driver stop. driver stop.
Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -433,7 +433,7 @@ IDEBusDriverBindingStart (
&Supports &Supports
); );
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
Supports &= EFI_PCI_DEVICE_ENABLE; Supports &= (UINT64)EFI_PCI_DEVICE_ENABLE;
Status = PciIo->Attributes ( Status = PciIo->Attributes (
PciIo, PciIo,
EfiPciIoAttributeOperationEnable, EfiPciIoAttributeOperationEnable,
@ -1004,7 +1004,7 @@ IDEBusDriverBindingStop (
&Supports &Supports
); );
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
Supports &= EFI_PCI_IO_ATTRIBUTE_IDE_PRIMARY_IO | EFI_PCI_IO_ATTRIBUTE_IDE_SECONDARY_IO | EFI_PCI_DEVICE_ENABLE; Supports &= (UINT64)(EFI_PCI_IO_ATTRIBUTE_IDE_PRIMARY_IO | EFI_PCI_IO_ATTRIBUTE_IDE_SECONDARY_IO | EFI_PCI_DEVICE_ENABLE);
PciIo->Attributes ( PciIo->Attributes (
PciIo, PciIo,
EfiPciIoAttributeOperationDisable, EfiPciIoAttributeOperationDisable,

6
IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/BiosSnp16.c
View File

@ -358,7 +358,7 @@ BiosSnp16DriverBindingStart (
&Supports &Supports
); );
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
Supports &= EFI_PCI_DEVICE_ENABLE; Supports &= (UINT64)EFI_PCI_DEVICE_ENABLE;
Status = PciIo->Attributes ( Status = PciIo->Attributes (
PciIo, PciIo,
EfiPciIoAttributeOperationEnable, EfiPciIoAttributeOperationEnable,
@ -793,7 +793,7 @@ Done:
&Supports &Supports
); );
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
Supports &= EFI_PCI_DEVICE_ENABLE; Supports &= (UINT64)EFI_PCI_DEVICE_ENABLE;
Status = PciIo->Attributes ( Status = PciIo->Attributes (
PciIo, PciIo,
EfiPciIoAttributeOperationDisable, EfiPciIoAttributeOperationDisable,
@ -876,7 +876,7 @@ BiosSnp16DriverBindingStop (
&Supports &Supports
); );
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
Supports &= EFI_PCI_DEVICE_ENABLE; Supports &= (UINT64)EFI_PCI_DEVICE_ENABLE;
Status = PciIo->Attributes ( Status = PciIo->Attributes (
PciIo, PciIo,
EfiPciIoAttributeOperationDisable, EfiPciIoAttributeOperationDisable,

4
IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/BiosVideo.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
ConsoleOut Routines that speak VGA. ConsoleOut Routines that speak VGA.
Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR> Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions are licensed and made available under the terms and conditions
@ -315,7 +315,7 @@ BiosVideoDriverBindingStart (
goto Done; goto Done;
} }
Supports &= (EFI_PCI_IO_ATTRIBUTE_VGA_IO | EFI_PCI_IO_ATTRIBUTE_VGA_IO_16); Supports &= (UINT64)(EFI_PCI_IO_ATTRIBUTE_VGA_IO | EFI_PCI_IO_ATTRIBUTE_VGA_IO_16);
if (Supports == 0 || Supports == (EFI_PCI_IO_ATTRIBUTE_VGA_IO | EFI_PCI_IO_ATTRIBUTE_VGA_IO_16)) { if (Supports == 0 || Supports == (EFI_PCI_IO_ATTRIBUTE_VGA_IO | EFI_PCI_IO_ATTRIBUTE_VGA_IO_16)) {
Status = EFI_UNSUPPORTED; Status = EFI_UNSUPPORTED;
goto Done; goto Done;

4
IntelFrameworkModulePkg/Csm/LegacyBiosDxe/Ipf/IpfBootSupport.c
View File

@ -1,6 +1,6 @@
/** @file /** @file
Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions are licensed and made available under the terms and conditions
@ -226,7 +226,7 @@ RelocateImageUnder4GIfNeeded (
// Align buffer on section boundry // Align buffer on section boundry
// //
ImageContext.ImageAddress += ImageContext.SectionAlignment - 1; ImageContext.ImageAddress += ImageContext.SectionAlignment - 1;
ImageContext.ImageAddress &= ~(ImageContext.SectionAlignment - 1); ImageContext.ImageAddress &= ~((PHYSICAL_ADDRESS)ImageContext.SectionAlignment - 1);
// //
// Load the image to our new buffer // Load the image to our new buffer

4
IntelFrameworkModulePkg/Csm/LegacyBiosDxe/Ipf/Thunk.c
View File

@ -4,7 +4,7 @@
BugBug: Thunker does A20 gate. Can we get rid of this code or BugBug: Thunker does A20 gate. Can we get rid of this code or
put it into Legacy16 code. put it into Legacy16 code.
Copyright (c) 1999 - 2010, Intel Corporation. All rights reserved.<BR> Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions are licensed and made available under the terms and conditions
@ -67,7 +67,7 @@ BiosIntCall (
UINT64 IntTypeVariable; UINT64 IntTypeVariable;
IntTypeVariable = 0x8000000000000000; IntTypeVariable = 0x8000000000000000;
IntTypeVariable |= BiosInt; IntTypeVariable |= (UINT64)BiosInt;
DwordRegs.Cs = Segment; DwordRegs.Cs = Segment;
DwordRegs.Eip = Offset; DwordRegs.Eip = Offset;

10
IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyPci.c
View File

@ -1198,7 +1198,7 @@ PciProgramAllInterruptLineRegisters (
&Supports &Supports
); );
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
Supports &= EFI_PCI_DEVICE_ENABLE; Supports &= (UINT64)EFI_PCI_DEVICE_ENABLE;
Status = PciIo->Attributes ( Status = PciIo->Attributes (
PciIo, PciIo,
EfiPciIoAttributeOperationEnable, EfiPciIoAttributeOperationEnable,
@ -1772,7 +1772,7 @@ PciShadowRoms (
&Supports &Supports
); );
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
Supports &= EFI_PCI_DEVICE_ENABLE; Supports &= (UINT64)EFI_PCI_DEVICE_ENABLE;
Status = PciIo->Attributes ( Status = PciIo->Attributes (
PciIo, PciIo,
EfiPciIoAttributeOperationEnable, EfiPciIoAttributeOperationEnable,
@ -1895,7 +1895,7 @@ LegacyBiosCheckPciRomEx (
// //
Status = IsLegacyRom (PciHandle); Status = IsLegacyRom (PciHandle);
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
*Flags |= (ROM_FOUND | VALID_LEGACY_ROM); *Flags |= (UINTN)(ROM_FOUND | VALID_LEGACY_ROM);
return EFI_SUCCESS; return EFI_SUCCESS;
} }
// //
@ -2187,8 +2187,8 @@ LegacyBiosInstallVgaRom (
&Supports &Supports
); );
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
Supports &= EFI_PCI_DEVICE_ENABLE | EFI_PCI_IO_ATTRIBUTE_VGA_MEMORY | \ Supports &= (UINT64)(EFI_PCI_DEVICE_ENABLE | EFI_PCI_IO_ATTRIBUTE_VGA_MEMORY | \
EFI_PCI_IO_ATTRIBUTE_VGA_IO | EFI_PCI_IO_ATTRIBUTE_VGA_IO_16; EFI_PCI_IO_ATTRIBUTE_VGA_IO | EFI_PCI_IO_ATTRIBUTE_VGA_IO_16);
Status = PciIo->Attributes ( Status = PciIo->Attributes (
PciIo, PciIo,
EfiPciIoAttributeOperationEnable, EfiPciIoAttributeOperationEnable,

2
IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
View File

@ -1413,7 +1413,7 @@ BdsSetBootPriority4SameTypeDev (
break; break;
} }
DevOrderPtr = (LEGACY_DEV_ORDER_ENTRY *) ((UINT8 *) DevOrderPtr + sizeof (BBS_TYPE) + DevOrderPtr->Length); DevOrderPtr = (LEGACY_DEV_ORDER_ENTRY *) ((UINTN) DevOrderPtr + sizeof (BBS_TYPE) + DevOrderPtr->Length);
} }
if ((UINT8 *) DevOrderPtr >= (UINT8 *) DevOrder + DevOrderSize) { if ((UINT8 *) DevOrderPtr >= (UINT8 *) DevOrder + DevOrderSize) {

4
IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
View File

@ -1761,12 +1761,12 @@ GetLegacyDeviceOrder (
break; break;
} }
WorkingVarData += sizeof (BBS_TYPE); WorkingVarData = (UINT8 *)((UINTN)WorkingVarData + sizeof (BBS_TYPE));
WorkingVarData += *(UINT16 *) WorkingVarData; WorkingVarData += *(UINT16 *) WorkingVarData;
DevOrder = (LEGACY_DEV_ORDER_ENTRY *) WorkingVarData; DevOrder = (LEGACY_DEV_ORDER_ENTRY *) WorkingVarData;
} }
for (OptionIndex = 0; OptionIndex < OptionMenu->MenuNumber; OptionIndex++) { for (OptionIndex = 0; OptionIndex < OptionMenu->MenuNumber; OptionIndex++) {
VarDevOrder = *(UINT16 *) ((UINT8 *) DevOrder + sizeof (BBS_TYPE) + sizeof (UINT16) + OptionIndex * sizeof (UINT16)); VarDevOrder = *(UINT16 *) ((UINTN) DevOrder + sizeof (BBS_TYPE) + sizeof (UINT16) + OptionIndex * sizeof (UINT16));
if (0xFF00 == (VarDevOrder & 0xFF00)) { if (0xFF00 == (VarDevOrder & 0xFF00)) {
LegacyOrder[OptionIndex] = 0xFF; LegacyOrder[OptionIndex] = 0xFF;
Pos = (VarDevOrder & 0xFF) / 8; Pos = (VarDevOrder & 0xFF) / 8;

4
IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
View File

@ -1303,7 +1303,7 @@ UpdateSetLegacyDeviceOrderPage (
break; break;
} }
VarData += sizeof (BBS_TYPE); VarData = (UINT8 *)((UINTN)VarData + sizeof (BBS_TYPE));
VarData += *(UINT16 *) VarData; VarData += *(UINT16 *) VarData;
DevOrder = (LEGACY_DEV_ORDER_ENTRY *) VarData; DevOrder = (LEGACY_DEV_ORDER_ENTRY *) VarData;
} }
@ -1333,7 +1333,7 @@ UpdateSetLegacyDeviceOrderPage (
NULL NULL
); );
VarDevOrder = *(UINT16 *) ((UINT8 *) DevOrder + sizeof (BBS_TYPE) + sizeof (UINT16) + Index * sizeof (UINT16)); VarDevOrder = *(UINT16 *) ((UINTN) DevOrder + sizeof (BBS_TYPE) + sizeof (UINT16) + Index * sizeof (UINT16));
if (0xFF00 == (VarDevOrder & 0xFF00)) { if (0xFF00 == (VarDevOrder & 0xFF00)) {
LegacyOrder[Index] = 0xFF; LegacyOrder[Index] = 0xFF;

2
IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
View File

@ -1085,7 +1085,7 @@ PlatformBdsEnterFrontPage (
// //
// Clear EFI_OS_INDICATIONS_BOOT_TO_FW_UI to acknowledge OS // Clear EFI_OS_INDICATIONS_BOOT_TO_FW_UI to acknowledge OS
// //
OsIndication &= ~EFI_OS_INDICATIONS_BOOT_TO_FW_UI; OsIndication &= ~((UINT64)EFI_OS_INDICATIONS_BOOT_TO_FW_UI);
Status = gRT->SetVariable ( Status = gRT->SetVariable (
L"OsIndications", L"OsIndications",
&gEfiGlobalVariableGuid, &gEfiGlobalVariableGuid,