[ros-diffs] [tkreuzer] 35902: compatability fixes, so some hal code can be shared

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Wed Sep  3 02:44:50 2008
New Revision: 35902

URL: http://svn.reactos.org/svn/reactos?rev=35902&view=rev
Log:
compatability fixes, so some hal code can be shared

Modified:
    branches/ros-amd64-bringup/reactos/hal/halx86/generic/timer.c
    branches/ros-amd64-bringup/reactos/hal/halx86/include/bus.h
    branches/ros-amd64-bringup/reactos/hal/halx86/include/hal.h
    branches/ros-amd64-bringup/reactos/hal/halx86/include/halp.h

Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/timer.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/halx86/generic/timer.c?rev=35902&r1=35901&r2=35902&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halx86/generic/timer.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halx86/generic/timer.c [iso-8859-1] Wed Sep  3 02:44:50 2008
@@ -48,7 +48,7 @@
     PKPRCB Prcb = KeGetCurrentPrcb();
     ULONG Increment;
     USHORT RollOver;
-    ULONG Flags = 0;
+    ULONG_PTR Flags = 0;
 
     /* Check the CPU Type */
     if (Prcb->CpuType <= 4)
@@ -92,7 +92,7 @@
 HalCalibratePerformanceCounter(IN volatile PLONG Count,
                                IN ULONGLONG NewCount)
 {
-    ULONG Flags = 0;
+    ULONG_PTR Flags = 0;
 
     /* Disable interrupts */
     Ke386SaveFlags(Flags);

Modified: branches/ros-amd64-bringup/reactos/hal/halx86/include/bus.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/halx86/include/bus.h?rev=35902&r1=35901&r2=35902&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halx86/include/bus.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halx86/include/bus.h [iso-8859-1] Wed Sep  3 02:44:50 2008
@@ -43,7 +43,7 @@
 #define TYPE1_READ(x, y)                                                \
     TYPE1_START(x, y)                                                   \
     *((POINTER_TO_(y))Buffer) =                                         \
-    READ_FROM(y)((POINTER_TO_(y))(BusData->Config.Type1.Data + i));     \
+    READ_FROM(y)((POINTER_TO_(y))(ULONG_PTR)(BusData->Config.Type1.Data + i));     \
     TYPE1_END(y)
 
 //
@@ -51,7 +51,7 @@
 //
 #define TYPE1_WRITE(x, y)                                               \
     TYPE1_START(x, y)                                                   \
-    WRITE_TO(y)((POINTER_TO_(y))(BusData->Config.Type1.Data + i),       \
+    WRITE_TO(y)((POINTER_TO_(y))(ULONG_PTR)(BusData->Config.Type1.Data + i),       \
                 *((POINTER_TO_(y))Buffer));                             \
     TYPE1_END(y)
 
@@ -69,7 +69,7 @@
 #define TYPE2_READ(x, y)                                                \
     TYPE2_START(x, y)                                                   \
     *((POINTER_TO_(y))Buffer) =                                         \
-        READ_FROM(y)((POINTER_TO_(y))(ULONG)PciCfg->u.AsUSHORT);        \
+        READ_FROM(y)((POINTER_TO_(y))(ULONG_PTR)PciCfg->u.AsUSHORT);        \
     TYPE2_END(y)
 
 //
@@ -77,7 +77,7 @@
 //
 #define TYPE2_WRITE(x, y)                                               \
     TYPE2_START(x, y)                                                   \
-    WRITE_TO(y)((POINTER_TO_(y))(ULONG)PciCfg->u.AsUSHORT,              \
+    WRITE_TO(y)((POINTER_TO_(y))(ULONG_PTR)PciCfg->u.AsUSHORT,              \
                 *((POINTER_TO_(y))Buffer));                             \
     TYPE2_END(y)
 

Modified: branches/ros-amd64-bringup/reactos/hal/halx86/include/hal.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/halx86/include/hal.h?rev=35902&r1=35901&r2=35902&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halx86/include/hal.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halx86/include/hal.h [iso-8859-1] Wed Sep  3 02:44:50 2008
@@ -35,7 +35,11 @@
 
 /* Internal kernel headers */
 #include "internal/pci.h"
+#ifdef _M_AMD64
+#include "internal/amd64/intrin_i.h"
+#else
 #include "internal/i386/intrin_i.h"
+#endif
 
 /* Internal HAL Headers */
 #include "apic.h"

Modified: branches/ros-amd64-bringup/reactos/hal/halx86/include/halp.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/halx86/include/halp.h?rev=35902&r1=35901&r2=35902&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halx86/include/halp.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halx86/include/halp.h [iso-8859-1] Wed Sep  3 02:44:50 2008
@@ -154,6 +154,17 @@
     VOID
 );
 
+#ifdef _M_AMD64
+#define KfLowerIrql KeLowerIrql
+#ifndef CONFIG_SMP
+/* On UP builds, spinlocks don't exist at IRQL >= DISPATCH */
+#define KiAcquireSpinLock(SpinLock)
+#define KiReleaseSpinLock(SpinLock)
+#define KfAcquireSpinLock(SpinLock) KfRaiseIrql(DISPATCH_LEVEL);
+#define KfReleaseSpinLock(SpinLock, OldIrql) KeLowerIrql(OldIrql);
+#endif // !CONFIG_SMP
+#endif // _M_AMD64
+
 extern PVOID HalpRealModeStart;
 extern PVOID HalpRealModeEnd;