X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=PcAtChipsetPkg%2FLibrary%2FAcpiTimerLib%2FAcpiTimerLib.c;fp=PcAtChipsetPkg%2FLibrary%2FAcpiTimerLib%2FAcpiTimerLib.c;h=ad855fe4f517f6e0c4a814239d63152f3ae4781e;hp=b184c49ee7d0e75556b876ca7a7d4b7b5b0e7e9f;hb=9ff926d6d7c694c09f63008819b8930b9fa79d1a;hpb=16b6347b307d19cc1ace4d0a0f0c083954d87652 diff --git a/PcAtChipsetPkg/Library/AcpiTimerLib/AcpiTimerLib.c b/PcAtChipsetPkg/Library/AcpiTimerLib/AcpiTimerLib.c index b184c49ee7..ad855fe4f5 100644 --- a/PcAtChipsetPkg/Library/AcpiTimerLib/AcpiTimerLib.c +++ b/PcAtChipsetPkg/Library/AcpiTimerLib/AcpiTimerLib.c @@ -1,7 +1,7 @@ /** @file ACPI Timer implements one instance of Timer Library. - Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.
+ Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.
This program and the accompanying materials 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 @@ -118,11 +118,11 @@ InternalAcpiGetAcpiTimerIoPort ( { UINT16 Port; - Port = PcdGet16 (PcdAcpiIoPciBarRegisterOffset); + Port = PcdGet16 (PcdAcpiIoPortBaseAddress); // // If the register offset to the BAR for the ACPI I/O Port Base Address is not 0x0000, then - // read the PCI register for the APCI BAR value in case the BAR has been programmed to a + // read the PCI register for the ACPI BAR value in case the BAR has been programmed to a // value other than PcdAcpiIoPortBaseAddress // if (PcdGet16 (PcdAcpiIoPciBarRegisterOffset) != 0x0000) { @@ -134,7 +134,7 @@ InternalAcpiGetAcpiTimerIoPort ( )); } - return (Port & ~BIT0) + PcdGet16 (PcdAcpiPm1TmrOffset); + return (Port & PcdGet16 (PcdAcpiIoPortBaseAddressMask)) + PcdGet16 (PcdAcpiPm1TmrOffset); } /**