diff options
| author |   mikeb <mikeb@openbsd.org> | 2017-01-16 18:09:35 +0000 |
|---|---|---|
| committer | mikeb <mikeb@openbsd.org> | 2017-01-16 18:09:35 +0000 |
| commit | 4341e70ab6830069bf1e4121c762417627ea62cb (patch) | |
| tree | b655edae5ef62a84a8909137a9a4ff604cd4bf23 /sys/dev/pci/mpiireg.h | |
| parent | Revert WIP parts of previous I didn't mean to commit yet. (diff) | |
| download | wireguard-openbsd-4341e70ab6830069bf1e4121c762417627ea62cb.tar.xz wireguard-openbsd-4341e70ab6830069bf1e4121c762417627ea62cb.zip | |
Clean up SCSI operation status and state defines
Diffstat (limited to 'sys/dev/pci/mpiireg.h')
| -rw-r--r-- | sys/dev/pci/mpiireg.h | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/sys/dev/pci/mpiireg.h b/sys/dev/pci/mpiireg.h index 5131c4f75c3..759072e50ef 100644 --- a/sys/dev/pci/mpiireg.h +++ b/sys/dev/pci/mpiireg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mpiireg.h,v 1.11 2016/10/24 01:50:09 dlg Exp $ */ +/* $OpenBSD: mpiireg.h,v 1.12 2017/01/16 18:09:35 mikeb Exp $ */ /* * Copyright (c) 2010 Mike Belopuhov * Copyright (c) 2009 James Giannoules @@ -783,25 +783,23 @@ struct mpii_msg_scsi_io_error { u_int16_t reserved3; u_int8_t scsi_status; - /* XXX JPG validate this */ -#if notyet -#define MPII_SCSIIO_ERR_STATUS_SUCCESS -#define MPII_SCSIIO_ERR_STATUS_CHECK_COND -#define MPII_SCSIIO_ERR_STATUS_BUSY -#define MPII_SCSIIO_ERR_STATUS_INTERMEDIATE -#define MPII_SCSIIO_ERR_STATUS_INTERMEDIATE_CONDMET -#define MPII_SCSIIO_ERR_STATUS_RESERVATION_CONFLICT -#define MPII_SCSIIO_ERR_STATUS_CMD_TERM -#define MPII_SCSIIO_ERR_STATUS_TASK_SET_FULL -#define MPII_SCSIIO_ERR_STATUS_ACA_ACTIVE -#endif +#define MPII_SCSIIO_STATUS_GOOD (0x00) +#define MPII_SCSIIO_STATUS_CHECK_COND (0x02) +#define MPII_SCSIIO_STATUS_COND_MET (0x04) +#define MPII_SCSIIO_STATUS_BUSY (0x08) +#define MPII_SCSIIO_STATUS_INTERMEDIATE (0x10) +#define MPII_SCSIIO_STATUS_INTERMEDIATE_CONDMET (0x14) +#define MPII_SCSIIO_STATUS_RESERVATION_CONFLICT (0x18) +#define MPII_SCSIIO_STATUS_CMD_TERM (0x22) +#define MPII_SCSIIO_STATUS_TASK_SET_FULL (0x28) +#define MPII_SCSIIO_STATUS_ACA_ACTIVE (0x30) +#define MPII_SCSIIO_STATUS_TASK_ABORTED (0x40) u_int8_t scsi_state; -#define MPII_SCSIIO_ERR_STATE_AUTOSENSE_VALID (1<<0) -#define MPII_SCSIIO_ERR_STATE_AUTOSENSE_FAILED (1<<1) -#define MPII_SCSIIO_ERR_STATE_NO_SCSI_STATUS (1<<2) -#define MPII_SCSIIO_ERR_STATE_TERMINATED (1<<3) -#define MPII_SCSIIO_ERR_STATE_RESPONSE_INFO_VALID (1<<4) -#define MPII_SCSIIO_ERR_STATE_QUEUE_TAG_REJECTED (0xffff) +#define MPII_SCSIIO_STATE_AUTOSENSE_VALID (1<<0) +#define MPII_SCSIIO_STATE_AUTOSENSE_FAILED (1<<1) +#define MPII_SCSIIO_STATE_NO_SCSI_STATUS (1<<2) +#define MPII_SCSIIO_STATE_TERMINATED (1<<3) +#define MPII_SCSIIO_STATE_RESPONSE_INFO_VALID (1<<4) u_int16_t ioc_status; u_int32_t ioc_loginfo; |