Changeset 34 for GPL/trunk/lib32/irq.c

Timestamp:

Dec 11, 2005, 5:57:39 PM (20 years ago)

Author:

vladest

Message:

Latest update from ALSA. some intial > 15 interrupts support

File:

• GPL/trunk/lib32/irq.c (modified) (5 diffs)

GPL/trunk/lib32/irq.c

@@ -47 +47 @@
 //******************************************************************************
 int request_irq(unsigned int irq,
-                void (*handler)(int, void *, struct pt_regs *),
+                int (near *handler)(int, void *, struct pt_regs *),
                 unsigned long x0, const char *x1, void *x2)
 {
@@ -54 +54 @@
     if(RMRequestIRQ(hResMgr, irq, (x0 & SA_SHIRQ) ? TRUE : FALSE) == FALSE) {
         dprintf(("RMRequestIRQ failed for irq %d", irq));
-        return NULL;
+        return 0;
     }
 
@@ -109 +109 @@
 void eoi_irq(unsigned int irq)
 {
-    if(irq > 0xf) {
+    if(irq > 0xff) {
         DebugInt3();
         return;
@@ -119 +119 @@
 BOOL oss_process_interrupt(int irq)
 {
- BOOL rc;
+ int rc;
  int  i;
 
@@ -142 +142 @@
         {
             fInInterrupt = TRUE;
-            irqHandlers[irq][i].handler(irq, irqHandlers[irq][i].x2, 0);
-            rc = (eoiIrq[irq] > 0);
+            rc = irqHandlers[irq][i].handler(irq, irqHandlers[irq][i].x2, 0);
+            //rc = (eoiIrq[irq] > 0);
             fInInterrupt = FALSE;
-            if(rc) {
+            if(rc == 1) {
                 //ok, this interrupt was intended for us; notify the 16 bits MMPM/2 driver
                 OSS32_ProcessIRQ();