diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-03-07 05:08:17 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-03-07 05:08:17 +0000 |
| commit | 56be491ab685db4a0635347daed4cb53683eb132 (patch) | |
| tree | 6ad859345c2d71212958a33d781fa345ac81a7d8 /sys/dev | |
| parent | 0056c3cd636c501cd8f6bf4df02ae57ec106a909 (diff) | |
Eliminate bit fields and unused fields in mpt_softc.
Return XS_DRIVER_STUFFUP for all status values we aren't sure of.
Mostly from Milos Urbanek.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/mpt_openbsd.c | 14 | ||||
| -rw-r--r-- | sys/dev/ic/mpt_openbsd.h | 14 |
2 files changed, 6 insertions, 22 deletions
diff --git a/sys/dev/ic/mpt_openbsd.c b/sys/dev/ic/mpt_openbsd.c index 46d1da4609d..d30c3466dc7 100644 --- a/sys/dev/ic/mpt_openbsd.c +++ b/sys/dev/ic/mpt_openbsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpt_openbsd.c,v 1.1 2004/03/06 03:03:07 krw Exp $ */ +/* $OpenBSD: mpt_openbsd.c,v 1.2 2004/03/07 05:08:16 krw Exp $ */ /* $NetBSD: mpt_netbsd.c,v 1.7 2003/07/14 15:47:11 lukem Exp $ */ /* @@ -646,20 +646,10 @@ mpt_done(mpt_softc_t *mpt, uint32_t reply) break; case MPI_IOCSTATUS_SCSI_RESIDUAL_MISMATCH: - xs->error = XS_DRIVER_STUFFUP; - break; - case MPI_IOCSTATUS_SCSI_TASK_TERMINATED: - /* XXX What should we do here? */ - break; - case MPI_IOCSTATUS_SCSI_TASK_MGMT_FAILED: - /* XXX */ - xs->error = XS_DRIVER_STUFFUP; - break; - case MPI_IOCSTATUS_SCSI_IOC_TERMINATED: - /* XXX */ + /* XXX When in doubt, STUFFUP. */ xs->error = XS_DRIVER_STUFFUP; break; diff --git a/sys/dev/ic/mpt_openbsd.h b/sys/dev/ic/mpt_openbsd.h index 44faea16ae5..02da99b464f 100644 --- a/sys/dev/ic/mpt_openbsd.h +++ b/sys/dev/ic/mpt_openbsd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mpt_openbsd.h,v 1.1 2004/03/06 03:03:07 krw Exp $ */ +/* $OpenBSD: mpt_openbsd.h,v 1.2 2004/03/07 05:08:16 krw Exp $ */ /* $NetBSD: mpt_netbsd.h,v 1.2 2003/04/16 23:02:14 thorpej Exp $ */ /* @@ -193,15 +193,9 @@ typedef struct req_entry { typedef struct mpt_softc { struct device mpt_dev; /* base device glue */ - /* Locking context */ - int mpt_splsaved; - uint32_t mpt_islocked; - - int verbose : 3, - mpt_locksetup : 1, - is_fc : 1, - bus : 1, - : 26; + int verbose; + int is_fc; + int bus; /* IOC facts */ uint16_t mpt_global_credits; |