From 66a3a5660409fd7f68e699c8a2e208139fb9596e Mon Sep 17 00:00:00 2001
From: Sir Richard <sir_richard@svn.reactos.org>
Date: Tue, 26 Jan 2010 16:31:32 +0000
Subject: [PATCH] [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.

svn path=/trunk/; revision=45267
---
 reactos/hal/halx86/generic/irq.S         | 19 -------------------
 reactos/hal/halx86/generic/pic.c         |  3 +++
 reactos/hal/halx86/hal_generic_up.rbuild |  1 -
 3 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 reactos/hal/halx86/generic/irq.S

diff --git a/reactos/hal/halx86/generic/irq.S b/reactos/hal/halx86/generic/irq.S
deleted file mode 100644
index 705205d5429..00000000000
--- a/reactos/hal/halx86/generic/irq.S
+++ /dev/null
@@ -1,19 +0,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 (alex@relsoft.net)
- */
-
-/* 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
\ No newline at end of file
diff --git a/reactos/hal/halx86/generic/pic.c b/reactos/hal/halx86/generic/pic.c
index 9ea13506bce..3e1419ed401 100644
--- a/reactos/hal/halx86/generic/pic.c
+++ b/reactos/hal/halx86/generic/pic.c
@@ -886,3 +886,6 @@ HalpDispatchInterruptHandler(IN PKTRAP_FRAME TrapFrame)
     /* Exit the interrupt */
     KiEoiHelper(TrapFrame);
 }
+
+KiTrap(HalpApcInterrupt,      KI_SOFTWARE_TRAP);
+KiTrap(HalpDispatchInterrupt, KI_SOFTWARE_TRAP);
diff --git a/reactos/hal/halx86/hal_generic_up.rbuild b/reactos/hal/halx86/hal_generic_up.rbuild
index 7b9bdc99661..eb48c9e895a 100644
--- a/reactos/hal/halx86/hal_generic_up.rbuild
+++ b/reactos/hal/halx86/hal_generic_up.rbuild
@@ -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>