summaryrefslogtreecommitdiffstats
path: root/sys/dev/mfi
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2011-07-14 20:11:27 +0000
committerjhb <jhb@FreeBSD.org>2011-07-14 20:11:27 +0000
commit56612cedbe10c3575d1b688334376f7fc8623d4d (patch)
tree2886b36b0d2ac74444fdd5ec25286abeb2bc9f81 /sys/dev/mfi
parent13232d13fa339d313d811ac67798ce58ae73cc33 (diff)
downloadFreeBSD-src-56612cedbe10c3575d1b688334376f7fc8623d4d.zip
FreeBSD-src-56612cedbe10c3575d1b688334376f7fc8623d4d.tar.gz
Use MFI_STAT_* constants for cmd_status field values rather than magic
numbers in a few places. PR: bin/145960 Submitted by: gcooper MFC after: 1 week
Diffstat (limited to 'sys/dev/mfi')
-rw-r--r--sys/dev/mfi/mfi.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c
index 1962648..78dc92b 100644
--- a/sys/dev/mfi/mfi.c
+++ b/sys/dev/mfi/mfi.c
@@ -1149,7 +1149,8 @@ mfi_aen_complete(struct mfi_command *cm)
if (sc->mfi_aen_cm == NULL)
return;
- if (sc->mfi_aen_cm->cm_aen_abort || hdr->cmd_status == 0xff) {
+ if (sc->mfi_aen_cm->cm_aen_abort ||
+ hdr->cmd_status == MFI_STAT_INVALID_STATUS) {
sc->mfi_aen_cm->cm_aen_abort = 0;
aborted = 1;
} else {
@@ -1405,7 +1406,7 @@ mfi_bio_complete(struct mfi_command *cm)
hdr = &cm->cm_frame->header;
sc = cm->cm_sc;
- if ((hdr->cmd_status != 0) || (hdr->scsi_status != 0)) {
+ if ((hdr->cmd_status != MFI_STAT_OK) || (hdr->scsi_status != 0)) {
bio->bio_flags |= BIO_ERROR;
bio->bio_error = EIO;
device_printf(sc->mfi_dev, "I/O error, status= %d "
@@ -1549,7 +1550,7 @@ mfi_send_frame(struct mfi_softc *sc, struct mfi_command *cm)
cm->cm_timestamp = time_uptime;
mfi_enqueue_busy(cm);
} else {
- hdr->cmd_status = 0xff;
+ hdr->cmd_status = MFI_STAT_INVALID_STATUS;
hdr->flags |= MFI_FRAME_DONT_POST_IN_REPLY_QUEUE;
}
@@ -1574,14 +1575,14 @@ mfi_send_frame(struct mfi_softc *sc, struct mfi_command *cm)
return (0);
/* This is a polled command, so busy-wait for it to complete. */
- while (hdr->cmd_status == 0xff) {
+ while (hdr->cmd_status == MFI_STAT_INVALID_STATUS) {
DELAY(1000);
tm -= 1;
if (tm <= 0)
break;
}
- if (hdr->cmd_status == 0xff) {
+ if (hdr->cmd_status == MFI_STAT_INVALID_STATUS) {
device_printf(sc->mfi_dev, "Frame %p timed out "
"command 0x%X\n", hdr, cm->cm_frame->dcmd.opcode);
return (ETIMEDOUT);
OpenPOWER on IntegriCloud