From 576224deecc242498b8f3122afd75ddc5890caf6 Mon Sep 17 00:00:00 2001
From: Hartmut Birr <osexpert@googlemail.com>
Date: Sat, 1 Jan 2005 11:31:43 +0000
Subject: [PATCH] - Implemented the interrupt handling for smp machines. -
 Enabled interrupts (irqs) on all processors.

svn path=/trunk/; revision=12691
---
 reactos/hal/halx86/mp/mpsirql.c      |  2 ++
 reactos/hal/halx86/mp/processor_mp.c | 39 +++++++++++++---------------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/reactos/hal/halx86/mp/mpsirql.c b/reactos/hal/halx86/mp/mpsirql.c
index 6ed7f052bc2..48be8270489 100644
--- a/reactos/hal/halx86/mp/mpsirql.c
+++ b/reactos/hal/halx86/mp/mpsirql.c
@@ -375,6 +375,8 @@ HalEnableSystemInterrupt (ULONG Vector,
     return FALSE;
   }
 
+  /* FIXME: We must check if the requested and the assigned interrupt mode is the same */
+
   irq = VECTOR2IRQ (Vector);
   IOAPICUnmaskIrq (irq);
 
diff --git a/reactos/hal/halx86/mp/processor_mp.c b/reactos/hal/halx86/mp/processor_mp.c
index 067615b2bfb..2526ca9cf8a 100644
--- a/reactos/hal/halx86/mp/processor_mp.c
+++ b/reactos/hal/halx86/mp/processor_mp.c
@@ -1,4 +1,4 @@
-/* $Id: processor_mp.c,v 1.2 2004/12/25 11:21:48 navaraf Exp $
+/* $Id$
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -186,10 +186,15 @@ VOID IOAPICMaskIrq(ULONG Irq)
   IOAPIC_ROUTE_ENTRY Entry;
   ULONG Apic = IrqApicMap[Irq];
 
-
-  *((PULONG)&Entry) = IOAPICRead(Apic, IOAPIC_REDTBL+2*Irq);
-  Entry.mask = 1;
-  IOAPICWrite(Apic, IOAPIC_REDTBL+2*Irq, *((PULONG)&Entry));
+  *(((PULONG)&Entry)+0) = IOAPICRead(Apic, IOAPIC_REDTBL+2*Irq);
+  *(((PULONG)&Entry)+1) = IOAPICRead(Apic, IOAPIC_REDTBL+2*Irq+1);
+  Entry.dest.logical.logical_dest &= ~(1 << KeGetCurrentProcessorNumber());
+  if (Entry.dest.logical.logical_dest == 0)
+  {
+     Entry.mask = 1;
+  }
+  IOAPICWrite(Apic, IOAPIC_REDTBL+2*Irq+1, *(((PULONG)&Entry)+1));
+  IOAPICWrite(Apic, IOAPIC_REDTBL+2*Irq, *(((PULONG)&Entry)+0));
 }
 
 
@@ -199,9 +204,12 @@ VOID IOAPICUnmaskIrq(ULONG Irq)
   IOAPIC_ROUTE_ENTRY Entry;
   ULONG Apic = IrqApicMap[Irq];
 
-  *((PULONG)&Entry) = IOAPICRead(Apic, IOAPIC_REDTBL+2*IrqPinMap[Irq]);
+  *(((PULONG)&Entry)+0) = IOAPICRead(Apic, IOAPIC_REDTBL+2*Irq);
+  *(((PULONG)&Entry)+1) = IOAPICRead(Apic, IOAPIC_REDTBL+2*Irq+1);
+  Entry.dest.logical.logical_dest |= 1 << KeGetCurrentProcessorNumber();
   Entry.mask = 0;
-  IOAPICWrite(Apic, IOAPIC_REDTBL+2*IrqPinMap[Irq], *((PULONG)&Entry));
+  IOAPICWrite(Apic, IOAPIC_REDTBL+2*Irq+1, *(((PULONG)&Entry)+1));
+  IOAPICWrite(Apic, IOAPIC_REDTBL+2*Irq, *(((PULONG)&Entry)+0));
 }
 
 static VOID 
@@ -619,15 +627,8 @@ VOID IOAPICSetupIrqs(VOID)
 	 entry.delivery_mode = (APIC_DM_LOWEST >> 8);
 	 entry.dest_mode = 1;  /* logical delivery */
 	 entry.mask = 1;       /* disable IRQ */
-#if 0
-	 /*
-	  * FIXME:
-	  *   Some drivers are not able to deal with more than one cpu.
-	  */
-	 entry.dest.logical.logical_dest = OnlineCPUs;
-#else
-	 entry.dest.logical.logical_dest = 1 << 0;
-#endif
+         entry.dest.logical.logical_dest = 0;
+
 	 idx = IOAPICGetIrqEntry(apic,pin,INT_VECTORED);
 	 if (idx == -1) 
 	 {
@@ -650,11 +651,7 @@ VOID IOAPICSetupIrqs(VOID)
 	 {
 	    entry.trigger = 1;
 	    entry.mask = 1; // disable
-#if 0
-	    entry.dest.logical.logical_dest = OnlineCPUs;
-#else
-	    entry.dest.logical.logical_dest = 1 << 0;
-#endif
+	    entry.dest.logical.logical_dest = 0;
 	 }
 
 	 irq = Pin2Irq(idx, apic, pin);