Changeset 346

Timestamp:

04/18/08 06:32:11 (8 months ago)

Author:

gentux2

Message:

IRQ patch from Pavel

Location:

GPL/trunk

Files:

• drv32/rmhelp.cpp (modified) (1 diff)
• lib32/irq.c (modified) (6 diffs)

GPL/trunk/drv32/rmhelp.cpp

@@ -156 +156 @@
 
   Resource.ResourceType          = RS_TYPE_IRQ;
-  Resource.IRQResource.IRQLevel  = (USHORT)ulIrq;
+  Resource.IRQResource.IRQLevel  = (USHORT)ulIrq & 0xff;
   Resource.IRQResource.IRQFlags  = ( fShared ) ? RS_IRQ_SHARED : RS_IRQ_EXCLUSIVE;
-  Resource.IRQResource.PCIIrqPin = RS_PCI_INT_NONE;
+  Resource.IRQResource.PCIIrqPin = (USHORT)( (ulIrq >> 8) & 0xf);
 
   rc = RMAllocResource(DriverHandle,                    // Handle to driver.

GPL/trunk/lib32/irq.c

@@ -1 @@
-/* $Id: irq.c,v 1.1.1.1 2003/07/02 13:57:02 eleph Exp $ */
 /*
  * OS/2 implementation of Linux irq kernel services
@@ -70 +69 @@
                 unsigned long x0, const char *x1, void *x2)
 {
-    IRQ_SLOT    *pSlot = FindSlot(irq);
+    IRQ_SLOT    *pSlot = FindSlot(irq & 0xff);
     unsigned    u, uSlotNo = (unsigned)-1;
     if( !pSlot )
@@ -96 +95 @@
             if( pSlot->irqHandlers[u].handler == NULL )
             {
-                pSlot->irqNo = irq;
+                pSlot->irqNo = irq & 0xff;
                 pSlot->irqHandlers[u].handler = handler;
                 pSlot->irqHandlers[u].x0 = x0;
@@ -103 +102 @@
 
                 if( pSlot->flHandlers != 0 ||
-                   ALSA_SetIrq(irq, uSlotNo, (x0 & SA_SHIRQ) != 0) )
+                   ALSA_SetIrq( irq & 0xff, uSlotNo, (x0 & SA_SHIRQ) != 0) )
                 {
                     pSlot->flHandlers |= 1 << u;
@@ -114 +113 @@
     }
 
-    dprintf(("request_irq: Unable to register irq handler for irq %d\n", irq));
+    dprintf(("request_irq: Unable to register irq handler for irq %d\n", irq & 0xff ));
     return 1;
 }
@@ -163 +162 @@
      if( pSlot )        pSlot->fEOI = 1;
      */
-    eoiIrq[irq]++;
+    eoiIrq[irq & 0xff]++;
 }