[ros-diffs] [sserapion] 45116: [HAL] Fix mp and mps builds.

Author: sserapion
Date: Sun Jan 17 08:56:11 2010
New Revision: 45116

URL: http://svn.reactos.org/svn/reactos?rev=45116&view=rev
Log:
[HAL]
Fix mp and mps builds.

Modified:
    branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild
    branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_mp.rbuild
    branches/ros-amd64-bringup/reactos/hal/halx86/halmps.rbuild
    branches/ros-amd64-bringup/reactos/hal/halx86/mp/mpsirql.c

Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Sun Jan
17 08:56:11 2010
@@ -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>

Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_mp.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_mp.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_mp.rbuild [iso-8859-1] Sun
Jan 17 08:56:11 2010
@@ -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>

Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halmps.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halx86/halmps.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halx86/halmps.rbuild [iso-8859-1] Sun Jan 17
08:56:11 2010
@@ -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>

Modified: branches/ros-amd64-bringup/reactos/hal/halx86/mp/mpsirql.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halx86/mp/mpsirql.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halx86/mp/mpsirql.c [iso-8859-1] Sun Jan 17
08:56:11 2010
@@ -143,30 +143,6 @@
   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
@@ -213,32 +189,6 @@
     }
 
   return OldIrql;
-}
-
-
-/**********************************************************************
- * 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);
 }