diff options
| -rw-r--r-- | sys/dev/ic/ami.c | 10 | ||||
| -rw-r--r-- | sys/dev/ic/amivar.h | 8 | ||||
| -rw-r--r-- | sys/dev/pci/ami_pci.c | 6 |
3 files changed, 11 insertions, 13 deletions
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c index c745bf1e5bb..70eaa498760 100644 --- a/sys/dev/ic/ami.c +++ b/sys/dev/ic/ami.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ami.c,v 1.35 2005/04/27 21:54:47 marco Exp $ */ +/* $OpenBSD: ami.c,v 1.36 2005/05/09 19:50:48 marco Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -486,7 +486,7 @@ ami_attach(sc) AMI_UNLOCK_AMI(sc, lock); - if (sc->sc_quirks & AMI_BROKEN) { + if (sc->sc_flags & AMI_BROKEN) { sc->sc_link.openings = 1; sc->sc_maxcmds = 1; sc->sc_maxunits = 1; @@ -533,7 +533,7 @@ ami_attach(sc) sc->sc_fwver, sc->sc_biosver, sc->sc_memory, sc->sc_dev.dv_xname, sc->sc_channels, sc->sc_targets, p, sc->sc_nunits, - sc->sc_link.openings, sc->sc_maxcmds, sc->sc_quirks); + sc->sc_link.openings, sc->sc_maxcmds, sc->sc_flags); #else printf(": FW %s, BIOS v%s, %dMB RAM\n" "%s: %d channels, %d %ss, %d logical drives\n", @@ -542,7 +542,7 @@ ami_attach(sc) sc->sc_channels, sc->sc_targets, p, sc->sc_nunits); #endif /* AMI_DEBUG */ - if (sc->sc_quirks & AMI_BROKEN && sc->sc_nunits > 1) + if (sc->sc_flags & AMI_BROKEN && sc->sc_nunits > 1) printf("%s: firmware buggy, limiting access to first logical " "disk\n", sc->sc_dev.dv_xname); @@ -1450,7 +1450,7 @@ ami_ioctl(dev, cmd, addr) int error = 0; struct ami_softc *sc = (struct ami_softc *)dev; - if (sc->sc_quirks & AMI_BROKEN) + if (sc->sc_flags & AMI_BROKEN) return ENODEV; /* can't do this to broken device for now */ switch (cmd) { diff --git a/sys/dev/ic/amivar.h b/sys/dev/ic/amivar.h index c6d3f349ea2..2ffcfde6e60 100644 --- a/sys/dev/ic/amivar.h +++ b/sys/dev/ic/amivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: amivar.h,v 1.8 2005/03/29 22:40:38 marco Exp $ */ +/* $OpenBSD: amivar.h,v 1.9 2005/05/09 19:50:48 marco Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -59,6 +59,8 @@ struct ami_softc { void *sc_ih; struct scsi_link sc_link; +/* don't use 0x0001 */ +#define AMI_BROKEN 0x0002 u_int sc_flags; /* low-level interface */ @@ -87,10 +89,6 @@ struct ami_softc { struct timeout sc_requeue_tmo; struct timeout sc_poll_tmo; -/* don't use 0x0001 */ -#define AMI_BROKEN 0x0002 - u_int16_t sc_quirks; - char sc_fwver[16]; char sc_biosver[16]; int sc_maxcmds; diff --git a/sys/dev/pci/ami_pci.c b/sys/dev/pci/ami_pci.c index 5af20e46611..da4dff9fe23 100644 --- a/sys/dev/pci/ami_pci.c +++ b/sys/dev/pci/ami_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ami_pci.c,v 1.23 2005/04/16 17:21:12 marco Exp $ */ +/* $OpenBSD: ami_pci.c,v 1.24 2005/05/09 19:50:48 marco Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -276,9 +276,9 @@ ami_pci_attach(parent, self, aux) if ((i = ami_pci_find_device(aux)) != -1) { if (ami_pci_devices[i].flags & AMI_BROKEN) - sc->sc_quirks = AMI_BROKEN; + sc->sc_flags = AMI_BROKEN; else - sc->sc_quirks = 0x0000; + sc->sc_flags = 0x0000; } else { /* this device existed at _match() should never happen */ |