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

Vlv2TbltDevicePkg/PlatformDxe: Remove the unused variables 

Fix the following errors from gcc:

Vlv2TbltDevicePkg/PlatformDxe/Platform.c: In function ?InitPciDevPME?:
Vlv2TbltDevicePkg/PlatformDxe/Platform.c:516:26: error: variable ?Status? set but not used [-Werror=unused-but-set-variable]

Vlv2TbltDevicePkg/PlatformDxe/Platform.c: In function ?InitThermalZone?:
Vlv2TbltDevicePkg/PlatformDxe/Platform.c:575:26: error: variable ?Status? set but not used [-Werror=unused-but-set-variable]

Vlv2TbltDevicePkg/PlatformDxe/IchRegTable.c: In function ?InitializeSubsystemIds?:
Vlv2TbltDevicePkg/PlatformDxe/IchRegTable.c:111:10: error: variable ?SubsystemAudioVidDid? set but not used [-Werror=unused-but-set-variable]

Vlv2TbltDevicePkg/PlatformDxe/PciDevice.c: In function ?InitBadBars?:
Vlv2TbltDevicePkg/PlatformDxe/PciDevice.c:115:40: error: variable ?PciIoDevice? set but not used [-Werror=unused-but-set-variable]
Vlv2TbltDevicePkg/PlatformDxe/PciDevice.c:114:39: error: variable ?Status? set but not used [-Werror=unused-but-set-variable]

Vlv2TbltDevicePkg/PlatformDxe/PciDevice.c: In function ?ProgramPciLatency?:
Vlv2TbltDevicePkg/PlatformDxe/PciDevice.c:320:39: error: variable ?Status? set but not used [-Werror=unused-but-set-variable]

Cc: David Wei <david.wei@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Gary Lin <glin@suse.com>
Reviewed-by: David Wei <david.wei@intel.com>
This commit is contained in:
Gary Lin 2016-07-29 11:25:34 +08:00 committed by david wei
parent 5c3bd3500f
commit 076d0d64aa
3 changed files with 122 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Vlv2TbltDevicePkg/PlatformDxe/IchRegTable.c
View File

@ -99,10 +99,8 @@ InitializeSubsystemIds (
EFI_REG_TABLE *RegTablePtr; EFI_REG_TABLE *RegTablePtr;
UINT32 SubsystemVidDid; UINT32 SubsystemVidDid;
UINT32 SubsystemAudioVidDid;
SubsystemVidDid = mPlatformInfo.SsidSvid; SubsystemVidDid = mPlatformInfo.SsidSvid;
SubsystemAudioVidDid = mPlatformInfo.SsidSvid;
RegTablePtr = mSubsystemIdRegs; RegTablePtr = mSubsystemIdRegs;

212
Vlv2TbltDevicePkg/PlatformDxe/PciDevice.c
View File

@ -102,8 +102,6 @@ InitBadBars(
) )
{ {
EFI_STATUS Status;
PCI_IO_DEVICE *PciIoDevice;
UINT64 BaseAddress = 0; UINT64 BaseAddress = 0;
UINT64 TempBaseAddress = 0; UINT64 TempBaseAddress = 0;
UINT8 RevId = 0; UINT8 RevId = 0;
@ -112,8 +110,6 @@ InitBadBars(
UINT64 MemSize; UINT64 MemSize;
UINTN MemSizeBits; UINTN MemSizeBits;
PciIoDevice = PCI_IO_DEVICE_FROM_PCI_IO_THIS (PciIo);
switch ( VendorId) { switch ( VendorId) {
case ATI_VENDOR_ID: case ATI_VENDOR_ID:
// //
@ -124,31 +120,31 @@ InitBadBars(
// //
// Get original BAR address // Get original BAR address
// //
Status = PciIo->Pci.Read ( PciIo->Pci.Read (
PciIo, PciIo,
EfiPciIoWidthUint32, EfiPciIoWidthUint32,
Bar, Bar,
1, 1,
(VOID *) &BaseAddress (VOID *) &BaseAddress
); );
// //
// Find BAR size // Find BAR size
// //
TempBaseAddress = 0xffffffff; TempBaseAddress = 0xffffffff;
Status = PciIo->Pci.Write ( PciIo->Pci.Write (
PciIo, PciIo,
EfiPciIoWidthUint32, EfiPciIoWidthUint32,
Bar, Bar,
1, 1,
(VOID *) &TempBaseAddress (VOID *) &TempBaseAddress
); );
Status = PciIo->Pci.Read ( PciIo->Pci.Read (
PciIo, PciIo,
EfiPciIoWidthUint32, EfiPciIoWidthUint32,
Bar, Bar,
1, 1,
(VOID *) &TempBaseAddress (VOID *) &TempBaseAddress
); );
TempBaseAddress &= 0xfffffffe; TempBaseAddress &= 0xfffffffe;
MemSize = 1; MemSize = 1;
while ((TempBaseAddress & 0x01) == 0) { while ((TempBaseAddress & 0x01) == 0) {
@ -159,32 +155,32 @@ InitBadBars(
// //
// Free up allocated memory memory and re-allocate with increased size. // Free up allocated memory memory and re-allocate with increased size.
// //
Status = gDS->FreeMemorySpace ( gDS->FreeMemorySpace (
BaseAddress, BaseAddress,
MemSize MemSize
); );
// //
// Force new alignment // Force new alignment
// //
MemSize = 0x8000000; MemSize = 0x8000000;
MemSizeBits = 28; MemSizeBits = 28;
Status = gDS->AllocateMemorySpace ( gDS->AllocateMemorySpace (
EfiGcdAllocateAnySearchBottomUp, EfiGcdAllocateAnySearchBottomUp,
EfiGcdMemoryTypeMemoryMappedIo, EfiGcdMemoryTypeMemoryMappedIo,
MemSizeBits, // Alignment MemSizeBits, // Alignment
MemSize, MemSize,
&BaseAddress, &BaseAddress,
mImageHandle, mImageHandle,
NULL NULL
); );
Status = PciIo->Pci.Write ( PciIo->Pci.Write (
PciIo, PciIo,
EfiPciIoWidthUint32, EfiPciIoWidthUint32,
Bar, Bar,
1, 1,
(VOID *) &BaseAddress (VOID *) &BaseAddress
); );
break; break;
case NCR_VENDOR_ID: case NCR_VENDOR_ID:
@ -195,22 +191,22 @@ InitBadBars(
// //
for (Bar = 0x10; Bar < 0x28; Bar+= 4) { for (Bar = 0x10; Bar < 0x28; Bar+= 4) {
Status = PciIo->Pci.Read ( PciIo->Pci.Read (
PciIo, PciIo,
EfiPciIoWidthUint32, EfiPciIoWidthUint32,
Bar, Bar,
1, 1,
(VOID *) &BaseAddress (VOID *) &BaseAddress
); );
if (BaseAddress && 0x01) { if (BaseAddress && 0x01) {
TempBaseAddress = 0xffffffff; TempBaseAddress = 0xffffffff;
Status = PciIo->Pci.Write ( PciIo->Pci.Write (
PciIo, PciIo,
EfiPciIoWidthUint32, EfiPciIoWidthUint32,
Bar, Bar,
1, 1,
(VOID *) &TempBaseAddress (VOID *) &TempBaseAddress
); );
TempBaseAddress &= 0xfffffffc; TempBaseAddress &= 0xfffffffc;
IoSize = 1; IoSize = 1;
while ((TempBaseAddress & 0x01) == 0) { while ((TempBaseAddress & 0x01) == 0) {
@ -218,28 +214,28 @@ InitBadBars(
IoSize = IoSize << 1; IoSize = IoSize << 1;
} }
if (IoSize < MIN_NCR_IO_SIZE) { if (IoSize < MIN_NCR_IO_SIZE) {
Status = gDS->FreeIoSpace ( gDS->FreeIoSpace (
BaseAddress, BaseAddress,
IoSize IoSize
); );
Status = gDS->AllocateIoSpace ( gDS->AllocateIoSpace (
EfiGcdAllocateAnySearchTopDown, EfiGcdAllocateAnySearchTopDown,
EfiGcdIoTypeIo, EfiGcdIoTypeIo,
NCR_GRAN, // Alignment NCR_GRAN, // Alignment
MIN_NCR_IO_SIZE, MIN_NCR_IO_SIZE,
&BaseAddress, &BaseAddress,
mImageHandle, mImageHandle,
NULL NULL
); );
TempBaseAddress = BaseAddress + 1; TempBaseAddress = BaseAddress + 1;
Status = PciIo->Pci.Write ( PciIo->Pci.Write (
PciIo, PciIo,
EfiPciIoWidthUint32, EfiPciIoWidthUint32,
Bar, Bar,
1, 1,
(VOID *) &TempBaseAddress (VOID *) &TempBaseAddress
); );
} }
} }
} }
@ -255,13 +251,13 @@ InitBadBars(
// Controller. // Controller.
// All Tekoa A2 or earlier step chips for now. // All Tekoa A2 or earlier step chips for now.
// //
Status = PciIo->Pci.Read ( PciIo->Pci.Read (
PciIo, PciIo,
EfiPciIoWidthUint8, EfiPciIoWidthUint8,
PCI_REVISION_ID_OFFSET, PCI_REVISION_ID_OFFSET,
1, 1,
&RevId &RevId
); );
if (RevId <= 0x02) { if (RevId <= 0x02) {
for (Bar = 0x14; Bar < 0x24; Bar+= 4) { for (Bar = 0x14; Bar < 0x24; Bar+= 4) {
// //
@ -269,13 +265,13 @@ InitBadBars(
// Bars don't worry aboyut freeing up thge allocs. // Bars don't worry aboyut freeing up thge allocs.
// //
TempBaseAddress = 0x0; TempBaseAddress = 0x0;
Status = PciIo->Pci.Write ( PciIo->Pci.Write (
PciIo, PciIo,
EfiPciIoWidthUint32, EfiPciIoWidthUint32,
Bar, Bar,
1, 1,
(VOID *) &TempBaseAddress (VOID *) &TempBaseAddress
); );
} // end for } // end for
} }
else else
@ -286,13 +282,13 @@ InitBadBars(
//since Tekoa does not fully support IDE Bus Mastering //since Tekoa does not fully support IDE Bus Mastering
// //
TempBaseAddress = 0x0; TempBaseAddress = 0x0;
Status = PciIo->Pci.Write ( PciIo->Pci.Write (
PciIo, PciIo,
EfiPciIoWidthUint32, EfiPciIoWidthUint32,
0x20, 0x20,
1, 1,
(VOID *) &TempBaseAddress (VOID *) &TempBaseAddress
); );
} }
} }
break; break;
@ -308,19 +304,17 @@ ProgramPciLatency(
IN EFI_PCI_IO_PROTOCOL *PciIo IN EFI_PCI_IO_PROTOCOL *PciIo
) )
{ {
EFI_STATUS Status;
// //
// Program Master Latency Timer // Program Master Latency Timer
// //
if (mSystemConfiguration.PciLatency != 0) { if (mSystemConfiguration.PciLatency != 0) {
Status = PciIo->Pci.Write ( PciIo->Pci.Write (
PciIo, PciIo,
EfiPciIoWidthUint8, EfiPciIoWidthUint8,
PCI_LATENCY_TIMER_OFFSET, PCI_LATENCY_TIMER_OFFSET,
1, 1,
&mSystemConfiguration.PciLatency &mSystemConfiguration.PciLatency
); );
} }
return; return;
} }

40
Vlv2TbltDevicePkg/PlatformDxe/Platform.c
View File

@ -513,16 +513,15 @@ InitPciDevPME (
) )
{ {
UINTN VarSize; UINTN VarSize;
EFI_STATUS Status;
VarSize = sizeof(SYSTEM_CONFIGURATION); VarSize = sizeof(SYSTEM_CONFIGURATION);
Status = gRT->GetVariable( gRT->GetVariable(
NORMAL_SETUP_NAME, NORMAL_SETUP_NAME,
&gEfiNormalSetupGuid, &gEfiNormalSetupGuid,
NULL, NULL,
&VarSize, &VarSize,
&mSystemConfiguration &mSystemConfiguration
); );
// //
//Program HDA PME_EN //Program HDA PME_EN
@ -572,21 +571,20 @@ InitThermalZone (
) )
{ {
UINTN VarSize; UINTN VarSize;
EFI_STATUS Status;
EFI_GLOBAL_NVS_AREA_PROTOCOL *GlobalNvsArea; EFI_GLOBAL_NVS_AREA_PROTOCOL *GlobalNvsArea;
VarSize = sizeof(SYSTEM_CONFIGURATION); VarSize = sizeof(SYSTEM_CONFIGURATION);
Status = gRT->GetVariable( gRT->GetVariable(
NORMAL_SETUP_NAME, NORMAL_SETUP_NAME,
&gEfiNormalSetupGuid, &gEfiNormalSetupGuid,
NULL, NULL,
&VarSize, &VarSize,
&mSystemConfiguration &mSystemConfiguration
); );
Status = gBS->LocateProtocol ( gBS->LocateProtocol (
&gEfiGlobalNvsAreaProtocolGuid, &gEfiGlobalNvsAreaProtocolGuid,
NULL, NULL,
(void **)&GlobalNvsArea (void **)&GlobalNvsArea
); );
GlobalNvsArea->Area->CriticalThermalTripPoint = mSystemConfiguration.CriticalThermalTripPoint; GlobalNvsArea->Area->CriticalThermalTripPoint = mSystemConfiguration.CriticalThermalTripPoint;
GlobalNvsArea->Area->PassiveThermalTripPoint = mSystemConfiguration.PassiveThermalTripPoint; GlobalNvsArea->Area->PassiveThermalTripPoint = mSystemConfiguration.PassiveThermalTripPoint;
} }