[HAL]

Fix mp and mps builds.

svn path=/branches/ros-amd64-bringup/; revision=45116

diff --git a/reactos/hal/halx86/hal_generic.rbuild b/reactos/hal/halx86/hal_generic.rbuild
index a3e8707..5e8cb2d 100644 (file)
--- a/reactos/hal/halx86/hal_generic.rbuild
+++ b/reactos/hal/halx86/hal_generic.rbuild
@@ -38,7 +38,7 @@
                        <if property="ARCH" value="amd64">
                                <directory name="amd64">
                                        <file>halinit.c</file>
-                                       <file>irq.s</file>
+                                       <file>irq.S</file>
                                        <file>misc.c</file>
                                        <file>pic.c</file>
                                        <file>systimer.S</file>

diff --git a/reactos/hal/halx86/hal_generic_mp.rbuild b/reactos/hal/halx86/hal_generic_mp.rbuild
index ef15e7d..1a3593c 100644 (file)
--- a/reactos/hal/halx86/hal_generic_mp.rbuild
+++ b/reactos/hal/halx86/hal_generic_mp.rbuild
@@ -10,9 +10,13 @@
                        <file>spinlock.c</file>
                </directory>
                <directory name="mp">
-                       <if property="ARCH" value="i386">
-                               <file>irq.S</file>
-                       </if>
+                       <file>apic.c</file>
+                       <file>halinit_mp.c</file>
+                       <file>ioapic.c</file>
+                       <file>ipi_mp.c</file>
+                       <file>mpconfig.c</file>
+                       <file>processor_mp.c</file>
+                       <file>halmp.rc</file>
                </directory>
        </module>
 </group>

diff --git a/reactos/hal/halx86/halmps.rbuild b/reactos/hal/halx86/halmps.rbuild
index c462e79..0d13b7c 100644 (file)
--- a/reactos/hal/halx86/halmps.rbuild
+++ b/reactos/hal/halx86/halmps.rbuild
@@ -12,14 +12,7 @@
                <library>hal_generic_mp</library>
                <library>ntoskrnl</library>
                <directory name="mp">
-                       <file>apic.c</file>
-                       <file>halinit_mp.c</file>
-                       <file>ioapic.c</file>
-                       <file>ipi_mp.c</file>
-                       <file>mpconfig.c</file>
                        <file>mpsirql.c</file>
-                       <file>processor_mp.c</file>
-                       <file>halmp.rc</file>
                        <directory name="i386">
                                <file>mps.S</file>
                                <file>mpsboot.asm</file>

diff --git a/reactos/hal/halx86/mp/mpsirql.c b/reactos/hal/halx86/mp/mpsirql.c
index 9d122d4..504acd1 100644 (file)
--- a/reactos/hal/halx86/mp/mpsirql.c
+++ b/reactos/hal/halx86/mp/mpsirql.c
@@ -143,30 +143,6 @@ KfLowerIrql (KIRQL NewIrql)
   HalpLowerIrql (NewIrql, FALSE);
 }
 
-
-/**********************************************************************
- * NAME                                                        EXPORTED
- *     KeLowerIrql
- *
- * DESCRIPTION
- *     Restores the irq level on the current processor
- *
- * ARGUMENTS
- *     NewIrql = Irql to lower to
- *
- * RETURN VALUE
- *     None
- *
- * NOTES
- */
-#undef KeLowerIrql
-VOID NTAPI
-KeLowerIrql (KIRQL NewIrql)
-{
-  KfLowerIrql (NewIrql);
-}
-
-
 /**********************************************************************
  * NAME                                                        EXPORTED
  *     KfRaiseIrql
@@ -216,32 +192,6 @@ KfRaiseIrql (KIRQL NewIrql)
 }
 
 
-/**********************************************************************
- * NAME                                                        EXPORTED
- *     KeRaiseIrql
- *
- * DESCRIPTION
- *     Raises the hardware priority (irql)
- *
- * ARGUMENTS
- *     NewIrql = Irql to raise to
- *     OldIrql (OUT) = Caller supplied storage for the previous irql
- *
- * RETURN VALUE
- *     None
- *
- * NOTES
- *     Calls KfRaiseIrql
- */
-#undef KeRaiseIrql
-VOID NTAPI
-KeRaiseIrql (KIRQL     NewIrql,
-       PKIRQL  OldIrql)
-{
-  *OldIrql = KfRaiseIrql (NewIrql);
-}
-
-
 /**********************************************************************
  * NAME                                                        EXPORTED
  *     KeRaiseIrqlToDpcLevel