[ros-diffs] [tkreuzer] 53497: [HAL] Small cleanup and fix amd64 build (don't use the PIT)

Author: tkreuzer
Date: Tue Aug 30 14:19:10 2011
New Revision: 53497

URL: http://svn.reactos.org/svn/reactos?rev=53497&view=rev
Log:
[HAL]
Small cleanup and fix amd64 build (don't use the PIT)

Modified:
    trunk/reactos/hal/halx86/CMakeLists.txt
    trunk/reactos/hal/halx86/amd64/stubs.c
    trunk/reactos/hal/halx86/generic/i386/systimer.S
    trunk/reactos/hal/halx86/generic/timer.c

Modified: trunk/reactos/hal/halx86/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?…
==============================================================================
--- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Tue Aug 30 14:19:10 2011
@@ -18,13 +18,13 @@
     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)

Modified: trunk/reactos/hal/halx86/amd64/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/amd64/stubs.c?r…
==============================================================================
--- trunk/reactos/hal/halx86/amd64/stubs.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/amd64/stubs.c [iso-8859-1] Tue Aug 30 14:19:10 2011
@@ -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 @@
     return Result;
 }
 
+VOID
+NTAPI
+HalCalibratePerformanceCounter(IN volatile PLONG Count,
+                               IN ULONGLONG NewCount)
+{
+    UNIMPLEMENTED;
+}
+
+ULONG
+NTAPI
+HalSetTimeIncrement(IN ULONG Increment)
+{
+    UNIMPLEMENTED;
+    return 0;
+}

Modified: trunk/reactos/hal/halx86/generic/i386/systimer.S
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/i386/sy…
==============================================================================
--- trunk/reactos/hal/halx86/generic/i386/systimer.S [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/i386/systimer.S [iso-8859-1] Tue Aug 30 14:19:10
2011
@@ -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 @@
 .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

Modified: trunk/reactos/hal/halx86/generic/timer.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c…
==============================================================================
--- trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] Tue Aug 30 14:19:10 2011
@@ -18,6 +18,7 @@
 #define PIT_LATCH  0x00
 
 LARGE_INTEGER HalpLastPerfCounter;
+LARGE_INTEGER HalpPerfCounter;
 ULONG HalpPerfCounterCutoff;
 BOOLEAN HalpClockSetMSRate;
 ULONG HalpCurrentTimeIncrement;