diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-04-18 23:48:25 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-04-18 23:48:25 +0000 |
| commit | 76067dc38b59d22fa68139e9e0f6387455213fef (patch) | |
| tree | a07a31d71b761635bad242646844c4ead9cdbed8 /sys/dev/isa/ultra14f.c | |
| parent | 740ab8eb879aa7a6c29f0a9c83c747b8ae4988c9 (diff) | |
NetBSD 960317 merge
Diffstat (limited to 'sys/dev/isa/ultra14f.c')
| -rw-r--r-- | sys/dev/isa/ultra14f.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/isa/ultra14f.c b/sys/dev/isa/ultra14f.c index 49fea372b1f..948a2966654 100644 --- a/sys/dev/isa/ultra14f.c +++ b/sys/dev/isa/ultra14f.c @@ -1,5 +1,5 @@ -/* $OpenBSD: ultra14f.c,v 1.11 1996/03/20 01:01:04 mickey Exp $ */ -/* $NetBSD: ultra14f.c,v 1.61 1996/02/09 17:38:09 mycroft Exp $ */ +/* $OpenBSD: ultra14f.c,v 1.12 1996/04/18 23:47:50 niklas Exp $ */ +/* $NetBSD: ultra14f.c,v 1.62 1996/02/24 05:27:49 mycroft Exp $ */ /* * Copyright (c) 1994 Charles Hannum. All rights reserved. @@ -609,7 +609,7 @@ uhaattach(parent, self, aux) isa_establish(&uha->sc_id, &uha->sc_dev); #endif uha->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, - uha->intr, uha, sc->sc_dev.dv_xname); + uha->intr, uha, uha->sc_dev.dv_xname); /* * ask the adapter what subunits are present @@ -918,11 +918,11 @@ u14_find(uha, ia) if (ia->ia_iobase == IOBASEUNK) return ENXIO; - model = inb(iobase + U14_ID) | (inb(iobase + U14_ID + 1) << 8); + model = (inb(iobase + U14_ID) << 8) | inb(iobase + U14_ID + 1); if ((model & 0xfff0) != 0x5640) return ENXIO; - config = inb(iobase + U14_CONFIG) | (inb(iobase + U14_CONFIG + 1) << 8); + config = (inb(iobase + U14_CONFIG) << 8) | inb(iobase + U14_CONFIG + 1); switch (model & 0x000f) { case 0x0001: |