d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't do (1 << irq) to get an interrupt mask when irq = -1.

Browse Source 
Submitted by:	Luoqi Chen <luoqi@watermarkgroup.com>
This commit is contained in:
Peter Wemm 1999-04-19 18:03:51 +00:00
parent feee147835
commit ee35d927c2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/i386/isa/isa_compat.c
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: isa_compat.c,v 1.2 1999/04/17 09:56:35 bde Exp $ * $Id: isa_compat.c,v 1.3 1999/04/19 08:42:39 dfr Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -131,12 +131,14 @@ isa_compat_release_resources(device_t dev, struct isa_compat_resources *res)
} }
} }
#define irqmask(x) ((x) < 0 ? 0 : (1 << (x)))
static int static int
isa_compat_probe(device_t dev) isa_compat_probe(device_t dev)
{ {
struct isa_device *dvp = device_get_softc(dev); struct isa_device *dvp = device_get_softc(dev);
struct isa_compat_resources res; struct isa_compat_resources res;
bzero(&res, sizeof(res)); bzero(&res, sizeof(res));
/* /*
* Fill in the isa_device fields. * Fill in the isa_device fields.
@ -144,7 +146,7 @@ isa_compat_probe(device_t dev)
dvp->id_id = isa_compat_nextid(); dvp->id_id = isa_compat_nextid();
dvp->id_driver = device_get_driver(dev)->priv; dvp->id_driver = device_get_driver(dev)->priv;
dvp->id_iobase = isa_get_port(dev); dvp->id_iobase = isa_get_port(dev);
dvp->id_irq = (1 << isa_get_irq(dev)); dvp->id_irq = irqmask(isa_get_irq(dev));
dvp->id_drq = isa_get_drq(dev); dvp->id_drq = isa_get_drq(dev);
dvp->id_maddr = (void *)isa_get_maddr(dev); dvp->id_maddr = (void *)isa_get_maddr(dev);
dvp->id_msize = isa_get_msize(dev); dvp->id_msize = isa_get_msize(dev);
@ -171,7 +173,7 @@ isa_compat_probe(device_t dev)
isa_set_portsize(dev, portsize); isa_set_portsize(dev, portsize);
if (dvp->id_iobase != isa_get_port(dev)) if (dvp->id_iobase != isa_get_port(dev))
isa_set_port(dev, dvp->id_iobase); isa_set_port(dev, dvp->id_iobase);
if (dvp->id_irq != (1 << isa_get_irq(dev))) if (dvp->id_irq != irqmask(isa_get_irq(dev)))
isa_set_irq(dev, ffs(dvp->id_irq) - 1); isa_set_irq(dev, ffs(dvp->id_irq) - 1);
if (dvp->id_drq != isa_get_drq(dev)) if (dvp->id_drq != isa_get_drq(dev))
isa_set_drq(dev, dvp->id_drq); isa_set_drq(dev, dvp->id_drq);