diff options
| author | nate <nate@FreeBSD.org> | 1999-03-26 00:20:25 +0000 |
|---|---|---|
| committer | nate <nate@FreeBSD.org> | 1999-03-26 00:20:25 +0000 |
| commit | 70f68a6c7d9228c30fd6f22b6decda12af143fd7 (patch) | |
| tree | e93cbeb66024893591411e59cbe3189b2d1e96f2 /sys/pccard/pcic.c | |
| parent | 1bf2486a41fbc7017bd2e620b4a2c7599ae98178 (diff) | |
| download | FreeBSD-src-70f68a6c7d9228c30fd6f22b6decda12af143fd7.zip FreeBSD-src-70f68a6c7d9228c30fd6f22b6decda12af143fd7.tar.gz | |
- Made the setting of the machdep.pccard.pcic_irq from the boot config file
actually work.
Reviewed by: "Sean O'Connell" <sean@stat.Duke.EDU>, msmith
Diffstat (limited to 'sys/pccard/pcic.c')
| -rw-r--r-- | sys/pccard/pcic.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/pccard/pcic.c b/sys/pccard/pcic.c index 542b8ae..1cf7f5f 100644 --- a/sys/pccard/pcic.c +++ b/sys/pccard/pcic.c @@ -762,13 +762,14 @@ pcic_probe(void) /* See if the user has requested a specific IRQ */ if (getenv_int("machdep.pccard.pcic_irq", &desired_irq)) /* legal IRQ? */ - if ((desired_irq >= 1) && (desired_irq <= ICU_LEN) && - ((1ul << desired_irq) & soft_imask)) - pcic_imask = 1ul << desired_irq; + if (desired_irq >= 1 && + desired_irq <= ICU_LEN && + (1ul << desired_irq) & free_irqs) + free_irqs = 1ul << desired_irq; else /* illeagal, disable use of IRQ */ - pcic_imask = 0; - + free_irqs = 0; + pcic_irq = pccard_alloc_intr(free_irqs, pcicintr, 0, &pcic_imask, NULL); if (pcic_irq < 0) |
