Author: sir_richard
Date: Tue Jan 26 17:31:32 2010
New Revision: 45267
URL: http://svn.reactos.org/svn/reactos?rev=45267&view=rev
Log:
[HAL]: Move the HalpApcInterrupt and HalpDispatchInterrupt to pic.c now that
there is a C-macro to generate such stubs. Remove irq.S from build/sources.
Removed:
trunk/reactos/hal/halx86/generic/irq.S
Modified:
trunk/reactos/hal/halx86/generic/pic.c
trunk/reactos/hal/halx86/hal_generic_up.rbuild
Removed: trunk/reactos/hal/halx86/generic/irq.S
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?rev=45266&view=auto
==============================================================================
--- trunk/reactos/hal/halx86/generic/irq.S [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/irq.S (removed)
@@ -1,19 +1,0 @@
-/*
- * FILE: hal/halx86/generic/irq.S
- * COPYRIGHT: See COPYING in the top level directory
- * PURPOSE: Software, System and Hardware IRQ Management
- * PROGRAMMER: Alex Ionescu ([email protected])
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <asm.h>
-#include <internal/i386/asmmacro.S>
-.intel_syntax noprefix
-
-/* GLOBALS *******************************************************************/
-
-/* FUNCTIONS *****************************************************************/
-
-GENERATE_TRAP_HANDLER HalpApcInterrupt, 0, 0, 1
-GENERATE_TRAP_HANDLER HalpDispatchInterrupt, 0, 0, 1
Modified: trunk/reactos/hal/halx86/generic/pic.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/pic.c?rev=45267&r1=45266&r2=45267&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/generic/pic.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/pic.c [iso-8859-1] Tue Jan 26 17:31:32 2010
@@ -886,3 +886,6 @@
/* Exit the interrupt */
KiEoiHelper(TrapFrame);
}
+
+KiTrap(HalpApcInterrupt, KI_SOFTWARE_TRAP);
+KiTrap(HalpDispatchInterrupt, KI_SOFTWARE_TRAP);
Modified: trunk/reactos/hal/halx86/hal_generic_up.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_up.rbuild?rev=45267&r1=45266&r2=45267&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] Tue Jan 26
17:31:32 2010
@@ -7,7 +7,6 @@
<define name="_NTHAL_" />
<directory name="generic">
<file>pic.c</file>
- <file>irq.S</file>
<file>processor.c</file>
<file>spinlock.c</file>
</directory>
