Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/PcAtChipsetPkg/8254TimerDxe/Timer.c

Timestamp:

Oct 28, 2015 8:17:18 PM (9 years ago)

Author:

vboxsync

Message:

EFI/Firmware: 'svn merge ^{/vendor/edk2/UDK2010.SR1} /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• PcAtChipsetPkg/8254TimerDxe/Timer.c (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/Firmware/PcAtChipsetPkg/8254TimerDxe/Timer.c

@@ -2 +2 @@
   Timer Architectural Protocol as defined in the DXE CIS
 
-Copyright (c) 2005 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
@@ -220 +220 @@
     if (TimerCount >= 65536) {
       TimerCount = 0;
-      if (TimerPeriod >= DEFAULT_TIMER_TICK_DURATION) {
-        TimerPeriod = DEFAULT_TIMER_TICK_DURATION;
-      }
+      TimerPeriod = MAX_TIMER_TICK_DURATION;
     }
     //