diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-01-07 02:33:00 +0000 |
|---|---|---|
| committer | <ralf@linux-mips.org> | 1997-01-07 02:33:00 +0000 |
| commit | beb116954b9b7f3bb56412b2494b562f02b864b1 (patch) | |
| tree | 120e997879884e1b9d93b265221b939d2ef1ade1 /drivers/net/auto_irq.c | |
| parent | 908d4681a1dc3792ecafbe64265783a86c4cccb6 (diff) | |
Import of Linux/MIPS 2.1.14
Diffstat (limited to 'drivers/net/auto_irq.c')
| -rw-r--r-- | drivers/net/auto_irq.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/auto_irq.c b/drivers/net/auto_irq.c index c050d204e..c91da9c52 100644 --- a/drivers/net/auto_irq.c +++ b/drivers/net/auto_irq.c @@ -28,7 +28,7 @@ #ifdef version -static char *version= +static const char *version= "auto_irq.c:v1.11 Donald Becker (becker@cesdis.gsfc.nasa.gov)"; #endif @@ -41,16 +41,16 @@ static char *version= struct device *irq2dev_map[16] = {0, 0, /* ... zeroed */}; -int irqs_busy = 0x2147; /* The set of fixed IRQs (keyboard, timer, etc) */ -int irqs_used = 0x0001; /* The set of fixed IRQs sometimes enabled. */ -int irqs_reserved = 0x0000; /* An advisory "reserved" table. */ -int irqs_shared = 0x0000; /* IRQ lines "shared" among conforming cards.*/ +unsigned long irqs_busy = 0x2147; /* The set of fixed IRQs (keyboard, timer, etc) */ +unsigned long irqs_used = 0x0001; /* The set of fixed IRQs sometimes enabled. */ +unsigned long irqs_reserved = 0x0000; /* An advisory "reserved" table. */ +unsigned long irqs_shared = 0x0000; /* IRQ lines "shared" among conforming cards.*/ -static volatile int irq_number; /* The latest irq number we actually found. */ -static volatile int irq_bitmap; /* The irqs we actually found. */ -static int irq_handled; /* The irq lines we have a handler on. */ +static volatile unsigned long irq_bitmap; /* The irqs we actually found. */ +static unsigned long irq_handled; /* The irq lines we have a handler on. */ +static volatile int irq_number; /* The latest irq number we actually found. */ -static void autoirq_probe(int irq, struct pt_regs * regs) +static void autoirq_probe(int irq, void *dev_id, struct pt_regs * regs) { irq_number = irq; set_bit(irq, (void *)&irq_bitmap); /* irq_bitmap |= 1 << irq; */ @@ -67,7 +67,7 @@ int autoirq_setup(int waittime) irq_handled = 0; for (i = 0; i < 16; i++) { if (test_bit(i, &irqs_busy) == 0 - && request_irq(i, autoirq_probe, SA_INTERRUPT, "irq probe") == 0) + && request_irq(i, autoirq_probe, SA_INTERRUPT, "irq probe", NULL) == 0) set_bit(i, (void *)&irq_handled); /* irq_handled |= 1 << i;*/ } /* Update our USED lists. */ @@ -85,7 +85,7 @@ int autoirq_setup(int waittime) #ifdef notdef printk(" Spurious interrupt on IRQ %d\n", i); #endif - free_irq(i); + free_irq(i, NULL); } } return irq_handled; @@ -106,7 +106,7 @@ int autoirq_report(int waittime) /* Retract the irq handlers that we installed. */ for (i = 0; i < 16; i++) { if (test_bit(i, (void *)&irq_handled)) - free_irq(i); + free_irq(i, NULL); } return irq_number; } |