From fe0013fd3db390ed33e20ac5f28d8beed8901943 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Tue, 30 Aug 2011 14:19:10 +0000
Subject: [PATCH] [HAL] Small cleanup and fix amd64 build (don't use the PIT)

svn path=/trunk/; revision=53497
---
 reactos/hal/halx86/CMakeLists.txt          |  2 +-
 reactos/hal/halx86/amd64/stubs.c           | 17 ++++++++++++++++-
 reactos/hal/halx86/generic/i386/systimer.S | 10 ----------
 reactos/hal/halx86/generic/timer.c         |  1 +
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/reactos/hal/halx86/CMakeLists.txt b/reactos/hal/halx86/CMakeLists.txt
index a84aa9fdc2e..f5b97952542 100644
--- a/reactos/hal/halx86/CMakeLists.txt
+++ b/reactos/hal/halx86/CMakeLists.txt
@@ -18,13 +18,13 @@ list(APPEND HAL_GENERIC_SOURCE
     generic/profil.c
     generic/reboot.c
     generic/sysinfo.c
-    generic/timer.c
     generic/usage.c)
 
 if(ARCH MATCHES i386)
     list(APPEND HAL_GENERIC_SOURCE
         generic/bios.c
         generic/halinit.c
+        generic/timer.c
         generic/i386/portio.c
         generic/i386/systimer.S
         generic/i386/trap.S)
diff --git a/reactos/hal/halx86/amd64/stubs.c b/reactos/hal/halx86/amd64/stubs.c
index ee295d17944..34495bdf9fd 100644
--- a/reactos/hal/halx86/amd64/stubs.c
+++ b/reactos/hal/halx86/amd64/stubs.c
@@ -3,7 +3,7 @@
  * LICENSE:         GPL - See COPYING.ARM in the top level directory
  * FILE:            hal/halx86/amd64/stubs.c
  * PURPOSE:         HAL stubs
- * PROGRAMMERS:     
+ * PROGRAMMERS:
  */
 
 /* INCLUDES *******************************************************************/
@@ -95,3 +95,18 @@ KeQueryPerformanceCounter(
     return Result;
 }
 
+VOID
+NTAPI
+HalCalibratePerformanceCounter(IN volatile PLONG Count,
+                               IN ULONGLONG NewCount)
+{
+    UNIMPLEMENTED;
+}
+
+ULONG
+NTAPI
+HalSetTimeIncrement(IN ULONG Increment)
+{
+    UNIMPLEMENTED;
+    return 0;
+}
diff --git a/reactos/hal/halx86/generic/i386/systimer.S b/reactos/hal/halx86/generic/i386/systimer.S
index 4a7755901c8..5e76763e3ef 100644
--- a/reactos/hal/halx86/generic/i386/systimer.S
+++ b/reactos/hal/halx86/generic/i386/systimer.S
@@ -14,8 +14,6 @@
 EXTERN _HalpAcquireSystemHardwareSpinLock@0:PROC
 EXTERN _HalpReleaseCmosSpinLock@0:PROC
 EXTERN _DbgBreakPoint@0:PROC
-EXTERN _HalpCurrentRollOver:DWORD
-EXTERN _HalpPerfCounterCutoff:DWORD
 
 #define PIC1_BASE         HEX(20) /* IO base address for master PIC */
 #define PIC2_BASE         HEX(A0) /* IO base address for slave PIC */
@@ -42,14 +40,6 @@ EXTERN _HalpPerfCounterCutoff:DWORD
 .data
 ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING
 
-PUBLIC _HalpPerfCounter
-_HalpLastPerfCounterLow:    .long 0
-_HalpLastPerfCounterHigh:   .long 0
-_HalpPerfCounter:
-_HalpPerfCounterLow:        .long 0
-_HalpPerfCounterHigh:       .long 0
-_HalpSystemHardwareFlags:   .long 0
-
 /* FUNCTIONS *****************************************************************/
 
 .code
diff --git a/reactos/hal/halx86/generic/timer.c b/reactos/hal/halx86/generic/timer.c
index b9a754166bb..fafb20982b3 100644
--- a/reactos/hal/halx86/generic/timer.c
+++ b/reactos/hal/halx86/generic/timer.c
@@ -18,6 +18,7 @@
 #define PIT_LATCH  0x00
 
 LARGE_INTEGER HalpLastPerfCounter;
+LARGE_INTEGER HalpPerfCounter;
 ULONG HalpPerfCounterCutoff;
 BOOLEAN HalpClockSetMSRate;
 ULONG HalpCurrentTimeIncrement;