Author: tkreuzer
Date: Thu Aug 21 15:24:34 2008
New Revision: 35515
URL:
http://svn.reactos.org/svn/reactos?rev=35515&view=rev
Log:
Fix hal build
Modified:
branches/ros-amd64-bringup/reactos/hal/hal/hal.rbuild
branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c
Modified: branches/ros-amd64-bringup/reactos/hal/hal/hal.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/hal/hal.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/hal/hal.rbuild [iso-8859-1] Thu Aug 21 15:24:34
2008
@@ -36,9 +36,9 @@
<module name="hal" type="kernelmodedll">
<importlibrary definition="hal_amd64.def" />
<include base="ntoskrnl">include</include>
+ <library>halamd64_generic</library>
<library>ntoskrnl</library>
<define name="_NTHAL_" />
- <file>hal.c</file>
<file>hal.rc</file>
<file>hal.spec</file>
</module>
Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c [iso-8859-1] Thu Aug 21
15:24:34 2008
@@ -28,46 +28,6 @@
ULONG HalpCurrentTimeIncrement, HalpNextTimeIncrement, HalpNextIntervalCount;
ULONG _KdComPortInUse = 0;
-
-ULONG HalpIrqlTable[HIGH_LEVEL + 1] =
-{
- 0xFFFFFFFF, // IRQL 0 PASSIVE_LEVEL
- 0xFFFFFFFD, // IRQL 1 APC_LEVEL
- 0xFFFFFFF9, // IRQL 2 DISPATCH_LEVEL
- 0xFFFFFFD9, // IRQL 3
- 0xFFFFFF99, // IRQL 4
- 0xFFFFFF19, // IRQL 5
- 0xFFFFFE19, // IRQL 6
- 0xFFFFFC19, // IRQL 7
- 0xFFFFF819, // IRQL 8
- 0xFFFFF019, // IRQL 9
- 0xFFFFE019, // IRQL 10
- 0xFFFFC019, // IRQL 11
- 0xFFFF8019, // IRQL 12
- 0xFFFF0019, // IRQL 13
- 0xFFFE0019, // IRQL 14
- 0xFFFC0019, // IRQL 15
-};
-
-UCHAR HalpMaskTable[HIGH_LEVEL + 1] =
-{
- PROFILE_LEVEL, // INT 0 WATCHDOG
- APC_LEVEL, // INT 1 SOFTWARE INTERRUPT
- DISPATCH_LEVEL,// INT 2 COMM RX
- IPI_LEVEL, // INT 3 COMM TX
- CLOCK_LEVEL, // INT 4 TIMER 0
- 3,
- 4,
- 5,
- 6,
- 7,
- 8,
- 9,
- 10,
- 11,
- 12,
- 13
-};
/* FUNCTIONS *****************************************************************/
@@ -802,42 +762,6 @@
return;
}
-VOID
-FASTCALL
-KfLowerIrql(IN KIRQL NewIrql)
-{
- UNIMPLEMENTED;
- return;
-}
-
-KIRQL
-FASTCALL
-KfRaiseIrql(IN KIRQL NewIrql)
-{
- UNIMPLEMENTED;
- return;
-}
-
-
-
-KIRQL
-KeRaiseIrqlToDpcLevel(VOID)
-{
- //
- // Call the generic routine
- //
- return KfRaiseIrql(DISPATCH_LEVEL);
-}
-
-KIRQL
-KeRaiseIrqlToSynchLevel(VOID)
-{
- //
- // Call the generic routine
- //
- return KfRaiseIrql(DISPATCH_LEVEL);
-}
-
BOOLEAN HalpProcessorIdentified;
BOOLEAN HalpTestCleanSupported;
@@ -865,29 +789,6 @@
/*
* @implemented
*/
-#undef KeGetCurrentIrql
-KIRQL
-NTAPI
-KeGetCurrentIrql(VOID)
-{
- UNIMPLEMENTED;
- return;
-}
-
-/*
- * @implemented
- */
-VOID
-NTAPI
-KeLowerIrql(KIRQL NewIrql)
-{
- /* Call the fastcall function */
- KfLowerIrql(NewIrql);
-}
-
-/*
- * @implemented
- */
VOID
NTAPI
KeRaiseIrql(KIRQL NewIrql,
@@ -952,7 +853,7 @@
KIRQL OldIrql)
{
/* Simply lower IRQL back */
- KfLowerIrql(OldIrql);
+ KeLowerIrql(OldIrql);
}
/*
@@ -1010,7 +911,7 @@
IN KIRQL OldIrql)
{
/* Simply lower IRQL back */
- KfLowerIrql(OldIrql);
+ KeLowerIrql(OldIrql);
}
/*
@@ -1021,7 +922,7 @@
KeReleaseInStackQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle)
{
/* Simply lower IRQL back */
- KfLowerIrql(LockHandle->OldIrql);
+ KeLowerIrql(LockHandle->OldIrql);
}
/*