[ros-diffs] [sir_richard] 45312: [NTOS]: Another try at the chained interrupt dispatch problem...

Author: sir_richard
Date: Fri Jan 29 03:25:30 2010
New Revision: 45312

URL: http://svn.reactos.org/svn/reactos?rev=45312&view=rev
Log:
[NTOS]: Another try at the chained interrupt dispatch problem...

Modified:
    trunk/reactos/ntoskrnl/ke/i386/irqobj.c

Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqobj.c?…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] Fri Jan 29 03:25:30 2010
@@ -274,27 +274,24 @@
                 KfLowerIrql(OldIrql);
             }
         
-            /* Check if the interrupt got handled */
-            if (Handled)
+            /* Check if the interrupt got handled and it's level */
+            if ((Handled) && (Interrupt->Mode == LevelSensitive)) break;
+            
+            /* What's next? */
+            NextEntry = NextEntry->Flink;
+                
+            /* Is this the last one? */
+            if (NextEntry == ListHead)
             {
-                /* Edge shared interrupts are not handled (they never were) */
-                ASSERT(Interrupt->Mode == LevelSensitive);
-                break;
+                /* Level should not have gotten here */
+                if (Interrupt->Mode == LevelSensitive) break;
+                
+                /* As for edge, we can only exit once nobody can handle the interrupt */
+                if (!Handled) break;
             }
-            else
-            {
-                /* This code path was never tested, and shouldn't be reached */
-                DPRINT1("Edge shared interrupt. ReactOS cannot handle
these\n");
-                
-                /* What's next? */
-                NextEntry = NextEntry->Flink;
-                
-                /* Is this the last one? */
-                if (NextEntry == ListHead) break;
-                
-                /* Get the actual interrupt object */
-                Interrupt = CONTAINING_RECORD(NextEntry, KINTERRUPT,
InterruptListEntry);
-            }
+            
+            /* Get the interrupt object for the next pass */
+            Interrupt = CONTAINING_RECORD(NextEntry, KINTERRUPT, InterruptListEntry);
         }
 
         /* Now call the epilogue code */
@@ -431,6 +428,7 @@
     if (!Interrupt->Connected)
     {
         /* Get vector dispatching information */
+        DPRINT1("Interrupt Connect: %lx %lx %d %d\n", Vector, Irql,
Interrupt->ShareVector, Interrupt->Mode);
         KiGetVectorDispatch(Vector, &Dispatch);
 
         /* Check if the vector is already connected */
@@ -469,6 +467,7 @@
             }
 
             /* Insert into the interrupt list */
+            DPRINT1("Inserting shared interrupt %p into %p with mode: %lx\n",
Interrupt, &Dispatch.Interrupt, Interrupt->Mode);
             InsertTailList(&Dispatch.Interrupt->InterruptListEntry,
                            &Interrupt->InterruptListEntry);
         }
@@ -487,6 +486,7 @@
     }
 
     /* Return to caller */
+    DPRINT1("Interrupt was registered: %lx\n", Connected);
     return Connected;
 }